Fixed username passing when logging in with Google

`login_username` is not set in Cookies when logging in with Google. This fixes that by passing the username from the backend to the frontend.
chrsrns · Oct 18, 2023 · 74443ed · 74443ed
1 parent 8d4cdab
commit 74443ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/routes/auth.routes.js b/routes/auth.routes.js
@@ -105,7 +105,8 @@ router.post('/login', async (req, res, next) => {
       accessToken,
       refreshToken,
       type: existingUser.type,
-      id: existingUser.id
+      id: existingUser.id,
+      login_username: existingUser.login_username
     });
   } catch (err) {
 
@@ -278,7 +279,8 @@ router.post('/googlelogin', async (req, res, next) => {
       accessToken,
       refreshToken,
       type: existingUser.type,
-      id: existingUser.id
+      id: existingUser.id,
+      login_username: existingUser.login_username
     });
   } catch (err) {
     console.error(err)

diff --git a/src-frontend-react/src/components/LoginFormModal/index.js b/src-frontend-react/src/components/LoginFormModal/index.js
@@ -32,7 +32,7 @@ export const LoginFormModal = ({ show, onHide, isLoggingIn }) => {
       if (response.ok)
         return response.json(); else throw response;
     }).then((data) => {
-      setCookie("login_username", username)
+      setCookie("login_username", data.login_username)
       setCookie("accessToken", data.accessToken)
       setCookie("refreshToken", data.refreshToken)
       setCookie("usertype", data.type)
@@ -59,7 +59,7 @@ export const LoginFormModal = ({ show, onHide, isLoggingIn }) => {
       if (response.ok)
         return response.json(); else throw response;
     }).then((data) => {
-      setCookie("login_username", username)
+      setCookie("login_username", data.login_username)
       setCookie("accessToken", data.accessToken)
       setCookie("refreshToken", data.refreshToken)
       setCookie("usertype", data.type)