Tnramalho feature/GitHub adjustments

packages/nestjs-auth-github/package.json

@@ -15,6 +15,7 @@
     "@concepta/nestjs-authentication": "^5.0.0-alpha.0",
     "@concepta/nestjs-common": "^5.0.0-alpha.0",
     "@concepta/nestjs-core": "^5.0.0-alpha.0",
+    "@concepta/nestjs-exception": "^5.0.0-alpha.0",
     "@concepta/nestjs-federated": "^5.0.0-alpha.0",
     "@concepta/ts-common": "^5.0.0-alpha.0",
     "@concepta/ts-core": "^5.0.0-alpha.0",

packages/nestjs-auth-github/src/auth-github.strategy.ts

@@ -2,11 +2,6 @@ import { Strategy } from 'passport-github';
 import { Inject, Injectable, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 
-import {
-  ReferenceEmailInterface,
-  ReferenceIdInterface,
-} from '@concepta/ts-core';
-
 import {
   FederatedOAuthService,
   FederatedCredentialsInterface,
@@ -18,6 +13,10 @@ import {
 } from './auth-github.constants';
 
 import { AuthGithubSettingsInterface } from './interfaces/auth-github-settings.interface';
+import { AuthGithubProfileInterface } from './interfaces/auth-github-profile.interface';
+import { AuthGithubMissingEmailException } from './exceptions/auth-github-missing-email.exception';
+import { AuthGithubMissingIdException } from './exceptions/auth-github-missing-id.exception';
+import { mapProfile } from './utils/auth-github-map-profile';
 
 @Injectable()
 export class AuthGithubStrategy extends PassportStrategy(
@@ -26,7 +25,7 @@ export class AuthGithubStrategy extends PassportStrategy(
 ) {
   constructor(
     @Inject(AUTH_GITHUB_MODULE_SETTINGS_TOKEN)
-    settings: AuthGithubSettingsInterface,
+    private settings: AuthGithubSettingsInterface,
     private federatedOAuthService: FederatedOAuthService,
   ) {
     super({
@@ -39,15 +38,25 @@ export class AuthGithubStrategy extends PassportStrategy(
   async validate(
     _accessToken: string,
     _refreshToken: string,
-    profile: ReferenceIdInterface & ReferenceEmailInterface,
+    profile: AuthGithubProfileInterface,
   ): Promise<FederatedCredentialsInterface> {
-    // TODO: should we save accessToken and refreshToken?
+    const gitProfile = this.settings.mapProfile
+      ? this.settings.mapProfile(profile)
+      : mapProfile(profile);
+
+    if (!gitProfile?.id) {
+      throw new AuthGithubMissingIdException();
+    }
+
+    if (!gitProfile?.email) {
+      throw new AuthGithubMissingEmailException();
+    }
 
     // Create a new user if it doesn't exist or just return based on federated
     const user = await this.federatedOAuthService.sign(
       AUTH_GITHUB_STRATEGY_NAME,
-      profile.email,
-      profile.id,
+      gitProfile.email,
+      gitProfile.id,
     );
 
     if (!user) {

packages/nestjs-auth-github/src/config/auth-github-default.config.ts

@@ -2,6 +2,7 @@ import { registerAs } from '@nestjs/config';
 import { AUTH_GITHUB_MODULE_DEFAULT_SETTINGS_TOKEN } from '../auth-github.constants';
 import { AuthGithubSettingsInterface } from '../interfaces/auth-github-settings.interface';
 import { AuthGithubLoginDto } from '../dto/auth-github-login.dto';
+import { mapProfile } from '../utils/auth-github-map-profile';
 
 /**
  * Default configuration for auth github.
@@ -16,5 +17,6 @@ export const authGithubDefaultConfig = registerAs(
     clientId: process.env.GITHUB_CLIENT_ID ?? 'client_id',
     clientSecret: process.env.GITHUB_CLIENT_SECRET ?? 'secret',
     callbackURL: process.env.GITHUB_CALLBACK_URL ?? 'callback_url',
+    mapProfile: mapProfile,
   }),
 );

packages/nestjs-auth-github/src/exceptions/auth-github-missing-email.exception.ts

@@ -0,0 +1,10 @@
+import { RuntimeException } from '@concepta/nestjs-exception';
+
+export class AuthGithubMissingEmailException extends RuntimeException {
+  constructor(
+    message = 'GitHub did not return an email address for the user.',
+  ) {
+    super(message);
+    this.errorCode = 'AUTH_GITHUB_MISSING_PROFILE_EMAIL_ERROR';
+  }
+}

packages/nestjs-auth-github/src/exceptions/auth-github-missing-id.exception.ts

@@ -0,0 +1,8 @@
+import { RuntimeException } from '@concepta/nestjs-exception';
+
+export class AuthGithubMissingIdException extends RuntimeException {
+  constructor(message = 'GitHub did not return an id for the user.') {
+    super(message);
+    this.errorCode = 'AUTH_GITHUB_MISSING_PROFILE_ID_ERROR';
+  }
+}

packages/nestjs-auth-github/src/index.ts

@@ -1,6 +1,8 @@
 export * from './auth-github.module';
 export * from './auth-github.controller';
 export * from './dto/auth-github-login.dto';
+export * from './interfaces/auth-github-map-profile.type';
+
 export {
   AuthGithubGuard,
   AuthGithubGuard as GithubAuthGuard,

packages/nestjs-auth-github/src/interfaces/auth-github-emails.interface.ts

@@ -0,0 +1,3 @@
+export interface AuthGithubEmailsInterface {
+  value: string;
+}

packages/nestjs-auth-github/src/interfaces/auth-github-map-profile.type.ts

@@ -0,0 +1,6 @@
+import { AuthGithubProfileInterface } from './auth-github-profile.interface';
+import { AuthGithubSignInterface } from './auth-github-sign.interface';
+
+export type MapProfile = (
+  profile: AuthGithubProfileInterface,
+) => AuthGithubSignInterface;

packages/nestjs-auth-github/src/interfaces/auth-github-profile.interface.ts

@@ -0,0 +1,14 @@
+import {
+  ReferenceEmailInterface,
+  ReferenceIdInterface,
+  ReferenceUsernameInterface,
+} from '@concepta/ts-core';
+import { AuthGithubEmailsInterface } from './auth-github-emails.interface';
+
+export interface AuthGithubProfileInterface
+  extends ReferenceIdInterface,
+    Partial<ReferenceEmailInterface>,
+    Partial<ReferenceUsernameInterface> {
+  displayName?: string;
+  emails?: AuthGithubEmailsInterface[];
+}

packages/nestjs-auth-github/src/interfaces/auth-github-settings.interface.ts

@@ -1,9 +1,11 @@
 import { AuthenticationCodeInterface } from '@concepta/ts-common';
 import { Type } from '@nestjs/common';
+import { MapProfile } from './auth-github-map-profile.type';
 
 export interface AuthGithubSettingsInterface {
   clientId: string;
   clientSecret: string;
   callbackURL: string;
   loginDto?: Type<AuthenticationCodeInterface>;
+  mapProfile: MapProfile;
 }

packages/nestjs-auth-github/src/interfaces/auth-github-sign.interface.ts

@@ -0,0 +1,8 @@
+import {
+  ReferenceEmailInterface,
+  ReferenceIdInterface,
+} from '@concepta/ts-core';
+
+export interface AuthGithubSignInterface
+  extends ReferenceIdInterface,
+    ReferenceEmailInterface {}

packages/nestjs-auth-github/src/utils/auth-github-map-profile.ts

@@ -0,0 +1,20 @@
+import { AuthGithubProfileInterface } from '../interfaces/auth-github-profile.interface';
+import { AuthGithubSignInterface } from '../interfaces/auth-github-sign.interface';
+
+export const mapProfile = (
+  profile: AuthGithubProfileInterface,
+): AuthGithubSignInterface => {
+  let email = '';
+
+  if (profile.email) {
+    email = profile.email;
+  } else if (profile.emails && profile.emails.length > 0) {
+    email = profile.emails[0].value;
+  }
+
+  const result: AuthGithubSignInterface = {
+    id: profile?.id || '',
+    email,
+  };
+  return result;
+};

packages/nestjs-auth-github/tsconfig.json

@@ -15,6 +15,9 @@
   "references": [
     {
       "path": "../nestjs-federated"
+    },
+    {
+      "path": "../nestjs-exception"
     }
   ]
 }

packages/nestjs-federated/package.json

@@ -12,6 +12,7 @@
   ],
   "dependencies": {
     "@concepta/nestjs-common": "^5.0.0-alpha.0",
+    "@concepta/nestjs-exception": "^5.0.0-alpha.0",
     "@concepta/nestjs-typeorm-ext": "^5.0.0-alpha.0",
     "@concepta/ts-common": "^5.0.0-alpha.0",
     "@concepta/ts-core": "^5.0.0-alpha.0",

packages/nestjs-federated/src/exceptions/federated-user-lookup.exception.ts

@@ -1,24 +1,26 @@
-import { format } from 'util';
-import { ExceptionInterface, ReferenceIdInterface } from '@concepta/ts-core';
+import { ReferenceIdInterface } from '@concepta/ts-core';
+import { RuntimeException } from '@concepta/nestjs-exception';
+import { HttpStatus } from '@nestjs/common';
 
-export class FederatedUserLookupException
-  extends Error
-  implements ExceptionInterface
-{
-  errorCode = 'FEDERATED_USER_LOOKUP_ERROR';
-
-  context: {
+export class FederatedUserLookupException extends RuntimeException {
+  context: RuntimeException['context'] & {
     entityName: string;
     user: ReferenceIdInterface;
   };
 
   constructor(
     entityName: string,
     user: ReferenceIdInterface,
-    message = 'Error while trying find user $s',
+    message = 'Error while trying find user %s',
   ) {
-    super(format(message, user));
+    super({
+      message,
+      messageParams: [user.id],
+      httpStatus: HttpStatus.NOT_FOUND,
+    });
+    this.errorCode = 'FEDERATED_USER_LOOKUP_ERROR';
     this.context = {
+      ...super.context,
       entityName,
       user,
     };

packages/nestjs-federated/src/exceptions/federated-user-relationship.exception.ts

@@ -0,0 +1,25 @@
+import { RuntimeException } from '@concepta/nestjs-exception';
+import { HttpStatus } from '@nestjs/common';
+export class FederatedUserRelationshipException extends RuntimeException {
+  context: RuntimeException['context'] & {
+    federatedId: string;
+  };
+
+  constructor(
+    federatedId: string,
+    message = 'Error while trying to load user relationship from federated %s',
+  ) {
+    super({
+      message,
+      messageParams: [federatedId],
+      httpStatus: HttpStatus.NOT_FOUND,
+    });
+
+    this.errorCode = 'FEDERATED_USER_RELATIONSHIP_ERROR';
+
+    this.context = {
+      ...super.context,
+      federatedId,
+    };
+  }
+}

packages/nestjs-federated/src/services/federated-oauth.service.ts

@@ -18,6 +18,7 @@ import { FederatedCreateException } from '../exceptions/federated-create.excepti
 import { FederatedMutateCreateUserException } from '../exceptions/federated-mutate-create.exception';
 import { FederatedUserLookupException } from '../exceptions/federated-user-lookup.exception';
 import { FederatedMutateService } from './federated-mutate.service';
+import { FederatedUserRelationshipException } from '../exceptions/federated-user-relationship.exception';
 
 @Injectable()
 export class FederatedOAuthService implements FederatedOAuthServiceInterface {
@@ -59,16 +60,24 @@ export class FederatedOAuthService implements FederatedOAuthServiceInterface {
         queryOptions,
       );
     } else {
+      if (!federated.user?.id) {
+        throw new FederatedUserRelationshipException(
+          this.constructor.name,
+          federated.id,
+        );
+      }
+
       const user = await this.userLookupService.byId(
         federated.user.id,
         queryOptions,
       );
 
-      if (!user)
+      if (!user) {
         throw new FederatedUserLookupException(
           this.constructor.name,
           federated.user,
         );
+      }
 
       return user;
     }

packages/nestjs-federated/src/services/federated.service.ts

@@ -33,6 +33,7 @@ export class FederatedService
           provider,
           subject,
         },
+        relations: ['user'],
       });
     } catch (e) {
       const exception = e instanceof Error ? e : new NotAnErrorException(e);