From 3cf5733b8cccd6a603cf5abe65b5ae3ff3c1e9cd Mon Sep 17 00:00:00 2001
From: Louis Capitanchik <contact@louiscap.co>
Date: Tue, 29 Mar 2022 13:15:05 +0100
Subject: [PATCH] Update hasura version
---
docker-compose.yml | 2 +-
hasura/jwk_props_dev.json | 10 +++++-----
.../default/tables/public_oauth_clients.yaml | 18 ++++++++++++++++++
package-lock.json | 18 +++++++++---------
package.json | 2 +-
5 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ae61a8..da905bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
labels:
tech.jetsam.environment: 'staging'
graphql-engine:
- image: hasura/graphql-engine:v2.0.10
+ image: hasura/graphql-engine:v2.4.0-beta.1
restart: on-failure
ports:
- "15432:8080"
diff --git a/hasura/jwk_props_dev.json b/hasura/jwk_props_dev.json
index 84d7106..7d46d84 100644
--- a/hasura/jwk_props_dev.json
+++ b/hasura/jwk_props_dev.json
@@ -3,11 +3,11 @@
"header": {
"type": "Authorization"
},
- "issuer": "urn:hackerfest:systems:auth",
- "claims_namespace": "urn:hackerfest:resources:claims",
+ "issuer": "urn:jetsam:systems:auth",
+ "claims_namespace": "urn:jetsam:resources:claims",
"claims_map": {
- "x-hasura-user-id": { "path": "$$['urn:hackerfest:resources:claims']['user-id']" },
- "x-hasura-default-role": { "path": "$$['urn:hackerfest:resources:claims']['default-role']" },
- "x-hasura-allowed-roles": { "path": "$$['urn:hackerfest:resources:claims']['allowed-roles']" }
+ "x-hasura-user-id": { "path": "$$['urn:jetsam:resources:claims']['user-id']" },
+ "x-hasura-default-role": { "path": "$$['urn:jetsam:resources:claims']['default-role']" },
+ "x-hasura-allowed-roles": { "path": "$$['urn:jetsam:resources:claims']['allowed-roles']" }
}
}
\ No newline at end of file
diff --git a/hasura/metadata/databases/default/tables/public_oauth_clients.yaml b/hasura/metadata/databases/default/tables/public_oauth_clients.yaml
index 749d7f3..44a7b97 100644
--- a/hasura/metadata/databases/default/tables/public_oauth_clients.yaml
+++ b/hasura/metadata/databases/default/tables/public_oauth_clients.yaml
@@ -45,3 +45,21 @@ select_permissions:
- description
filter: {}
role: overseer
+- permission:
+ columns:
+ - description
+ - grant_types
+ - id
+ - internal
+ - meta
+ - name
+ - owner_id
+ - redirect_uris
+ - secret
+ filter:
+ _and:
+ - owner_id:
+ _eq: X-Hasura-User-Id
+ - deleted_at:
+ _is_null: false
+ role: user
diff --git a/package-lock.json b/package-lock.json
index 15800f4..45c5bad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "jetsam-api",
- "version": "2.2.2",
+ "version": "2.3.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "jetsam-api",
- "version": "2.2.2",
+ "version": "2.3.0",
"license": "GPL-3.0+",
"dependencies": {
"@commander-lol/vault-client": "^0.1.1",
@@ -61,7 +61,7 @@
"yargs": "^13.3.2"
},
"devDependencies": {
- "hasura-cli": "^2.0.9",
+ "hasura-cli": "^2.2.0",
"jest": "^26.6.3",
"nodemon": "^2.0.4",
"prettier": "^2.2.1",
@@ -4847,9 +4847,9 @@
"integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ=="
},
"node_modules/hasura-cli": {
- "version": "2.0.9",
- "resolved": "https://registry.npmjs.org/hasura-cli/-/hasura-cli-2.0.9.tgz",
- "integrity": "sha512-95xAxNFfF1nntncULGKGQ9UEbhEWsgcMHdqOLsreq9E1emh2CVu1xuY/WezGMaCe1D4ZII7HxSQZBIhdnF9vKg==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/hasura-cli/-/hasura-cli-2.2.0.tgz",
+ "integrity": "sha512-lBpEt94CkaLbn0iqWx9TNnnuET9prz067gKUuTzm3y8PtRw1T1dZV8t/tfAZRRG/WNGNFp1d0UWs/fpwO3aJdA==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@@ -16564,9 +16564,9 @@
"integrity": "sha512-Gjzu0Xn7IagXVkSu9cSFuK1fqzwtLwFhNhVL8IFJijRNMgUttFbBSIAzKuSIrsFMO1+g1RlsoN49zPIbwPDMGQ=="
},
"hasura-cli": {
- "version": "2.0.9",
- "resolved": "https://registry.npmjs.org/hasura-cli/-/hasura-cli-2.0.9.tgz",
- "integrity": "sha512-95xAxNFfF1nntncULGKGQ9UEbhEWsgcMHdqOLsreq9E1emh2CVu1xuY/WezGMaCe1D4ZII7HxSQZBIhdnF9vKg==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/hasura-cli/-/hasura-cli-2.2.0.tgz",
+ "integrity": "sha512-lBpEt94CkaLbn0iqWx9TNnnuET9prz067gKUuTzm3y8PtRw1T1dZV8t/tfAZRRG/WNGNFp1d0UWs/fpwO3aJdA==",
"dev": true,
"requires": {
"axios": "^0.21.1",
diff --git a/package.json b/package.json
index 603a308..a79e183 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
"yargs": "^13.3.2"
},
"devDependencies": {
- "hasura-cli": "^2.0.9",
+ "hasura-cli": "^2.2.0",
"jest": "^26.6.3",
"nodemon": "^2.0.4",
"prettier": "^2.2.1",
--
GitLab