auth setup

Author: kkartunov

src/app.module.ts

@@ -6,9 +6,6 @@ import { GlobalProvidersModule } from './shared/global/globalProviders.module';
 import { TopcoderModule } from './shared/topcoder/topcoder.module';
 import { HealthCheckController } from './api/health-check/healthCheck.controller';
 import { TokenValidatorMiddleware } from './core/auth/middleware/tokenValidator.middleware';
-import { CreateRequestStoreMiddleware } from './core/request/createRequestStore.middleware';
-import { AuthGuard, RolesGuard } from './core/auth/guards';
-import { APP_GUARD } from '@nestjs/core';
 
 @Module({
   imports: [
@@ -20,27 +17,15 @@ import { APP_GUARD } from '@nestjs/core';
         sessionIdGenerator: () => randomUUID(),
         statelessMode: false,
       },
-      // guards: [AuthGuard, RolesGuard],
     }),
     GlobalProvidersModule,
     TopcoderModule,
   ],
   controllers: [HealthCheckController],
-  providers: [
-    // {
-    //   provide: APP_GUARD,
-    //   useClass: AuthGuard,
-    // },
-    // {
-    //   provide: APP_GUARD,
-    //   useClass: RolesGuard,
-    // },
-    QueryChallengesTool,
-  ],
+  providers: [QueryChallengesTool],
 })
 export class AppModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {
-    // consumer.apply(TokenValidatorMiddleware).forRoutes('*');
-    // consumer.apply(CreateRequestStoreMiddleware).forRoutes('*');
+    consumer.apply(TokenValidatorMiddleware).forRoutes('*');
   }
 }

src/core/auth/auth.constants.ts

@@ -2,4 +2,6 @@ export enum Role {
   User = 'Topcoder User',
 }
 
-export enum M2mScope {}
+export enum M2mScope {
+  QueryPublicChallenges = 'query:public:challenges',
+}

src/core/auth/decorators/index.ts

@@ -1,5 +1,4 @@
 export * from './m2m.decorator';
 export * from './m2mScope.decorator';
 export * from './public.decorator';
-export * from './roles.decorator';
 export * from './user.decorator';

src/core/auth/decorators/roles.decorator.ts

@@ -1,59 +1,17 @@
-import {
-  CanActivate,
-  ExecutionContext,
-  Injectable,
-  UnauthorizedException,
-} from '@nestjs/common';
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
-import { IS_PUBLIC_KEY } from '../decorators/public.decorator';
-import { IS_M2M_KEY } from '../decorators/m2m.decorator';
-import { M2mScope } from '../auth.constants';
-import { SCOPES_KEY } from '../decorators/m2mScope.decorator';
+import { Logger } from 'src/shared/global';
 
 @Injectable()
 export class AuthGuard implements CanActivate {
+  private readonly logger = new Logger(AuthGuard.name);
+
   constructor(private reflector: Reflector) {}
 
   canActivate(context: ExecutionContext): boolean {
-    const isPublic = this.reflector.getAllAndOverride<boolean>(IS_PUBLIC_KEY, [
-      context.getHandler(),
-      context.getClass(),
-    ]);
-
-    if (isPublic) return true;
-
-    const req = context.switchToHttp().getRequest();
-    const isM2M = this.reflector.getAllAndOverride<boolean>(IS_M2M_KEY, [
-      context.getHandler(),
-      context.getClass(),
-    ]);
-
-    const { m2mUserId } = req;
-    if (m2mUserId) {
-      req.user = {
-        id: m2mUserId,
-        handle: '',
-      };
-    }
-
-    // Regular authentication - check that we have user's email and have verified the id token
-    if (!isM2M) {
-      return Boolean(req.email && req.idTokenVerified);
-    }
-
-    // M2M authentication - check scopes
-    if (!req.idTokenVerified || !req.m2mTokenScope)
-      throw new UnauthorizedException();
-
-    const allowedM2mScopes = this.reflector.getAllAndOverride<M2mScope[]>(
-      SCOPES_KEY,
-      [context.getHandler(), context.getClass()],
-    );
+    this.logger.log('AuthGuard canActivate called...');
+    // Check if the route is marked as public...
 
-    const reqScopes = req.m2mTokenScope.split(' ');
-    if (reqScopes.some((reqScope) => allowedM2mScopes.includes(reqScope))) {
-      return true;
-    }
-    return false;
+    return true;
   }
 }

src/core/auth/guards/auth.guard.ts

@@ -1,2 +1 @@
 export * from './auth.guard';
-export * from './roles.guard';

src/core/auth/guards/index.ts

@@ -4,7 +4,9 @@ import { Logger } from 'src/shared/global';
 import { ENV_CONFIG } from './config';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
+  const app = await NestFactory.create(AppModule, {
+    logger: ['error', 'warn', 'log'],
+  });
 
   const logger = new Logger('bootstrap()');