Merge pull request #1 from mir-ishfaq-hussain/mir-ishfaq-hussain-patch-1

Update user.service.ts
mir-ishfaq-hussain · Jan 16, 2024 · d1e35d2 · d1e35d2
2 parents cd371fc + 042361d
commit d1e35d2
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/packages/hoppscotch-backend/src/user/user.service.ts b/packages/hoppscotch-backend/src/user/user.service.ts
@@ -41,12 +41,8 @@ export class UserService {
 
     return {
       ...dbUser,
-      currentRESTSession: dbCurrentRESTSession
-        ? JSON.stringify(dbCurrentRESTSession)
-        : null,
-      currentGQLSession: dbCurrentGQLSession
-        ? JSON.stringify(dbCurrentGQLSession)
-        : null,
+      currentRESTSession: JSON.stringify(dbCurrentRESTSession) ?? null,
+      currentGQLSession:  JSON.stringify(dbCurrentGQLSession) ?? null,
     };
   }
 
@@ -147,8 +143,8 @@ export class UserService {
     refreshTokenSSO: string,
     profile,
   ) {
-    const userDisplayName = !profile.displayName ? null : profile.displayName;
-    const userPhotoURL = !profile.photos ? null : profile.photos[0].value;
+    const userDisplayName =  profile?.displayName ?? null;
+    const userPhotoURL =  profile?.photos?.[0]?.value ?? null;
 
     const createdUser = await this.prisma.user.create({
       data: {
@@ -188,8 +184,8 @@ export class UserService {
       data: {
         provider: profile.provider,
         providerAccountId: profile.id,
-        providerRefreshToken: refreshToken ? refreshToken : null,
-        providerAccessToken: accessToken ? accessToken : null,
+        providerRefreshToken: refreshToken ??? null,
+        providerAccessToken: accessToken ?? null,
         user: {
           connect: {
             uid: user.uid,
@@ -215,8 +211,8 @@ export class UserService {
           uid: user.uid,
         },
         data: {
-          displayName: !profile.displayName ? null : profile.displayName,
-          photoURL: !profile.photos ? null : profile.photos[0].value,
+          displayName:  profile?.displayName ?? null,
+          photoURL:  profile?.photos[0]?.value ?? null,
         },
       });
       return E.right(updatedUser);