feat(authentication): user provider metadata stored in database (#39)

ConduitPlatform · Feb 16, 2022 · 3863224 · 3863224
1 parent 5d19a70
commit 3863224
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 16 deletions.
diff --git a/modules/authentication/src/handlers/AuthenticationProviders/OAuth2.ts b/modules/authentication/src/handlers/AuthenticationProviders/OAuth2.ts
@@ -139,12 +139,11 @@ export abstract class OAuth2<T extends Payload, S extends OAuth2Settings> {
         );
       }
 
-      if (isNil(user[this.providerName])) {
-        user[this.providerName] = payload;
-        // TODO look into this again, as the email the user has registered will still not be verified
-        if (!user.isVerified) user.isVerified = true;
-        user = await User.getInstance().findByIdAndUpdate(user._id, user);
-      }
+      user[this.providerName] = payload;
+      // TODO look into this again, as the email the user has registered will still not be verified
+      if (!user.isVerified) user.isVerified = true;
+      user = await User.getInstance().findByIdAndUpdate(user._id, user);
+
     } else {
       user = await User.getInstance().create({
         email: payload.email,

diff --git a/modules/authentication/src/handlers/facebook/facebook.ts b/modules/authentication/src/handlers/facebook/facebook.ts
@@ -69,7 +69,7 @@ export class FacebookHandlers extends OAuth2<Payload, FacebookSettings> {
     let payload: FacebookUser = {
       id: facebookResponse.data.id,
       email: facebookResponse.data.email,
-      data: {},
+      data: { ...facebookResponse.data },
     };
     return payload;
   }

diff --git a/modules/authentication/src/models/User.schema.ts b/modules/authentication/src/models/User.schema.ts
@@ -1,8 +1,4 @@
-import {
-  ConduitActiveSchema,
-  DatabaseProvider,
-  TYPE,
-} from '@conduitplatform/grpc-sdk';
+import { ConduitActiveSchema, DatabaseProvider, TYPE } from '@conduitplatform/grpc-sdk';
 
 const schema = {
   _id: TYPE.ObjectId,
@@ -25,6 +21,9 @@ const schema = {
     tokenExpires: {
       type: TYPE.Date,
     },
+    data: {
+      type: TYPE.JSON,
+    },
   },
   google: {
     id: {
@@ -36,6 +35,9 @@ const schema = {
     tokenExpires: {
       type: TYPE.Date,
     },
+    data: {
+      type: TYPE.JSON,
+    },
   },
   microsoft: {
     id: {
@@ -47,6 +49,9 @@ const schema = {
     tokenExpires: {
       type: TYPE.Date,
     },
+    data: {
+      type: TYPE.JSON,
+    },
   },
   figma: {
     id: {
@@ -58,6 +63,9 @@ const schema = {
     tokenExpires: {
       type: TYPE.Date,
     },
+    data: {
+      type: TYPE.JSON,
+    },
   },
   slack: {
     id: {
@@ -69,6 +77,9 @@ const schema = {
     tokenExpires: {
       type: TYPE.Date,
     },
+    data: {
+      type: TYPE.JSON,
+    },
   },
   facebook: {
     id: {
@@ -77,9 +88,12 @@ const schema = {
     token: {
       type: TYPE.String,
     },
-    // tokenExpires: {
-    //   type: TYPE.String,
-    // },
+    tokenExpires: {
+      type: TYPE.String,
+    },
+    data: {
+      type: TYPE.JSON,
+    },
   },
   kakao: {
     id: {
@@ -104,6 +118,9 @@ const schema = {
     tokenExpires: {
       type: TYPE.String,
     },
+    data: {
+      type: TYPE.JSON,
+    },
     profile_image_url: TYPE.String,
   },
   active: {
@@ -146,11 +163,13 @@ export class User extends ConduitActiveSchema<User> {
     id: string;
     token: string;
     tokenExpires: Date;
+    data: any;
   };
   facebook?: {
     id: string;
     token: string;
-    // tokenExpires: string;
+    //tokenExpires: string;
+    data: any;
   };
   kakao?: {
     id: string;
@@ -164,7 +183,33 @@ export class User extends ConduitActiveSchema<User> {
     token: string;
     tokenExpires: string;
     profile_image_url?: string;
+    data: any;
+  };
+  slack?: {
+    id: string;
+    token: string;
+    tokenExpires: Date;
+    data: any;
   };
+  figma?: {
+    id: string;
+    token: string;
+    tokenExpires: Date;
+    data: any;
+  };
+  microsoft?: {
+    id: string;
+    token: string;
+    tokenExpires: Date;
+    data: any;
+  };
+  github?: {
+    id: string;
+    token: string;
+    tokenExpires: Date;
+    data: any;
+  };
+
   active: boolean;
   isVerified: boolean;
   hasTwoFA: boolean;