Added changes for database insertion

ReflectionsProjections · Apr 11, 2024 · 87e2d3a · 87e2d3a
1 parent 149d707
commit 87e2d3a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 23 deletions.
diff --git a/src/database.ts b/src/database.ts
@@ -1,5 +1,5 @@
 import mongoose, { Schema } from "mongoose";
-import { RoleInfo, RoleSchema } from "./services/auth/auth-schema";
+import { RoleValidator, RoleSchema } from "./services/auth/auth-schema";
 
 mongoose.set("toObject", { versionKey: false });
 
@@ -31,5 +31,5 @@ function initializeModel(
 
 // Example usage
 export const Database = {
-    ROLES: initializeModel("roles", RoleSchema, RoleInfo),
+    ROLES: initializeModel("roles", RoleSchema, RoleValidator),
 };
diff --git a/src/services/auth/auth-router.ts b/src/services/auth/auth-router.ts
@@ -39,7 +39,7 @@ authRouter.get(
             session: false,
         })(req, res, next),
     function (req, res) {
-        const redirectUri = `${DeviceRedirects[req.params.DEVICE]}`
+        const redirectUri = `${DeviceRedirects[req.params.DEVICE]}`;
         return res.redirect(redirectUri);
     }
 );

diff --git a/src/services/auth/auth-schema.ts b/src/services/auth/auth-schema.ts
@@ -5,25 +5,33 @@ export const Role = z.enum(["USER", "ADMIN", "CORPORATE"]);
 
 export const RoleValidator = z.object({
     userId: z.coerce.string().regex(/user[0-9]*/),
+    name: z.coerce.string(),
     email: z.coerce.string().email(),
     roles: z.array(Role),
 });
 
-export const RoleSchema = new Schema({
-    userId: {
-        type: String,
-        required: true,
-        unique: true,
+export const RoleSchema = new Schema(
+    {
+        userId: {
+            type: String,
+            required: true,
+            unique: true,
+        },
+        name: {
+            type: String,
+            required: true,
+        },
+        email: {
+            type: String,
+            required: true,
+            unique: true,
+        },
+        roles: {
+            type: [String],
+            enum: Role.Values,
+            default: [],
+            required: true,
+        },
     },
-    email: {
-        type: String,
-        required: true,
-        unique: true,
-    },
-    roles: {
-        type: [String],
-        enum: Role.Values,
-        default: [],
-        required: true,
-    },
-});
+    { timestamps: { createdAt: "createdAt" } }
+);
diff --git a/src/services/auth/auth-utils.ts b/src/services/auth/auth-utils.ts
@@ -1,6 +1,8 @@
 // Create a function to generate GoogleStrategy instances
 import { Strategy as GoogleStrategy } from "passport-google-oauth20";
 import { Config } from "../../config";
+import { Role } from "./auth-schema";
+import { Database } from "../../database";
 
 export function createGoogleStrategy(device: string) {
     return new GoogleStrategy(
@@ -9,10 +11,21 @@ export function createGoogleStrategy(device: string) {
             clientSecret: Config.CLIENT_SECRET,
             callbackURL: `${Config.AUTH_CALLBACK_URI_BASE}${device}`,
         },
+
+        // Strategy -> insert user into database if they don't exist
         async function (_1, _2, profile, cb) {
-            // Add profile to database here
-            console.log(profile);
-            cb(null, profile);
+            const userId = `user${profile.id}`;
+            const name = profile.displayName;
+            const email = profile._json.email;
+            const roles = [Role.Enum.USER];
+
+            Database.ROLES.findOneAndUpdate(
+                { userId: userId },
+                { userId, name, email, roles },
+                { upsert: true }
+            )
+                .then(() => cb(null, profile))
+                .catch((err) => cb(err, profile));
         }
     );
 }