Merge pull request #3 from oslabs-beta/noah/feature

Noah/feature

Author: Spencer-Lau

Dockerfile

@@ -56,9 +56,8 @@ ENV IS_DOCKER=true
 
 ENV VIDEOSDK='vidsdk'
 
- # productino you dolt!, if we are using docker, its production!
  ENV PORT=5656
 
-# no longer put the envs here cause we are not dumb.
+# no longer put the envs here
 
 CMD [ "npm", "start" ]

package.json

@@ -90,6 +90,7 @@
     "Zack Vandiver"
   ],
   "scripts": {
+    "prod-build": "vite build",
     "build": "vite build",
     "dev-frontend": "vite",
     "dev-server": "NODE_ENV=development nodemon server/server.ts",

server/models/Oauth-model.ts

@@ -8,11 +8,10 @@ interface UserDocument extends Document {
 
 const userSchema = new mongoose.Schema<UserDocument>({
   username: { type: String },
-  githubId: { type: String, unique: true },
-  googleId: { type: String, unique: true }
+  githubId: { type: String }, // removed unique constraint because you can have null values.
+  googleId: { type: String } // unique:true
 });
 
 const User = mongoose.model<UserDocument>('OauthUsers', userSchema);
 
-
 export default User;

server/routers/passport-setup.ts

@@ -33,7 +33,7 @@ passport.use(
       callbackURL: `${API_BASE_URL}/auth/github/callback`,
       proxy: true
     },
-    function (accessToken, refreshToken, profile, done) {
+    (accessToken, refreshToken, profile, done) => {
       user
         .findOne({
           githubId: profile.id
@@ -42,22 +42,27 @@ passport.use(
           if (currentUser) {
             console.log('user is: ', currentUser);
             return done(null, currentUser);
+          }
+          let initials;
+          if (profile.displayName) {
+            initials = profile.displayName.match(/\b\w/g).join('');
           } else {
-            const initials = profile.displayName.match(/\b\w/g).join('');
-            const nums = profile.id.slice(0, 5);
-            user
-              .create({
-                username: initials + nums + '(Github)',
-                githubId: profile.id
-              })
-              .then((data) => {
-                console.log('user added successfully: ', data);
-                return done(null, data);
-              })
-              .catch((data) =>
-                console.log('issue with adding user to database', data)
-              );
+            initials = profile._json.login.match(/\b\w/g).join('');
           }
+
+          const nums = profile.id.slice(0, 5);
+          user
+            .create({
+              username: initials + nums + '(Github)',
+              githubId: profile.id
+            })
+            .then((data) => {
+              console.log('user added successfully: ', data);
+              return done(null, data);
+            })
+            .catch((data) =>
+              console.log('issue with adding user to database', data)
+            );
         });
     }
   )