broke "User" into three distinct roles

backend/models/user.mgmodel.ts

@@ -26,7 +26,7 @@ const UserSchema: Schema = new Schema({
   role: {
     type: String,
     required: true,
-    enum: ["User", "Admin"],
+    enum: ["Administrator", "Facilitator", "Learner"],
   },
 });
 

backend/rest/authRoutes.ts

@@ -51,7 +51,7 @@ authRouter.post("/signup", signupRequestValidator, async (req, res) => {
       firstName: req.body.firstName,
       lastName: req.body.lastName,
       email: req.body.email,
-      role: "User",
+      role: "Facilitator",
       password: req.body.password,
     });
 

backend/rest/entityRoutes.ts

@@ -16,7 +16,9 @@ import { sendResponseByMimeType } from "../utilities/responseUtil";
 const upload = multer({ dest: "uploads/" });
 
 const entityRouter: Router = Router();
-entityRouter.use(isAuthorizedByRole(new Set(["User", "Admin"])));
+entityRouter.use(
+  isAuthorizedByRole(new Set(["Administrator", "Facilitator", "Learner"])),
+);
 
 const defaultBucket = process.env.FIREBASE_STORAGE_DEFAULT_BUCKET || "";
 const fileStorageService: IFileStorageService = new FileStorageService(

backend/rest/userRoutes.ts

@@ -17,7 +17,7 @@ import { getErrorMessage } from "../utilities/errorUtils";
 import { sendResponseByMimeType } from "../utilities/responseUtil";
 
 const userRouter: Router = Router();
-userRouter.use(isAuthorizedByRole(new Set(["Admin"])));
+userRouter.use(isAuthorizedByRole(new Set(["Administrator"])));
 
 const userService: IUserService = new UserService();
 const emailService: IEmailService = new EmailService(nodemailerConfig);

backend/services/implementations/__tests__/userService.test.ts

@@ -10,13 +10,13 @@ const testUsers = [
     firstName: "Peter",
     lastName: "Pan",
     authId: "123",
-    role: "Admin",
+    role: "Administrator",
   },
   {
     firstName: "Wendy",
     lastName: "Darling",
     authId: "321",
-    role: "User",
+    role: "Facilitator",
   },
 ];
 

backend/services/implementations/authService.ts

@@ -63,7 +63,7 @@ class AuthService implements IAuthService {
           firstName: googleUser.firstName,
           lastName: googleUser.lastName,
           email: googleUser.email,
-          role: "User",
+          role: "Facilitator",
           password: "",
         },
         googleUser.localId,

backend/swagger.yml

@@ -481,7 +481,7 @@ paths:
                   type: string
                 role:
                   type: string
-                  enum: ["User", "Admin"]
+                  enum: ["Administrator", "Facilitator", "Learner"]
                 email:
                   type: string
       responses:
@@ -571,7 +571,7 @@ paths:
                   type: string
                 role:
                   type: string
-                  enum: ["User", "Admin"]
+                  enum: ["Administrator", "Facilitator", "Learner"]
                 email:
                   type: string
       responses:

backend/types.ts

@@ -1,4 +1,4 @@
-export type Role = "User" | "Admin";
+export type Role = "Administrator" | "Facilitator" | "Learner";
 
 export type Token = {
   accessToken: string;

e2e-tests/test_auth.py

@@ -9,7 +9,7 @@ def signup_user(backend_url, body, access_token_field):
     assert response.status_code == 200
     data = response.json()
     assert "role" in data
-    assert data["role"] == "User"
+    assert data["role"] == "Facilitator"
     assert "id" in data
     assert access_token_field in data
     expected = {k: v for k, v in body.items() if k != "password"}

e2e-tests/test_auth_gql.py

@@ -25,7 +25,7 @@ def signup_user(backend_url, body, access_token_field):
     assert "signup" in response.json()["data"]
     data = response.json()["data"]["signup"]
     assert "role" in data
-    assert data["role"] == "User"
+    assert data["role"] == "Facilitator"
     assert "id" in data
     assert access_token_field in data
     expected = {k: v for k, v in body.items() if k != "password"}

e2e-tests/test_user.py

@@ -80,14 +80,14 @@ def test_users(backend_url, auth_header, lang, api, new_user_email):
     body1 = {
         "firstName": "Test",
         "lastName": "Script",
-        "role": "User",
+        "role": "Facilitator",
         "email": new_user_email,
         "password": "password",
     }
     body2 = {
         "firstName": "Test2",
         "lastName": "Script2",
-        "role": "User",
+        "role": "Facilitator",
         "email": new_user_email,
     }
     if lang != "ts":

e2e-tests/test_user_gql.py

@@ -142,14 +142,14 @@ def test_users_gql(backend_url, auth_header, lang, api, new_user_email):
     body1 = {
         "firstName": "Test",
         "lastName": "Script",
-        "role": "User",
+        "role": "Facilitator",
         "email": new_user_email,
         "password": "password",
     }
     body2 = {
         "firstName": "Test2",
         "lastName": "Script2",
-        "role": "User",
+        "role": "Facilitator",
         "email": new_user_email,
     }
     if lang != "ts":

frontend/src/types/AuthTypes.ts

@@ -3,7 +3,7 @@ export type AuthenticatedUser = {
   firstName: string;
   lastName: string;
   email: string;
-  role: "Admin" | "User";
+  role: "Administrator" | "Facilitator" | "Learner";
   accessToken: string;
 } | null;