oauth works

Author: dentonwong

app/src/components/login/SignIn.tsx

@@ -295,7 +295,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = (props) => {
                 <path d="M8.256 14a4.474 4.474 0 0 1-.229-1.004H3c.001-.246.154-.986.832-1.664C4.484 10.68 5.711 10 8 10c.26 0 .507.009.74.025.226-.341.496-.65.804-.918C9.077 9.038 8.564 9 8 9c-5 0-6 3-6 4s1 1 1 1h5.256Z" />
               </svg>
             </Button>
-            {/* <Button
+            <Button
               fullWidth
               id="SignInWithGithub"
               variant="contained"
@@ -318,7 +318,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = (props) => {
               >
                 <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z" />
               </svg>
-            </Button>*/}
+            </Button>
             <Button
               fullWidth
               variant="contained"

app/src/index.tsx

@@ -63,7 +63,7 @@ return (
   <Route
     {...rest}
     render={(props) => {
-     if (isLoggedIn) {
+     if (isLoggedIn === true) {
         console.log("should be app")
         // User is logged in, render the protected component
         return <Component {...props} />;

server/controllers/cookieController.ts

@@ -12,6 +12,12 @@ const cookieController: CookieController = {
       //maxAge: 60 * 60 * 1000 * 24  //uncomment to set expiration of cookies, but make sure there is something in place to expire local storage info too
 
     });
+
+    res.cookie('username', res.locals.username, {
+      httpOnly: true,
+      sameSite: 'none',
+      secure: true,
+    });
     return next();
   }, 
 

server/controllers/sessionController.ts

@@ -26,7 +26,8 @@ const sessionController: SessionController = {
         if (!session) {
           console.log('no session')
           res.locals.loggedIn = false;
-          return res.redirect('/');
+          return next();
+          // return res.redirect('/');
         }
         res.locals.loggedIn = true;
         return next();

server/models/Oauth-model.ts

@@ -3,8 +3,8 @@ const Schema = mongoose.Schema;
 
 const userSchema = new Schema({
   username: { type: String },
-  githubId: { type: String, unique: false },
-  googleId: { type: String, unique: false }
+  githubId: { type: String, unique: true },
+  googleId: { type: String, unique: true }
 });
 
 const User = mongoose.model('OauthUsers', userSchema);

server/routers/auth.ts

@@ -26,10 +26,21 @@ router.get(
 router.get(
   '/github/callback',
   passport.authenticate('github'),
+  sessionController.startSession,
   (req: UserReq, res) => {
-    console.log('this authenticate function is being run');
+    console.log('github authenticate function is being run');
     console.log(req.user.id);
-    res.cookie('ssid', req.user.id);
+    res.cookie('ssid', req.user.id, {
+      httpOnly: true,
+      sameSite: 'none',
+      secure: true,
+    });
+
+    res.cookie('username', req.user.username, {
+      httpOnly: true,
+      sameSite: 'none',
+      secure: true,
+    });
     return res.redirect(API_BASE_URL);
   }
 );
@@ -39,19 +50,24 @@ router.get(
   passport.authenticate('google', {
     scope: ['profile']
   })
+  
 );
 
 router.get(
   '/google/callback',
   passport.authenticate('google'),
   sessionController.startSession,
   (req: UserReq, res) => {
+    
     console.log('google authenicate function being run');
     res.cookie('ssid', req.user.id, {
       httpOnly: true,
       sameSite: 'none',
       secure: true,
     });
+
+
+
     res.cookie('username', req.user.username, {
       httpOnly: true,
       sameSite: 'none',

server/routers/passport-setup.ts

@@ -36,9 +36,11 @@ passport.use(
             console.log('user is: ', currentUser);
             return done(null, currentUser);
           } else {
+            const initials = profile.displayName.match(/\b\w/g).join('');
+            const nums = profile.id.slice(0, 5);
             user
               .create({
-                username: profile.displayName + '(Github)',
+                username: initials + nums + '(Github)',
                 githubId: profile.id
               })
               .then((data) => {
@@ -73,9 +75,11 @@ passport.use(
             console.log('user is: ', currentUser);
             return done(null, currentUser);
           } else {
+            const initials = profile.displayName.match(/\b\w/g).join('');
+            const nums = profile.id.slice(0, 5);
             user
               .create({
-                username: profile.displayName + '(Google)',
+                username: initials + nums + '(Google)',
                 googleId: profile.id
               })
               .then((data) => {

server/server.ts

@@ -172,6 +172,19 @@ app.post(
   (req, res) => res.status(200).json({ sessionId: res.locals.ssid })
 );
 
+//confirming whether user is logged in for index.tsx rendering
+app.get(
+  '/loggedIn',
+  sessionController.isLoggedIn,
+  (req, res) => res.status(200).json(res.locals.loggedIn)
+)
+
+app.get('/logout', (req,res) => {
+
+  req.logout();
+  res.redirect('/login');
+})
+
 // user must be logged in to get or save projects, otherwise they will be redirected to login page
 app.post(
   '/saveProject',
@@ -180,12 +193,6 @@ app.post(
   (req, res) => res.status(200).json(res.locals.savedProject)
 );
 
-//confirming whether user is logged in for index.tsx rendering
-app.get(
-  '/loggedIn',
-  sessionController.isLoggedIn,
-  (req, res) => res.status(200).json(res.locals.loggedIn)
-)
 
 app.post(
   '/getProjects',