@platform-mesh/portal-server-lib 0.6.10 → 0.6.11

package/dist/portal-options/index.d.ts

@@ -1,10 +1,8 @@
 export * from './account-entity-context-provider.service.js';
+export * from './auth-config-provider.js';
+export * from './logout-callback.service.js';
 export * from './pm-portal-context.service.js';
 export * from './pm-request-context-provider.js';
-export * from './auth-config-provider.js';
 export * from './service-providers/content-configuration-service-providers.service.js';
 export * from './service-providers/kubernetes-service-providers.service.js';
-export * from './auth-callback-provider.js';
-export * from './logout-callback.service.js';
 export * from './services/kcp-k8s.service.js';
-export * from './services/iam-graphql.service.js';

package/dist/portal-options/index.js

@@ -1,11 +1,9 @@
 export * from './account-entity-context-provider.service.js';
+export * from './auth-config-provider.js';
+export * from './logout-callback.service.js';
 export * from './pm-portal-context.service.js';
 export * from './pm-request-context-provider.js';
-export * from './auth-config-provider.js';
 export * from './service-providers/content-configuration-service-providers.service.js';
 export * from './service-providers/kubernetes-service-providers.service.js';
-export * from './auth-callback-provider.js';
-export * from './logout-callback.service.js';
 export * from './services/kcp-k8s.service.js';
-export * from './services/iam-graphql.service.js';
 //# sourceMappingURL=index.js.map

package/dist/portal-options/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/portal-options/index.ts"],"names":[],"mappings":"AAAA,cAAc,8CAA8C,CAAC;AAC7D,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wEAAwE,CAAC;AACvF,cAAc,6DAA6D,CAAC;AAC5E,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/portal-options/index.ts"],"names":[],"mappings":"AAAA,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kCAAkC,CAAC;AACjD,cAAc,wEAAwE,CAAC;AACvF,cAAc,6DAA6D,CAAC;AAE5E,cAAc,+BAA+B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platform-mesh/portal-server-lib",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "author": "Platform Mesh",
   "license": "Apache-2.0",
   "publishConfig": {

package/src/portal-options/index.ts

@@ -1,11 +1,9 @@
 export * from './account-entity-context-provider.service.js';
+export * from './auth-config-provider.js';
+export * from './logout-callback.service.js';
 export * from './pm-portal-context.service.js';
 export * from './pm-request-context-provider.js';
-export * from './auth-config-provider.js';
 export * from './service-providers/content-configuration-service-providers.service.js';
 export * from './service-providers/kubernetes-service-providers.service.js';
-export * from './auth-callback-provider.js';
-export * from './logout-callback.service.js';
 
 export * from './services/kcp-k8s.service.js';
-export * from './services/iam-graphql.service.js';

package/src/portal-options/services/kcp-k8s.service.spec.ts

@@ -335,6 +335,35 @@ describe('KcpKubernetesService', () => {
       );
     });
 
+    it('executes post middleware', async () => {
+      const svc = new KcpKubernetesService();
+      const gvr: K8sResourceDescriptor = {
+        group: 'apps',
+        version: 'v1',
+        plural: 'deployments',
+        name: 'my-deployment',
+      };
+      const context: K8sRequestContext = {
+        organization: 'org1',
+        'core_platform-mesh_io_account': 'acc1',
+      };
+
+      let postResult: any;
+      mockListClusterCustomObject.mockImplementation(async (_gvr, options) => {
+        const middleware = options.middleware[0];
+        const mockContext = {
+          setUrl: jest.fn(),
+        };
+        await middleware.options.pre(mockContext);
+        postResult = await middleware.options.post(mockContext);
+        return { data: {} };
+      });
+
+      await svc.listClusterCustomObject(gvr, context);
+
+      expect(postResult).toBeDefined();
+    });
+
     it('builds correct URL path in middleware', async () => {
       const svc = new KcpKubernetesService();
       const gvr: K8sResourceDescriptor = {
@@ -579,6 +608,30 @@ describe('KcpKubernetesService', () => {
       );
     });
 
+    it('executes post middleware', async () => {
+      const svc = new KcpKubernetesService();
+      const orgName = 'post-org';
+
+      let postResult: any;
+      mockReadNamespacedSecret.mockImplementation(async (_params, options) => {
+        const middleware = options.middleware[0];
+        const mockContext = {
+          setUrl: jest.fn(),
+        };
+        await middleware.options.pre(mockContext);
+        postResult = await middleware.options.post(mockContext);
+        return {
+          data: {
+            client_secret: Buffer.from('test').toString('base64'),
+          },
+        };
+      });
+
+      await svc.getClientSecret(orgName);
+
+      expect(postResult).toBeDefined();
+    });
+
     it('throws error when secret retrieval fails', async () => {
       const svc = new KcpKubernetesService();
       const orgName = 'fail-org';

package/dist/portal-options/auth-callback-provider.d.ts

@@ -1,10 +0,0 @@
-import { IAMGraphQlService } from './services/iam-graphql.service.js';
-import { AuthCallback, AuthTokenData } from '@openmfp/portal-server-lib';
-import { Request, Response } from 'express';
-export declare class AuthCallbackProvider implements AuthCallback {
-    private iamService;
-    private logger;
-    constructor(iamService: IAMGraphQlService);
-    handleSuccess(request: Request, response: Response, authTokenResponse: AuthTokenData): Promise<void>;
-    handleFailure(request: Request, response: Response): Promise<void>;
-}

package/dist/portal-options/auth-callback-provider.js

@@ -1,36 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var AuthCallbackProvider_1;
-import { IAMGraphQlService } from './services/iam-graphql.service.js';
-import { Injectable, Logger } from '@nestjs/common';
-let AuthCallbackProvider = AuthCallbackProvider_1 = class AuthCallbackProvider {
-    iamService;
-    logger = new Logger(AuthCallbackProvider_1.name);
-    constructor(iamService) {
-        this.iamService = iamService;
-    }
-    async handleSuccess(request, response, authTokenResponse) {
-        try {
-            await this.iamService.addUser(authTokenResponse.id_token, request, response);
-        }
-        catch (e) {
-            this.logger.error(e);
-        }
-    }
-    async handleFailure(request, response) {
-        return Promise.resolve();
-    }
-};
-AuthCallbackProvider = AuthCallbackProvider_1 = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [IAMGraphQlService])
-], AuthCallbackProvider);
-export { AuthCallbackProvider };
-//# sourceMappingURL=auth-callback-provider.js.map

package/dist/portal-options/auth-callback-provider.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth-callback-provider.js","sourceRoot":"","sources":["../../src/portal-options/auth-callback-provider.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAK7C,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAGX;IAFZ,MAAM,GAAW,IAAI,MAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAE/D,YAAoB,UAA6B;QAA7B,eAAU,GAAV,UAAU,CAAmB;IAAG,CAAC;IAErD,KAAK,CAAC,aAAa,CACjB,OAAgB,EAChB,QAAkB,EAClB,iBAAgC;QAEhC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAgB,EAAE,QAAkB;QACtD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AApBY,oBAAoB;IADhC,UAAU,EAAE;qCAIqB,iBAAiB;GAHtC,oBAAoB,CAoBhC"}

package/dist/portal-options/services/iam-graphql.service.d.ts

@@ -1,7 +0,0 @@
-import { PMRequestContextProvider } from '../pm-request-context-provider.js';
-import type { Request, Response } from 'express';
-export declare class IAMGraphQlService {
-    private requestContextProvider;
-    constructor(requestContextProvider: PMRequestContextProvider);
-    addUser(token: string, request: Request, response: Response): Promise<void>;
-}

package/dist/portal-options/services/iam-graphql.service.js

@@ -1,40 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { PMRequestContextProvider } from '../pm-request-context-provider.js';
-import { MUTATION_LOGIN } from './queries.js';
-import { Injectable } from '@nestjs/common';
-import { GraphQLClient } from 'graphql-request';
-let IAMGraphQlService = class IAMGraphQlService {
-    requestContextProvider;
-    constructor(requestContextProvider) {
-        this.requestContextProvider = requestContextProvider;
-    }
-    async addUser(token, request, response) {
-        const requestContext = await this.requestContextProvider.getContextValues(request, response);
-        const iamUrl = requestContext.iamServiceApiUrl;
-        const client = new GraphQLClient(iamUrl, {
-            headers: {
-                Authorization: `Bearer ${token}`,
-            },
-        });
-        try {
-            await client.request(MUTATION_LOGIN);
-        }
-        catch (e) {
-            console.error(e);
-        }
-    }
-};
-IAMGraphQlService = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [PMRequestContextProvider])
-], IAMGraphQlService);
-export { IAMGraphQlService };
-//# sourceMappingURL=iam-graphql.service.js.map

package/dist/portal-options/services/iam-graphql.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"iam-graphql.service.js","sourceRoot":"","sources":["../../../src/portal-options/services/iam-graphql.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGzC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACR;IAApB,YAAoB,sBAAgD;QAAhD,2BAAsB,GAAtB,sBAAsB,CAA0B;IAAG,CAAC;IAExE,KAAK,CAAC,OAAO,CACX,KAAa,EACb,OAAgB,EAChB,QAAkB;QAElB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CACvE,OAAO,EACP,QAAQ,CACT,CAAC;QACF,MAAM,MAAM,GAAG,cAAc,CAAC,gBAAgB,CAAC;QAC/C,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,EAAE;YACvC,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,KAAK,EAAE;aACjC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;CACF,CAAA;AAzBY,iBAAiB;IAD7B,UAAU,EAAE;qCAEiC,wBAAwB;GADzD,iBAAiB,CAyB7B"}

package/src/portal-options/auth-callback-provider.spec.ts

@@ -1,85 +0,0 @@
-import { AuthCallbackProvider } from './auth-callback-provider.js';
-import { IAMGraphQlService } from './services/iam-graphql.service.js';
-import { Test, TestingModule } from '@nestjs/testing';
-import type { AuthTokenData } from '@openmfp/portal-server-lib';
-import type { Request, Response } from 'express';
-import { mock } from 'jest-mock-extended';
-
-jest.mock('@kubernetes/client-node', () => {
-  class KubeConfig {
-    loadFromDefault = jest.fn();
-    loadFromFile = jest.fn();
-    getCurrentCluster = jest.fn().mockReturnValue({
-      server: 'https://k8s.example.com/base',
-      name: 'test-cluster',
-    });
-    makeApiClient = jest.fn();
-    addUser = jest.fn();
-    addContext = jest.fn();
-    setCurrentContext = jest.fn();
-  }
-  class CustomObjectsApi {}
-  return { KubeConfig, CustomObjectsApi };
-});
-
-describe('AuthCallbackProvider', () => {
-  let callback: AuthCallbackProvider;
-  let iamServiceMock: IAMGraphQlService;
-
-  beforeEach(async () => {
-    iamServiceMock = mock<IAMGraphQlService>();
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        AuthCallbackProvider,
-        {
-          provide: IAMGraphQlService,
-          useValue: iamServiceMock,
-        },
-      ],
-    }).compile();
-
-    callback = module.get<AuthCallbackProvider>(AuthCallbackProvider);
-  });
-
-  it('should be defined', () => {
-    expect(callback).toBeDefined();
-  });
-
-  it('should create a user', async () => {
-    const req = mock<Request>();
-    const res = mock<Response>();
-
-    await callback.handleSuccess(req, res, {
-      id_token: 'idtoken',
-    } as AuthTokenData);
-
-    expect(iamServiceMock.addUser).toHaveBeenCalledTimes(1);
-    expect(iamServiceMock.addUser).toHaveBeenCalledWith('idtoken', req, res);
-  });
-
-  it('should log error if addUser throws', async () => {
-    const req = mock<Request>();
-    const res = mock<Response>();
-    const error = new Error('boom');
-    (iamServiceMock.addUser as jest.Mock).mockRejectedValueOnce(error);
-
-    const errorSpy = jest
-
-      .spyOn((callback as any).logger, 'error')
-      .mockImplementation(() => undefined as unknown as never);
-
-    await callback.handleSuccess(req, res, {
-      id_token: 'bad',
-    } as AuthTokenData);
-
-    expect(iamServiceMock.addUser).toHaveBeenCalledTimes(1);
-    expect(errorSpy).toHaveBeenCalledWith(error);
-  });
-
-  it('should resolve handleFailure without action', async () => {
-    const req = mock<Request>();
-    const res = mock<Response>();
-
-    await expect(callback.handleFailure(req, res)).resolves.toBeUndefined();
-  });
-});

package/src/portal-options/auth-callback-provider.ts

@@ -1,27 +0,0 @@
-import { IAMGraphQlService } from './services/iam-graphql.service.js';
-import { Injectable, Logger } from '@nestjs/common';
-import { AuthCallback, AuthTokenData } from '@openmfp/portal-server-lib';
-import { Request, Response } from 'express';
-
-@Injectable()
-export class AuthCallbackProvider implements AuthCallback {
-  private logger: Logger = new Logger(AuthCallbackProvider.name);
-
-  constructor(private iamService: IAMGraphQlService) {}
-
-  async handleSuccess(
-    request: Request,
-    response: Response,
-    authTokenResponse: AuthTokenData,
-  ): Promise<void> {
-    try {
-      await this.iamService.addUser(authTokenResponse.id_token, request, response);
-    } catch (e) {
-      this.logger.error(e);
-    }
-  }
-
-  async handleFailure(request: Request, response: Response): Promise<void> {
-    return Promise.resolve();
-  }
-}

package/src/portal-options/services/iam-graphql.service.spec.ts

@@ -1,77 +0,0 @@
-import { PMRequestContextProvider } from '../pm-request-context-provider.js';
-import { IAMGraphQlService } from './iam-graphql.service.js';
-import { MUTATION_LOGIN } from './queries.js';
-import { GraphQLClient } from 'graphql-request';
-import { mock } from 'jest-mock-extended';
-
-jest.mock('@kubernetes/client-node', () => {
-  class KubeConfig {
-    loadFromDefault = jest.fn();
-    loadFromFile = jest.fn();
-    getCurrentCluster = jest.fn().mockReturnValue({
-      server: 'https://k8s.example.com/base',
-      name: 'test-cluster',
-    });
-    makeApiClient = jest.fn();
-    addUser = jest.fn();
-    addContext = jest.fn();
-    setCurrentContext = jest.fn();
-  }
-  class CustomObjectsApi {}
-  return { KubeConfig, CustomObjectsApi };
-});
-
-describe('IAMGraphQlService', () => {
-  const mockIamServiceApiUrl = 'http://localhost:8080/query';
-  let service: IAMGraphQlService;
-  const gqlClient = {
-    request: jest.fn(),
-  } as unknown as GraphQLClient;
-
-  const requestContextProvider = mock<PMRequestContextProvider>({
-    getContextValues: jest
-      .fn()
-      .mockResolvedValue({ iamServiceApiUrl: mockIamServiceApiUrl }),
-  });
-
-  let GraphQLClientMock: jest.SpyInstance;
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-
-    // Re-apply RequestContextProvider mock after resetAllMocks
-    (
-      requestContextProvider.getContextValues as unknown as jest.Mock
-    ).mockResolvedValue({
-      iamServiceApiUrl: mockIamServiceApiUrl,
-    });
-
-    // Mock GraphQLClient constructor to return our mocked client
-    GraphQLClientMock = jest
-      .spyOn<any, any>(require('graphql-request'), 'GraphQLClient')
-      .mockImplementation(() => gqlClient);
-
-    service = new IAMGraphQlService(requestContextProvider as any);
-  });
-
-  it('should call mutation addUser', async () => {
-    (gqlClient.request as jest.Mock).mockResolvedValue('');
-
-    const response = await service.addUser('token', {} as any, {} as any);
-
-    expect(GraphQLClientMock).toHaveBeenCalledWith(mockIamServiceApiUrl, {
-      headers: { Authorization: 'Bearer token' },
-    });
-    expect(gqlClient.request).toHaveBeenCalledWith(MUTATION_LOGIN);
-    expect(response).toBe(undefined);
-  });
-
-  it('should call mutation addUser and log error', async () => {
-    console.error = jest.fn();
-    (gqlClient.request as jest.Mock).mockRejectedValue('error');
-
-    const response = await service.addUser('token', {} as any, {} as any);
-    expect(response).toBe(undefined);
-    expect(console.error).toHaveBeenCalledWith('error');
-  });
-});

package/src/portal-options/services/iam-graphql.service.ts

@@ -1,33 +0,0 @@
-import { PMRequestContextProvider } from '../pm-request-context-provider.js';
-import { MUTATION_LOGIN } from './queries.js';
-import { Injectable } from '@nestjs/common';
-import type { Request, Response } from 'express';
-import { GraphQLClient } from 'graphql-request';
-
-@Injectable()
-export class IAMGraphQlService {
-  constructor(private requestContextProvider: PMRequestContextProvider) {}
-
-  async addUser(
-    token: string,
-    request: Request,
-    response: Response,
-  ): Promise<void> {
-    const requestContext = await this.requestContextProvider.getContextValues(
-      request,
-      response,
-    );
-    const iamUrl = requestContext.iamServiceApiUrl;
-    const client = new GraphQLClient(iamUrl, {
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-
-    try {
-      await client.request(MUTATION_LOGIN);
-    } catch (e) {
-      console.error(e);
-    }
-  }
-}