diff --git a/docker-compose.yml b/docker-compose.yml index 2ae61a811f85d119bc24d4b2a30768d11a7782ce..da905bdfdc13a6af67a7c4bc91f605cfdb441e08 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 84d71062d53fbef34d6cea5478255c221f954f67..7d46d84c53cffe88d0a39cb59dd33c10fc44b7e3 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 749d7f3013648dd033e6f4fd50731aa2422ec78a..44a7b977d69e8e7a4184591d1a2bb245cd628788 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 15800f41045b724d1448575117ed9364f3c2ab16..45c5bad01f0569b5dfa8fd4a69397609a704be96 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 603a3087f53bb68860dadd2c0103a15f4085bf75..a79e183827866d56bc1e0703ba6a8c2a255f4255 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",