@futdevpro/nts-dynamo 1.15.151 → 1.15.153

package/src/_modules/oauth2/_routes/oauth2.controller.spec.ts

@@ -1,107 +1,107 @@
-
-import { DyNTS_OAuth2_Controller } from './oauth2.controller';
-import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-params.control-model';
-import { DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
-import { DyNTS_OAuth2_AuthService } from '../_services/oauth2.auth-service';
-import { DyNTS_OAuth2_ControlService } from '../_services/oauth2.control-service';
-
-describe('| DyNTS_OAuth2_Controller', () => {
-  let controller: DyNTS_OAuth2_Controller;
-  let mockAuthService: jasmine.SpyObj<DyNTS_OAuth2_AuthService>;
-  let mockControlService: jasmine.SpyObj<DyNTS_OAuth2_ControlService>;
-
-  beforeEach(() => {
-    // Reset singleton instances to prevent state leakage between tests
-    (DyNTS_OAuth2_Controller as any).instance = undefined;
-    (DyNTS_OAuth2_ControlService as any).instance = undefined;
-    (DyNTS_OAuth2_AuthService as any).instance = undefined;
-
-    // Mock the services to prevent circular dependency
-    mockAuthService = jasmine.createSpyObj('DyNTS_OAuth2_AuthService', [
-      'authenticate_token',
-      'getTokenFromRequest',
-    ]);
-    mockControlService = jasmine.createSpyObj('DyNTS_OAuth2_ControlService', [
-      'handleAuthorizationRequest',
-      'handleTokenRequest',
-      'handleUserInfoRequest',
-      'handleTokenRevocation',
-    ]);
-    
-    spyOn(DyNTS_OAuth2_AuthService, 'getInstance').and.returnValue(mockAuthService);
-    spyOn(DyNTS_OAuth2_ControlService, 'getInstance').and.returnValue(mockControlService);
-
-    // Now we can safely get the Controller instance
-    controller = DyNTS_OAuth2_Controller.getInstance();
-    
-    // Replace the services with our mocks
-    (controller as any).authService = mockAuthService;
-    (controller as any).controlService = mockControlService;
-  });
-
-  it('| should be a singleton instance', () => {
-    const instance1 = DyNTS_OAuth2_Controller.getInstance();
-    const instance2 = DyNTS_OAuth2_Controller.getInstance();
-
-    expect(instance1).toBe(instance2);
-    expect(instance1).toBeInstanceOf(DyNTS_OAuth2_Controller);
-  });
-
-  describe('| setupEndpoints', () => {
-    it('| should setup all OAuth2 endpoints', () => {
-      controller.setupEndpoints();
-
-      expect(controller.endpoints).toBeDefined();
-      expect(controller.endpoints.length).toBe(4);
-    });
-
-    it('| should setup authorize endpoint', () => {
-      controller.setupEndpoints();
-
-      const authorizeEndpoint = controller.endpoints.find(ep => ep.name === 'authorize');
-      expect(authorizeEndpoint).toBeDefined();
-      expect(authorizeEndpoint?.type).toBe(DyFM_HttpCallType.get);
-      expect(authorizeEndpoint?.endpoint).toBe('/oauth2/authorize');
-      expect((authorizeEndpoint as any)?.tasks).toBeDefined();
-      expect((authorizeEndpoint as any)?.tasks?.length).toBe(1);
-    });
-
-    it('| should setup token endpoint', () => {
-      controller.setupEndpoints();
-
-      const tokenEndpoint = controller.endpoints.find(ep => ep.name === 'token');
-      expect(tokenEndpoint).toBeDefined();
-      expect(tokenEndpoint?.type).toBe(DyFM_HttpCallType.post);
-      expect(tokenEndpoint?.endpoint).toBe('/oauth2/token');
-      expect((tokenEndpoint as any)?.tasks).toBeDefined();
-      expect((tokenEndpoint as any)?.tasks?.length).toBe(1);
-    });
-
-    it('| should setup userinfo endpoint', () => {
-      controller.setupEndpoints();
-
-      const userinfoEndpoint = controller.endpoints.find(ep => ep.name === 'userinfo');
-      expect(userinfoEndpoint).toBeDefined();
-      expect(userinfoEndpoint?.type).toBe(DyFM_HttpCallType.get);
-      expect(userinfoEndpoint?.endpoint).toBe('/oauth2/userinfo');
-      expect((userinfoEndpoint as any)?.preProcesses).toBeDefined();
-      expect((userinfoEndpoint as any)?.preProcesses?.length).toBe(1);
-      expect((userinfoEndpoint as any)?.tasks).toBeDefined();
-      expect((userinfoEndpoint as any)?.tasks?.length).toBe(1);
-    });
-
-    it('| should setup revoke endpoint', () => {
-      controller.setupEndpoints();
-
-      const revokeEndpoint = controller.endpoints.find(ep => ep.name === 'revoke');
-      expect(revokeEndpoint).toBeDefined();
-      expect(revokeEndpoint?.type).toBe(DyFM_HttpCallType.post);
-      expect(revokeEndpoint?.endpoint).toBe('/oauth2/revoke');
-      expect((revokeEndpoint as any)?.preProcesses).toBeDefined();
-      expect((revokeEndpoint as any)?.preProcesses?.length).toBe(1);
-      expect((revokeEndpoint as any)?.tasks).toBeDefined();
-      expect((revokeEndpoint as any)?.tasks?.length).toBe(1);
-    });
-  });
-});
-
+
+import { DyNTS_OAuth2_Controller } from './oauth2.controller';
+import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-params.control-model';
+import { DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
+import { DyNTS_OAuth2_AuthService } from '../_services/oauth2.auth-service';
+import { DyNTS_OAuth2_ControlService } from '../_services/oauth2.control-service';
+
+describe('| DyNTS_OAuth2_Controller', () => {
+  let controller: DyNTS_OAuth2_Controller;
+  let mockAuthService: jasmine.SpyObj<DyNTS_OAuth2_AuthService>;
+  let mockControlService: jasmine.SpyObj<DyNTS_OAuth2_ControlService>;
+
+  beforeEach(() => {
+    // Reset singleton instances to prevent state leakage between tests
+    (DyNTS_OAuth2_Controller as any).instance = undefined;
+    (DyNTS_OAuth2_ControlService as any).instance = undefined;
+    (DyNTS_OAuth2_AuthService as any).instance = undefined;
+
+    // Mock the services to prevent circular dependency
+    mockAuthService = jasmine.createSpyObj('DyNTS_OAuth2_AuthService', [
+      'authenticate_token',
+      'getTokenFromRequest',
+    ]);
+    mockControlService = jasmine.createSpyObj('DyNTS_OAuth2_ControlService', [
+      'handleAuthorizationRequest',
+      'handleTokenRequest',
+      'handleUserInfoRequest',
+      'handleTokenRevocation',
+    ]);
+    
+    spyOn(DyNTS_OAuth2_AuthService, 'getInstance').and.returnValue(mockAuthService);
+    spyOn(DyNTS_OAuth2_ControlService, 'getInstance').and.returnValue(mockControlService);
+
+    // Now we can safely get the Controller instance
+    controller = DyNTS_OAuth2_Controller.getInstance();
+    
+    // Replace the services with our mocks
+    (controller as any).authService = mockAuthService;
+    (controller as any).controlService = mockControlService;
+  });
+
+  it('| should be a singleton instance', () => {
+    const instance1 = DyNTS_OAuth2_Controller.getInstance();
+    const instance2 = DyNTS_OAuth2_Controller.getInstance();
+
+    expect(instance1).toBe(instance2);
+    expect(instance1).toBeInstanceOf(DyNTS_OAuth2_Controller);
+  });
+
+  describe('| setupEndpoints', () => {
+    it('| should setup all OAuth2 endpoints', () => {
+      controller.setupEndpoints();
+
+      expect(controller.endpoints).toBeDefined();
+      expect(controller.endpoints.length).toBe(4);
+    });
+
+    it('| should setup authorize endpoint', () => {
+      controller.setupEndpoints();
+
+      const authorizeEndpoint = controller.endpoints.find(ep => ep.name === 'authorize');
+      expect(authorizeEndpoint).toBeDefined();
+      expect(authorizeEndpoint?.type).toBe(DyFM_HttpCallType.get);
+      expect(authorizeEndpoint?.endpoint).toBe('/oauth2/authorize');
+      expect((authorizeEndpoint as any)?.tasks).toBeDefined();
+      expect((authorizeEndpoint as any)?.tasks?.length).toBe(1);
+    });
+
+    it('| should setup token endpoint', () => {
+      controller.setupEndpoints();
+
+      const tokenEndpoint = controller.endpoints.find(ep => ep.name === 'token');
+      expect(tokenEndpoint).toBeDefined();
+      expect(tokenEndpoint?.type).toBe(DyFM_HttpCallType.post);
+      expect(tokenEndpoint?.endpoint).toBe('/oauth2/token');
+      expect((tokenEndpoint as any)?.tasks).toBeDefined();
+      expect((tokenEndpoint as any)?.tasks?.length).toBe(1);
+    });
+
+    it('| should setup userinfo endpoint', () => {
+      controller.setupEndpoints();
+
+      const userinfoEndpoint = controller.endpoints.find(ep => ep.name === 'userinfo');
+      expect(userinfoEndpoint).toBeDefined();
+      expect(userinfoEndpoint?.type).toBe(DyFM_HttpCallType.get);
+      expect(userinfoEndpoint?.endpoint).toBe('/oauth2/userinfo');
+      expect((userinfoEndpoint as any)?.preProcesses).toBeDefined();
+      expect((userinfoEndpoint as any)?.preProcesses?.length).toBe(1);
+      expect((userinfoEndpoint as any)?.tasks).toBeDefined();
+      expect((userinfoEndpoint as any)?.tasks?.length).toBe(1);
+    });
+
+    it('| should setup revoke endpoint', () => {
+      controller.setupEndpoints();
+
+      const revokeEndpoint = controller.endpoints.find(ep => ep.name === 'revoke');
+      expect(revokeEndpoint).toBeDefined();
+      expect(revokeEndpoint?.type).toBe(DyFM_HttpCallType.post);
+      expect(revokeEndpoint?.endpoint).toBe('/oauth2/revoke');
+      expect((revokeEndpoint as any)?.preProcesses).toBeDefined();
+      expect((revokeEndpoint as any)?.preProcesses?.length).toBe(1);
+      expect((revokeEndpoint as any)?.tasks).toBeDefined();
+      expect((revokeEndpoint as any)?.tasks?.length).toBe(1);
+    });
+  });
+});
+

package/src/_modules/oauth2/_routes/oauth2.controller.ts

@@ -1,99 +1,99 @@
-import { Request, Response } from 'express';
-import { DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
-import { DyNTS_Controller } from '../../../_services/route/controller.service';
-import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-params.control-model';
-import { DyNTS_OAuth2_AuthService } from '../_services/oauth2.auth-service';
-import { DyNTS_OAuth2_ControlService } from '../_services/oauth2.control-service';
-
-/**
- * OAuth2 Controller implementation
- * 
- * This controller handles OAuth2 specific endpoints and authentication flows
- * 
- * @example
- * const oauth2Controller = DyNTS_OAuth2_Controller.getInstance();
- * oauth2Controller.setupEndpoints();
- */
-export class DyNTS_OAuth2_Controller extends DyNTS_Controller {
-  static getInstance(): DyNTS_OAuth2_Controller {
-    return DyNTS_OAuth2_Controller.getSingletonInstance();
-  }
-
-  private readonly authService: DyNTS_OAuth2_AuthService = DyNTS_OAuth2_AuthService.getInstance();
-  private readonly controlService: DyNTS_OAuth2_ControlService = DyNTS_OAuth2_ControlService.getInstance();
-
-  setupEndpoints(): void {
-    this.endpoints = [
-      new DyNTS_Endpoint_Params({
-        name: 'authorize',
-        type: DyFM_HttpCallType.get,
-        endpoint: '/oauth2/authorize',
-        tasks: [
-          async (req: Request, res: Response): Promise<void> => {
-            // TODO: Implement OAuth2 authorization endpoint
-            // 1. Validate client_id and redirect_uri
-            // 2. Check if user is already authenticated
-            // 3. If not authenticated, redirect to login page
-            // 4. If authenticated, show consent page
-            // 5. Handle user consent
-            // 6. Generate authorization code or access token
-            // 7. Redirect back to client with code/token
-            await this.controlService.handleAuthorizationRequest(req, res);
-          },
-        ],
-      }),
-
-      new DyNTS_Endpoint_Params({
-        name: 'token',
-        type: DyFM_HttpCallType.post,
-        endpoint: '/oauth2/token',
-        tasks: [
-          async (req: Request, res: Response): Promise<void> => {
-            // TODO: Implement OAuth2 token endpoint
-            // 1. Validate client credentials
-            // 2. Handle different grant types:
-            //    - authorization_code
-            //    - refresh_token
-            //    - client_credentials
-            //    - password
-            // 3. Generate appropriate tokens
-            // 4. Return token response
-            await this.controlService.handleTokenRequest(req, res);
-          },
-        ],
-      }),
-
-      new DyNTS_Endpoint_Params({
-        name: 'userinfo',
-        type: DyFM_HttpCallType.get,
-        endpoint: '/oauth2/userinfo',
-        preProcesses: [this.authService.authenticate_token],
-        tasks: [
-          async (req: Request, res: Response): Promise<void> => {
-            // TODO: Implement OAuth2 userinfo endpoint
-            // 1. Extract user information from token
-            // 2. Validate token scope
-            // 3. Return user information based on scope
-            await this.controlService.handleUserInfoRequest(req, res);
-          },
-        ],
-      }),
-
-      new DyNTS_Endpoint_Params({
-        name: 'revoke',
-        type: DyFM_HttpCallType.post,
-        endpoint: '/oauth2/revoke',
-        preProcesses: [this.authService.authenticate_token],
-        tasks: [
-          async (req: Request, res: Response): Promise<void> => {
-            // TODO: Implement OAuth2 token revocation endpoint
-            // 1. Validate token
-            // 2. Revoke token and any associated refresh tokens
-            // 3. Clear token from storage/cache
-            await this.controlService.handleTokenRevocation(req, res);
-          },
-        ],
-      }),
-    ];
-  }
+import { Request, Response } from 'express';
+import { DyFM_HttpCallType } from '@futdevpro/fsm-dynamo';
+import { DyNTS_Controller } from '../../../_services/route/controller.service';
+import { DyNTS_Endpoint_Params } from '../../../_models/control-models/endpoint-params.control-model';
+import { DyNTS_OAuth2_AuthService } from '../_services/oauth2.auth-service';
+import { DyNTS_OAuth2_ControlService } from '../_services/oauth2.control-service';
+
+/**
+ * OAuth2 Controller implementation
+ * 
+ * This controller handles OAuth2 specific endpoints and authentication flows
+ * 
+ * @example
+ * const oauth2Controller = DyNTS_OAuth2_Controller.getInstance();
+ * oauth2Controller.setupEndpoints();
+ */
+export class DyNTS_OAuth2_Controller extends DyNTS_Controller {
+  static getInstance(): DyNTS_OAuth2_Controller {
+    return DyNTS_OAuth2_Controller.getSingletonInstance();
+  }
+
+  private readonly authService: DyNTS_OAuth2_AuthService = DyNTS_OAuth2_AuthService.getInstance();
+  private readonly controlService: DyNTS_OAuth2_ControlService = DyNTS_OAuth2_ControlService.getInstance();
+
+  setupEndpoints(): void {
+    this.endpoints = [
+      new DyNTS_Endpoint_Params({
+        name: 'authorize',
+        type: DyFM_HttpCallType.get,
+        endpoint: '/oauth2/authorize',
+        tasks: [
+          async (req: Request, res: Response): Promise<void> => {
+            // TODO: Implement OAuth2 authorization endpoint
+            // 1. Validate client_id and redirect_uri
+            // 2. Check if user is already authenticated
+            // 3. If not authenticated, redirect to login page
+            // 4. If authenticated, show consent page
+            // 5. Handle user consent
+            // 6. Generate authorization code or access token
+            // 7. Redirect back to client with code/token
+            await this.controlService.handleAuthorizationRequest(req, res);
+          },
+        ],
+      }),
+
+      new DyNTS_Endpoint_Params({
+        name: 'token',
+        type: DyFM_HttpCallType.post,
+        endpoint: '/oauth2/token',
+        tasks: [
+          async (req: Request, res: Response): Promise<void> => {
+            // TODO: Implement OAuth2 token endpoint
+            // 1. Validate client credentials
+            // 2. Handle different grant types:
+            //    - authorization_code
+            //    - refresh_token
+            //    - client_credentials
+            //    - password
+            // 3. Generate appropriate tokens
+            // 4. Return token response
+            await this.controlService.handleTokenRequest(req, res);
+          },
+        ],
+      }),
+
+      new DyNTS_Endpoint_Params({
+        name: 'userinfo',
+        type: DyFM_HttpCallType.get,
+        endpoint: '/oauth2/userinfo',
+        preProcesses: [this.authService.authenticate_token],
+        tasks: [
+          async (req: Request, res: Response): Promise<void> => {
+            // TODO: Implement OAuth2 userinfo endpoint
+            // 1. Extract user information from token
+            // 2. Validate token scope
+            // 3. Return user information based on scope
+            await this.controlService.handleUserInfoRequest(req, res);
+          },
+        ],
+      }),
+
+      new DyNTS_Endpoint_Params({
+        name: 'revoke',
+        type: DyFM_HttpCallType.post,
+        endpoint: '/oauth2/revoke',
+        preProcesses: [this.authService.authenticate_token],
+        tasks: [
+          async (req: Request, res: Response): Promise<void> => {
+            // TODO: Implement OAuth2 token revocation endpoint
+            // 1. Validate token
+            // 2. Revoke token and any associated refresh tokens
+            // 3. Clear token from storage/cache
+            await this.controlService.handleTokenRevocation(req, res);
+          },
+        ],
+      }),
+    ];
+  }
 }