Merge pull request #4 from topcoder-platform/feat/auth

PM-1437 Feat/auth

Author: kkartunov

package.json

@@ -24,7 +24,6 @@
     "@nestjs/common": "^11.0.1",
     "@nestjs/core": "^11.0.1",
     "@nestjs/platform-express": "^11.0.1",
-    "@rekog/mcp-nest": "^1.6.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
     "dotenv": "^16.5.0",
@@ -34,6 +33,7 @@
     "nanoid": "^5.1.5",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
+    "@tc/mcp-nest": "topcoder-platform/MCP-Nest.git",
     "zod": "^3.25.67"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -1,14 +1,11 @@
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
-import { McpModule } from '@rekog/mcp-nest';
+import { McpModule } from '@tc/mcp-nest';
 import { QueryChallengesTool } from './mcp/tools/challenges/queryChallenges.tool';
-import { randomUUID } from 'crypto';
 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';
+import { nanoid } from 'nanoid';
 
 @Module({
   imports: [
@@ -17,30 +14,18 @@ import { APP_GUARD } from '@nestjs/core';
       version: '1.0.0',
       streamableHttp: {
         enableJsonResponse: false,
-        sessionIdGenerator: () => randomUUID(),
+        sessionIdGenerator: () => nanoid(),
         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/app.module.ts

@@ -1,5 +1,8 @@
 export enum Role {
+  Admin = 'administrator',
   User = 'Topcoder User',
 }
 
-export enum M2mScope {}
+export enum M2mScope {
+  QueryPublicChallenges = 'query:public:challenges',
+}

src/core/auth/auth.constants.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/index.ts

@@ -1,59 +1,16 @@
-import {
-  CanActivate,
-  ExecutionContext,
-  Injectable,
-  UnauthorizedException,
-} 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';
-
-@Injectable()
-export class AuthGuard implements CanActivate {
-  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()],
-    );
-
-    const reqScopes = req.m2mTokenScope.split(' ');
-    if (reqScopes.some((reqScope) => allowedM2mScopes.includes(reqScope))) {
-      return true;
-    }
+import { Request } from 'express';
+import { decodeAuthToken } from './guards.utils';
+
+/**
+ * Auth guard function to validate the authorization token from the request headers.
+ *
+ * @param req - The incoming HTTP request object.
+ * @returns A promise that resolves to `true` if the authorization token is valid, otherwise `false`.
+ */
+export const authGuard = async (req: Request) => {
+  if (!(await decodeAuthToken(req.headers.authorization ?? ''))) {
     return false;
   }
-}
+
+  return true;
+};

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

@@ -0,0 +1,35 @@
+import * as jwt from 'jsonwebtoken';
+import { Logger } from 'src/shared/global';
+import { getSigningKey } from '../jwt';
+
+const logger = new Logger('guards.utils()');
+
+/**
+ * Decodes and verifies a JWT token from the provided authorization header.
+ *
+ * @param authHeader - The authorization header containing the token, expected in the format "Bearer <token>".
+ * @returns A promise that resolves to the decoded JWT payload if the token is valid,
+ *          a string if the payload is a string, or `false` if the token is invalid or the header is improperly formatted.
+ *
+ * @throws This function does not throw directly but will return `false` if an error occurs during verification.
+ */
+export const decodeAuthToken = async (
+  authHeader: string,
+): Promise<boolean | jwt.JwtPayload | string> => {
+  const [type, idToken] = authHeader?.split(' ') ?? [];
+
+  if (type !== 'Bearer' || !idToken) {
+    return false;
+  }
+
+  let decoded: jwt.JwtPayload | string;
+  try {
+    const signingKey = await getSigningKey(idToken);
+    decoded = jwt.verify(idToken, signingKey);
+  } catch (error) {
+    logger.error('Error verifying JWT', error);
+    return false;
+  }
+
+  return decoded;
+};

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

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

src/core/auth/guards/guards.utils.ts

@@ -0,0 +1,30 @@
+import { Request } from 'express';
+import { decodeAuthToken } from './guards.utils';
+import { JwtPayload } from 'jsonwebtoken';
+import { M2mScope } from '../auth.constants';
+
+/**
+ * A utility function to check if the required M2M (Machine-to-Machine) scopes are present
+ * in the authorization token provided in the request headers.
+ *
+ * @param {...M2mScope[]} requiredM2mScopes - The list of required M2M scopes to validate against.
+ * @returns {Promise<(req: Request) => boolean>} A function that takes an Express `Request` object
+ * and returns a boolean indicating whether the required scopes are present.
+ *
+ * The function decodes the authorization token from the request headers and checks if
+ * the required scopes are included in the token's scope claim.
+ */
+export const checkM2MScope =
+  (...requiredM2mScopes: M2mScope[]) =>
+  async (req: Request) => {
+    const decodedAuth = await decodeAuthToken(req.headers.authorization ?? '');
+
+    const authorizedScopes = ((decodedAuth as JwtPayload).scope ?? '').split(
+      ' ',
+    );
+    if (!requiredM2mScopes.some((scope) => authorizedScopes.includes(scope))) {
+      return false;
+    }
+
+    return true;
+  };