Fix imports and lint

uwblueprint · Sep 24, 2024 · 7ddb407 · 7ddb407
1 parent e85ec05
commit 7ddb407
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/backend/services/implementations/userService.ts b/backend/services/implementations/userService.ts
@@ -26,7 +26,7 @@ const getMongoUserByAuthId = async (authId: string): Promise<User> => {
 
 class UserService implements IUserService {
   /* eslint-disable class-methods-use-this */
-  async getUserById(userId: string): Promise<UserDTO> {
+  async getUserById(userId: string | ObjectId): Promise<UserDTO> {
     let user: User | null;
     let firebaseUser: firebaseAdmin.auth.UserRecord;
 
@@ -184,7 +184,10 @@ class UserService implements IUserService {
     };
   }
 
-  async updateUserById(userId: string, user: UpdateUserDTO): Promise<UserDTO> {
+  async updateUserById(
+    userId: ObjectId | string,
+    user: UpdateUserDTO,
+  ): Promise<UserDTO> {
     let oldUser: User | null;
     let updatedFirebaseUser: firebaseAdmin.auth.UserRecord;
 

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -95,6 +95,12 @@ const App = (): React.ReactElement => {
                   path={Routes.NOT_AUTHORIZED_PAGE}
                   component={NotAuthorized}
                 />
+                <PrivateRoute
+                  exact
+                  path={Routes.CREATE_PASSWORD_PAGE}
+                  component={CreatePasswordPage}
+                  allowedRoles={["Administrator", "Learner"]}
+                />
                 <PrivateRoute
                   exact
                   path={Routes.MANAGE_USERS_PAGE}

diff --git a/frontend/src/components/auth/Login.tsx b/frontend/src/components/auth/Login.tsx
@@ -1,12 +1,7 @@
 import React, { useContext, useState } from "react";
 import { Redirect, useHistory, useLocation } from "react-router-dom";
 import authAPIClient from "../../APIClients/AuthAPIClient";
-import {
-  CREATE_PASSWORD_PAGE,
-  HOME_PAGE,
-  SIGNUP_PAGE,
-  WELCOME_PAGE,
-} from "../../constants/Routes";
+import { HOME_PAGE, SIGNUP_PAGE, WELCOME_PAGE } from "../../constants/Routes";
 import AuthContext from "../../contexts/AuthContext";
 import { AuthenticatedUser } from "../../types/AuthTypes";
 import AUTHENTICATED_USER_KEY from "../../constants/AuthConstants";

diff --git a/frontend/src/components/pages/CreatePasswordPage.tsx b/frontend/src/components/pages/CreatePasswordPage.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useState } from "react";
 import { Redirect, useHistory } from "react-router-dom";
-import { HOME_PAGE, LOGIN_PAGE } from "../../constants/Routes";
+import { HOME_PAGE } from "../../constants/Routes";
 import AuthAPIClient from "../../APIClients/AuthAPIClient";
 import AuthContext from "../../contexts/AuthContext";
 import AUTHENTICATED_USER_KEY from "../../constants/AuthConstants";