Fix bug with Google and GitHub passport login

Author: lhvy

server/.env.example

@@ -0,0 +1,22 @@
+NODE_ENV="dev"
+PORT=3001
+POSTGRES_USER="postgres"
+POSTGRES_DB="notangles-db"
+POSTGRES_PASSWORD="postgres"
+POSTGRES_PORT="5432"
+DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:${POSTGRES_PORT}/${POSTGRES_DB}?schema=public"
+SESSION_SECRET="i-love-notangles"
+OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER="https://id.example.com.au"
+OAUTH2_CLIENT_REGISTRATION_LOGIN_CLIENT_ID="a-b-c-d-e-f-1234567890"
+OAUTH2_CLIENT_REGISTRATION_LOGIN_CLIENT_SECRET="aaazzz123"
+OAUTH2_CLIENT_REGISTRATION_LOGIN_SCOPE="openid"
+OAUTH2_CLIENT_REGISTRATION_LOGIN_REDIRECT_URI="http://localhost:3001/api/auth/callback/devsoc"
+OAUTH2_CLIENT_REGISTRATION_LOGIN_POST_LOGOUT_REDIRECT_URI="http://localhost:3001/api/auth/callback/devsoc"
+GITHUB_CLIENT_ID="aaaZZZ123"
+GITHUB_CLIENT_SECRET="abcdef1234567890"
+GITHUB_REDIRECT_URI="http://localhost:3001/api/auth/callback/github"
+GOOGLE_CLIENT_ID="12345-aaazzz123.apps.googleusercontent.com"
+GOOGLE_CLIENT_SECRET="AAAZZZ-aaaZZZ123-aaaZZZ"
+GOOGLE_REDIRECT_URI="http://localhost:3001/api/auth/callback/google"
+CLIENT_HOST_NAME="localhost"
+CLIENT_HOST_PORT="5173"

server/src/auth/auth.module.ts

@@ -25,7 +25,7 @@ const OidcStrategyFactory = {
   controllers: [AuthController],
   providers: [
     PrismaService,
-    // OidcStrategyFactory,
+    OidcStrategyFactory,
     GithubStrategy,
     GoogleStrategy,
     GuestStrategy,

server/src/auth/github.strategy.ts

@@ -21,8 +21,10 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
     req: Request,
     _accessToken: string,
     _refreshToken: string,
-    profile: { id: number; name: string; email: string },
+    profile: { id: number; displayName: string | null; email: string },
   ) {
+    const displayName = profile.displayName?.trim() ?? 'GitHub User';
+
     const user = await this.prisma.user.upsert({
       where: {
         authProvider_authSubject: {
@@ -36,21 +38,16 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
       create: {
         authProvider: 'GITHUB',
         authSubject: profile.id.toString(),
-        firstName: profile.name?.split(' ')[0] || 'GitHub',
-        lastName: profile.name?.split(' ').slice(1).join(' ') || 'User',
+        firstName: displayName.split(' ')[0] || 'GitHub',
+        lastName: displayName.split(' ').slice(1).join(' ') || 'User',
         isGuest: false,
+        settings: {
+          create: {},
+        },
       },
     });
 
-    if (user.createdAt.getTime() === user.lastLogin.getTime()) {
-      await this.prisma.settings.create({
-        data: {
-          userId: user.id,
-        },
-      });
-    }
-
-    const login = promisify(req.login.bind(this));
+    const login = promisify(req.login.bind(req));
     await login(user);
     return user;
   }

server/src/auth/google.strategy.ts

@@ -43,16 +43,13 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
         firstName: profile.name.givenName,
         lastName: profile.name.familyName,
         isGuest: false,
+        settings: {
+          create: {},
+        },
       },
     });
-    if (user.createdAt.getTime() === user.lastLogin.getTime()) {
-      await this.prisma.settings.create({
-        data: {
-          userId: user.id,
-        },
-      });
-    }
-    const login = promisify(req.login.bind(this));
+
+    const login = promisify(req.login.bind(req));
     await login(user);
     return user;
   }