fix some bugs

Author: windid

.env.sample

@@ -0,0 +1,3 @@
+PORT=8000
+GITHUB_CLIENT_ID=1234567890
+GITHUB_CLIENT_SECRET=abcdefghijklmnopqrstuvwxyz

middleware/PassportConfig.ts

@@ -3,18 +3,11 @@ import passport from 'passport'
 import { PassportStrategy } from '../interfaces'
 
 export default class PassportConfig {
-  /*
-     FIX ME 😭
-     The problem with this class is... if the caller forgets to call
-     the addStrategies method...our program won't work. 
+  constructor(strategies: PassportStrategy[]) {
+    this.#addStrategies(strategies)
+  }
 
-     Solution: You should refactor this class to take a constructor
-     which receives strategies: PassportStrategy[]. Internally...call 
-     the addStrategies method within the constructor and make addStragies
-     private from the outside world. This way, we can GUARANTEE that our
-     passport strategies are added when this class is created. ⭐️
-    */
-  addStrategies(strategies: PassportStrategy[]): void {
+  #addStrategies(strategies: PassportStrategy[]): void {
     strategies.forEach((passportStrategy: PassportStrategy) => {
       passport.use(passportStrategy.name, passportStrategy.strategy)
     })

middleware/checkAuth.ts

@@ -1,18 +1,12 @@
 import { NextFunction, Request, Response } from 'express'
 
-/*
-FIX ME (types) 😭
-*/
 export const ensureAuthenticated = (req: Request, res: Response, next: NextFunction) => {
   if (req.isAuthenticated()) {
     return next()
   }
   res.redirect('/auth/login')
 }
 
-/*
-FIX ME (types) 😭
-*/
 export const forwardAuthenticated = (req: Request, res: Response, next: NextFunction) => {
   if (!req.isAuthenticated()) {
     return next()

middleware/passportMiddleware.ts

@@ -6,8 +6,7 @@ import localStrategy from './passportStrategies/localStrategy'
 import passportGitHubStrategy from './passportStrategies/githubStrategy'
 
 // No need to actually pass the instance of passport since it returns a singleton
-const passportConfig = new PassportConfig()
-passportConfig.addStrategies([localStrategy, passportGitHubStrategy])
+new PassportConfig([localStrategy, passportGitHubStrategy])
 const passportMiddleware = (app: Application): void => {
   app.use(passport.initialize())
   app.use(passport.session())

middleware/passportStrategies/githubStrategy.ts

@@ -14,7 +14,6 @@ const githubStrategy: GitHubStrategy = new GitHubStrategy(
     passReqToCallback: true,
   },
 
-  /* FIX ME 😭 */
   async (
     req: Request,
     accessToken: string,

middleware/passportStrategies/localStrategy.ts

@@ -24,10 +24,6 @@ const localStrategy = new LocalStrategy(
   }
 )
 
-/*
-FIX ME (types) 😭
-*/
-
 passport.serializeUser(function (user, done) {
   done(null, user.id)
 })

models/userModel.ts

@@ -23,15 +23,13 @@ const database: Express.User[] = [
 ]
 
 const userModel = {
-  /* FIX ME (types) 😭 */
   findOne: (email: string) => {
     const user = database.find((user) => user.email === email)
     if (user) {
       return user
     }
     throw new Error(`Couldn't find user with email: ${email}`)
   },
-  /* FIX ME (types) 😭 */
   findById: (id: number) => {
     const user = database.find((user) => user.id === id)
     if (user) {

routes/authRoute.ts

@@ -12,7 +12,7 @@ declare module 'express-session' {
 
 router.get('/login', forwardAuthenticated, (req, res) => {
   res.render('login', {
-    messages: req.session.messages || [],
+    message: req.session.messages?.pop(),
   })
 })
 
@@ -21,7 +21,6 @@ router.post(
   passport.authenticate('local', {
     successRedirect: '/dashboard',
     failureRedirect: '/auth/login',
-    /* FIX ME: 😭 failureMsg needed when login fails */
     failureMessage: true,
   })
 )

routes/indexRoute.ts

@@ -8,26 +8,20 @@ router.get('/', (req, res) => {
 })
 
 router.get('/dashboard', ensureAuthenticated, (req, res) => {
-  if (req.user?.role === 'admin') {
-    res.redirect('/admin')
-  } else {
-    res.render('dashboard', {
-      user: req.user,
-    })
-  }
+  res.render('dashboard', {
+    user: req.user,
+  })
 })
 
 router.get('/admin', ensureAuthenticated, (req, res) => {
-  if (req.user?.role === 'admin') {
-    const store = req.sessionStore
-    store.all &&
-      store.all((err, sessions) => {
-        console.log(sessions)
-        res.render('admin', {
-          user: req.user,
-          sessions,
-        })
+  const store = req.sessionStore
+  if (req.user?.role === 'admin' && store.all) {
+    store.all((err, sessions) => {
+      res.render('admin', {
+        user: req.user,
+        sessions,
       })
+    })
   } else {
     res.redirect('/dashboard')
   }

views/admin.ejs

@@ -1,12 +1,12 @@
-<h1 class="mt-4">Dashboard</h1>
+<h1 class="mt-4">Administration</h1>
 <p class="lead mb-3">Welcome <%= user.name %>
 </p>
 <p>Current Active Sessions:</p>
 
 <% for (const key in sessions) { %>
-<div>
-    <div>SessionId: <%=key%></div>
-    <div>UserId: <%=sessions[key].passport.user%></div>
-    <div><a href="/admin/revoke/<%=key%>">Revoke</a></div>
+<div style="margin-top: 24px;">
+    <div>SessionID: <%=key%></div>
+    <div>UserID: <%=sessions[key].passport.user%></div>
+    <div><a href="/admin/revoke/<%=key%>">Revoke Session</a></div>
 </div>
 <% } %>

views/dashboard.ejs

@@ -1,3 +1,8 @@
 <h1 class="mt-4">Dashboard</h1>
 <p class="lead mb-3">Welcome <%= user.name %></p>
+<% if (user.role === 'admin') { %>
+<p>
+    <a href="/admin">Sessions Administration</a>
+</p>
+<% } %>
 <a href="/auth/logout" class="btn btn-secondary">Logout</a>

views/login.ejs

@@ -5,7 +5,7 @@
         <img src="/secure-icon.png" alt="icon" width="20%" />
       </h1>
       <p style="color: #c00">
-        <%= messages[messages.length - 1] %>
+        <%= message %>
       </p>
 
       <h2>Login</h2>