fix(GraphQL): Make auth work with multi-tenancy and accept CORS in schema (GRAPHQL-1016)#7431
Merged
abhimanyusinghgaur merged 20 commits intomasterfrom Feb 16, 2021
Merged
Conversation
…to abhimanyu/remove-cors # Conflicts: # graphql/admin/admin.go # graphql/authorization/auth.go # graphql/e2e/directives/schema_response.json # graphql/e2e/normal/schema_response.json # graphql/resolve/auth_test.go # graphql/resolve/mutation_rewriter.go
…emove-cors # Conflicts: # graphql/authorization/auth.go # graphql/schema/schemagen.go
abhimanyusinghgaur
requested review from
manishrjain,
pawanrawal and
vvbalaji-dgraph
as code owners
github-actions
Bot
added
area/enterprise
abhimanyusinghgaur
changed the title
pawanrawal
approved these changes
Feb 16, 2021
Contributor
pawanrawal
left a comment
pawanrawal
left a comment
There was a problem hiding this comment.
Reviewed 38 of 44 files at r1, 14 of 14 files at r2, 3 of 3 files at r3.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @abhimanyusinghgaur, @manishrjain, and @vvbalaji-dgraph)
graphql/e2e/common/common.go, line 528 at r2 (raw file):
func SafelyDropAllWithGroot(t *testing.T) { // first, make an initial probe to get the schema update counter oldCounter := RetryProbeGraphQL(t, Alpha1HTTP, nil).SchemaUpdateCounter
this and the function below can be combined into one which can take a boolean parameter and do things accordingly
Contributor
Author
abhimanyusinghgaur
left a comment
abhimanyusinghgaur
left a comment
There was a problem hiding this comment.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @manishrjain, @pawanrawal, and @vvbalaji-dgraph)
graphql/e2e/common/common.go, line 528 at r2 (raw file):
Previously, pawanrawal (Pawan Rawal) wrote…
this and the function below can be combined into one which can take a boolean parameter and do things accordingly
Done.
NamanJain8
added a commit
that referenced
this pull request
Mar 17, 2021
…tes) change (#7486) Some of the internal predicates have been removed in #7431 and #7451. When restoring from a backup taken on a version older than 21.03, we should skip restoring them. Also, its export will fail in data loading(bulk/live load). Instead of polluting the backup code with the restore fixation logic, we will use the dgraph upgrade tool to do the migration. When upgrading from version 20.11 to 21.03, the changes of this PR will be applied. It will update the graphql schema with CORS information and drop the depreciated predicates/types. It will also update the persisted query. This PR also fixes the restored backup when a --upgrade is set to true in the export_backup command. Note that persisted query is not fixed in export_backup.
NamanJain8
added a commit
that referenced
this pull request
Mar 18, 2021
…tes) change (#7486) Some of the internal predicates have been removed in #7431 and #7451. When restoring from a backup taken on a version older than 21.03, we should skip restoring them. Also, its export will fail in data loading(bulk/live load). Instead of polluting the backup code with the restore fixation logic, we will use the dgraph upgrade tool to do the migration. When upgrading from version 20.11 to 21.03, the changes of this PR will be applied. It will update the graphql schema with CORS information and drop the depreciated predicates/types. It will also update the persisted query. This PR also fixes the restored backup when a --upgrade is set to true in the export_backup command. Note that persisted query is not fixed in export_backup. (cherry picked from commit 2d36978)
NamanJain8
added a commit
that referenced
this pull request
Mar 18, 2021
…es) change (#7486) (#7606) Some of the internal predicates have been removed in #7431 and #7451. When restoring from a backup taken on a version older than 21.03, we should skip restoring them. Also, its export will fail in data loading(bulk/live load). Instead of polluting the backup code with the restore fixation logic, we will use the dgraph upgrade tool to do the migration. When upgrading from version 20.11 to 21.03, the changes of this PR will be applied. It will update the graphql schema with CORS information and drop the depreciated predicates/types. It will also update the persisted query. This PR also fixes the restored backup when a --upgrade is set to true in the export_backup command. Note that persisted query is not fixed in export_backup. (cherry picked from commit 2d36978)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It is a continuation of #7400.
This PR does a bunch of things:
@authwork with multi-tenancydgraph.graphql.schema_historyleftoversdgraph.corsas an internal predicate and any associated admin mutations# Dgraph.Allow-Originin GraphQL schemaThis change is