Allow unactivated users to query Me() graphql (#344)

spellshift · Oct 30, 2023 · d5a092c · d5a092c
1 parent ea2f1c1
commit d5a092c
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 31 deletions.
diff --git a/implants/lib/tavern/graphql/schema.graphql b/implants/lib/tavern/graphql/schema.graphql
@@ -1077,6 +1077,6 @@ extend type Query {
   tags(where: TagWhereInput): [Tag!]! @requireRole(role: USER)
   tomes(where: TomeWhereInput): [Tome!]! @requireRole(role: USER)
   users(where: UserWhereInput): [User!]! @requireRole(role: USER)
-  me: User! @requireRole(role: USER)
+  me: User!
 }
 scalar Time
diff --git a/tavern/internal/graphql/generated/ent.generated.go b/tavern/internal/graphql/generated/ent.generated.go
diff --git a/tavern/internal/graphql/generated/root_.generated.go b/tavern/internal/graphql/generated/root_.generated.go
diff --git a/tavern/internal/graphql/schema.graphql b/tavern/internal/graphql/schema.graphql
@@ -1077,6 +1077,6 @@ extend type Query {
   tags(where: TagWhereInput): [Tag!]! @requireRole(role: USER)
   tomes(where: TomeWhereInput): [Tome!]! @requireRole(role: USER)
   users(where: UserWhereInput): [User!]! @requireRole(role: USER)
-  me: User! @requireRole(role: USER)
+  me: User!
 }
 scalar Time
diff --git a/tavern/internal/graphql/schema/query.graphql b/tavern/internal/graphql/schema/query.graphql
@@ -6,5 +6,5 @@ extend type Query {
   tags(where: TagWhereInput): [Tag!]! @requireRole(role: USER)
   tomes(where: TomeWhereInput): [Tome!]! @requireRole(role: USER)
   users(where: UserWhereInput): [User!]! @requireRole(role: USER)
-  me: User! @requireRole(role: USER)
+  me: User!
 }
diff --git a/tavern/internal/graphql/testdata/queries/users/MeUnauthenticated.yml b/tavern/internal/graphql/testdata/queries/users/MeUnauthenticated.yml
@@ -0,0 +1,12 @@
+state: |
+  INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,is_activated,is_admin)
+    VALUES (5,"test_oauth_id","https://photos.com","test","secretToken",false,false);
+  INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,is_activated,is_admin)
+    VALUES (6,"test_oauth_id2","https://photos.com","admin","otherToken",true,true);
+query: |
+  query UnauthenticatedMe {
+    me {
+      id
+    }
+  }
+expected_error: no authenticated user present in request context
diff --git a/tavern/internal/graphql/testdata/queries/users/MeWithUnactivatedUser.yml b/tavern/internal/graphql/testdata/queries/users/MeWithUnactivatedUser.yml
@@ -0,0 +1,18 @@
+state: |
+  INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,is_activated,is_admin)
+    VALUES (5,"test_oauth_id","https://photos.com","test","secretToken",false,false);
+  INSERT INTO `users` (id,oauth_id,photo_url,name,session_token,is_activated,is_admin)
+    VALUES (6,"test_oauth_id2","https://photos.com","admin","otherToken",true,true);
+requestor:
+  session_token: secretToken
+query: |
+  query MeWithUnactivatedUser {
+    me {
+      id
+      isActivated
+    }
+  }
+expected:
+  me:
+    id: "5"
+    isActivated: false
diff --git a/tavern/internal/www/schema.graphql b/tavern/internal/www/schema.graphql
@@ -1077,6 +1077,6 @@ extend type Query {
   tags(where: TagWhereInput): [Tag!]! @requireRole(role: USER)
   tomes(where: TomeWhereInput): [Tome!]! @requireRole(role: USER)
   users(where: UserWhereInput): [User!]! @requireRole(role: USER)
-  me: User! @requireRole(role: USER)
+  me: User!
 }
 scalar Time