From c22e0dfe2354eac9ee169379bbd98ee7041ecc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= <gergo@jedlicska.com>
Date: Wed, 26 Jul 2023 13:32:08 +0200
Subject: [PATCH] refactor(server scopes): use constants for profile email
 scope

---
 .../modules/activitystream/tests/activity.spec.js    |  2 +-
 .../server/modules/core/graph/resolvers/users.js     |  2 +-
 packages/server/modules/core/tests/graph.spec.js     | 12 ++++++------
 packages/server/modules/core/tests/graphSubs.spec.js |  4 ++--
 packages/server/modules/core/tests/rest.spec.js      |  4 ++--
 packages/server/scripts/streamObjects.js             |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/server/modules/activitystream/tests/activity.spec.js b/packages/server/modules/activitystream/tests/activity.spec.js
index 68b2de283..ab360e266 100644
--- a/packages/server/modules/activitystream/tests/activity.spec.js
+++ b/packages/server/modules/activitystream/tests/activity.spec.js
@@ -86,7 +86,7 @@ describe('Activity @activity', () => {
       Scopes.Tokens.Write,
       Scopes.Tokens.Read,
       Scopes.Profile.Read,
-      'profile:email'
+      Scopes.Profile.Email
     ]
 
     // create users
diff --git a/packages/server/modules/core/graph/resolvers/users.js b/packages/server/modules/core/graph/resolvers/users.js
index 652c1c941..53f285aac 100644
--- a/packages/server/modules/core/graph/resolvers/users.js
+++ b/packages/server/modules/core/graph/resolvers/users.js
@@ -97,7 +97,7 @@ module.exports = {
       // NOTE: we're redacting the field (returning null) rather than throwing a full error which would invalidate the request.
       if (context.userId === parent.id) {
         try {
-          await validateScopes(context.scopes, 'profile:email')
+          await validateScopes(context.scopes, Scopes.Profile.Email)
           return parent.email
         } catch (err) {
           return null
diff --git a/packages/server/modules/core/tests/graph.spec.js b/packages/server/modules/core/tests/graph.spec.js
index 8c11b055e..dccbbd12f 100644
--- a/packages/server/modules/core/tests/graph.spec.js
+++ b/packages/server/modules/core/tests/graph.spec.js
@@ -52,7 +52,7 @@ describe('GraphQL API Core @core-api', () => {
         Scopes.Tokens.Write,
         Scopes.Tokens.Read,
         Scopes.Profile.Read,
-        'profile:email'
+        Scopes.Profile.Email
       ]
     )}`
     userB.id = await createUser(userB)
@@ -67,7 +67,7 @@ describe('GraphQL API Core @core-api', () => {
         Scopes.Tokens.Write,
         Scopes.Tokens.Read,
         Scopes.Profile.Read,
-        'profile:email'
+        Scopes.Profile.Email
       ]
     )}`
     userC.id = await createUser(userC)
@@ -82,7 +82,7 @@ describe('GraphQL API Core @core-api', () => {
         Scopes.Tokens.Write,
         Scopes.Tokens.Read,
         Scopes.Profile.Read,
-        'profile:email'
+        Scopes.Profile.Email
       ]
     )}`
 
@@ -250,7 +250,7 @@ describe('GraphQL API Core @core-api', () => {
             Scopes.Tokens.Write,
             Scopes.Tokens.Read,
             Scopes.Profile.Read,
-            'profile:email'
+            Scopes.Profile.Email
           ]
         )}`
 
@@ -278,7 +278,7 @@ describe('GraphQL API Core @core-api', () => {
             Scopes.Tokens.Write,
             Scopes.Tokens.Read,
             Scopes.Profile.Read,
-            'profile:email',
+            Scopes.Profile.Email,
             'profile:delete'
           ]
         )}`
@@ -1700,7 +1700,7 @@ describe('GraphQL API Core @core-api', () => {
           Scopes.Tokens.Write,
           Scopes.Tokens.Read,
           Scopes.Profile.Read,
-          'profile:email',
+          Scopes.Profile.Email,
           'apps:read',
           'apps:write',
           'users:invite'
diff --git a/packages/server/modules/core/tests/graphSubs.spec.js b/packages/server/modules/core/tests/graphSubs.spec.js
index 853bcb93c..ee18e0d24 100644
--- a/packages/server/modules/core/tests/graphSubs.spec.js
+++ b/packages/server/modules/core/tests/graphSubs.spec.js
@@ -107,7 +107,7 @@ describe('GraphQL API Subscriptions @gql-subscriptions', () => {
       Scopes.Tokens.Write,
       Scopes.Tokens.Read,
       Scopes.Profile.Read,
-      'profile:email'
+      Scopes.Profile.Email
     ])
     userA.token = `Bearer ${token}`
 
@@ -123,7 +123,7 @@ describe('GraphQL API Subscriptions @gql-subscriptions', () => {
         Scopes.Tokens.Write,
         Scopes.Tokens.Read,
         Scopes.Profile.Read,
-        'profile:email'
+        Scopes.Profile.Email
       ]
     )}`
 
diff --git a/packages/server/modules/core/tests/rest.spec.js b/packages/server/modules/core/tests/rest.spec.js
index cdb0824ee..50624dd13 100644
--- a/packages/server/modules/core/tests/rest.spec.js
+++ b/packages/server/modules/core/tests/rest.spec.js
@@ -48,7 +48,7 @@ describe('Upload/Download Routes @api-rest', () => {
         Scopes.Tokens.Write,
         Scopes.Tokens.Read,
         Scopes.Profile.Read,
-        'profile:email'
+        Scopes.Profile.Email
       ]
     )}`
 
@@ -64,7 +64,7 @@ describe('Upload/Download Routes @api-rest', () => {
         Scopes.Tokens.Write,
         Scopes.Tokens.Read,
         Scopes.Profile.Read,
-        'profile:email'
+        Scopes.Profile.Email
       ]
     )}`
 
diff --git a/packages/server/scripts/streamObjects.js b/packages/server/scripts/streamObjects.js
index 9eeb9f4f4..5a4b1e254 100644
--- a/packages/server/scripts/streamObjects.js
+++ b/packages/server/scripts/streamObjects.js
@@ -38,7 +38,7 @@ const main = async () => {
       Scopes.Tokens.Write,
       Scopes.Tokens.Read,
       Scopes.Profile.Read,
-      'profile:email'
+      Scopes.Profile.Email
     ]
   )}`