@webiny/api-core 6.4.12-beta.5 → 6.5.0-beta.1

package/features/ai/toolPipeline/AiToolPipelineRunner.d.ts

@@ -0,0 +1,10 @@
+import { type IAiOutputToolRegistry, type IAiToolPipelineRunner } from "./abstractions.js";
+declare class AiToolPipelineRunnerImpl implements IAiToolPipelineRunner {
+    private registry;
+    constructor(registry: IAiOutputToolRegistry);
+    resolve(data: unknown): Promise<unknown>;
+}
+export declare const AiToolPipelineRunner: typeof AiToolPipelineRunnerImpl & {
+    __abstraction: import("@webiny/di").Abstraction<IAiToolPipelineRunner>;
+};
+export {};

package/features/ai/toolPipeline/AiToolPipelineRunner.js

@@ -0,0 +1,36 @@
+import { AiOutputToolRegistry, AiToolPipelineRunner } from "./abstractions.js";
+function isToolEnvelope(value) {
+    return "object" == typeof value && null !== value && "tool" in value && "string" == typeof value.tool && "params" in value && "object" == typeof value.params;
+}
+class AiToolPipelineRunnerImpl {
+    constructor(registry){
+        this.registry = registry;
+    }
+    async resolve(data) {
+        if (null == data) return data;
+        if (isToolEnvelope(data)) {
+            if (!this.registry.has(data.tool)) return data;
+            const result = await this.registry.invoke(data.tool, data.params);
+            return this.resolve(result);
+        }
+        if (Array.isArray(data)) return Promise.all(data.map((item)=>this.resolve(item)));
+        if ("object" == typeof data) {
+            const entries = Object.entries(data);
+            const resolvedValues = await Promise.all(entries.map(([, value])=>this.resolve(value)));
+            return Object.fromEntries(entries.map(([key], i)=>[
+                    key,
+                    resolvedValues[i]
+                ]));
+        }
+        return data;
+    }
+}
+const AiToolPipelineRunner_AiToolPipelineRunner = AiToolPipelineRunner.createImplementation({
+    implementation: AiToolPipelineRunnerImpl,
+    dependencies: [
+        AiOutputToolRegistry
+    ]
+});
+export { AiToolPipelineRunner_AiToolPipelineRunner as AiToolPipelineRunner };
+
+//# sourceMappingURL=AiToolPipelineRunner.js.map

package/features/ai/toolPipeline/AiToolPipelineRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/ai/toolPipeline/AiToolPipelineRunner.js","sources":["../../../../src/features/ai/toolPipeline/AiToolPipelineRunner.ts"],"sourcesContent":["import {\n    AiOutputToolRegistry,\n    AiToolPipelineRunner as Abstraction,\n    type IAiOutputToolRegistry,\n    type IAiToolPipelineRunner\n} from \"./abstractions.js\";\n\nfunction isToolEnvelope(\n    value: unknown\n): value is { tool: string; params: Record<string, unknown> } {\n    return (\n        typeof value === \"object\" &&\n        value !== null &&\n        \"tool\" in value &&\n        typeof (value as Record<string, unknown>).tool === \"string\" &&\n        \"params\" in value &&\n        typeof (value as Record<string, unknown>).params === \"object\"\n    );\n}\n\nclass AiToolPipelineRunnerImpl implements IAiToolPipelineRunner {\n    constructor(private registry: IAiOutputToolRegistry) {}\n\n    async resolve(data: unknown): Promise<unknown> {\n        if (data === null || data === undefined) {\n            return data;\n        }\n\n        if (isToolEnvelope(data)) {\n            if (!this.registry.has(data.tool)) {\n                return data;\n            }\n            const result = await this.registry.invoke(data.tool, data.params);\n            return this.resolve(result);\n        }\n\n        if (Array.isArray(data)) {\n            return Promise.all(data.map(item => this.resolve(item)));\n        }\n\n        if (typeof data === \"object\") {\n            const entries = Object.entries(data as Record<string, unknown>);\n            const resolvedValues = await Promise.all(\n                entries.map(([, value]) => this.resolve(value))\n            );\n            return Object.fromEntries(entries.map(([key], i) => [key, resolvedValues[i]]));\n        }\n\n        return data;\n    }\n}\n\nexport const AiToolPipelineRunner = Abstraction.createImplementation({\n    implementation: AiToolPipelineRunnerImpl,\n    dependencies: [AiOutputToolRegistry]\n});\n"],"names":["isToolEnvelope","value","AiToolPipelineRunnerImpl","registry","data","result","Array","Promise","item","entries","Object","resolvedValues","key","i","AiToolPipelineRunner","Abstraction","AiOutputToolRegistry"],"mappings":";AAOA,SAASA,eACLC,KAAc;IAEd,OACI,AAAiB,YAAjB,OAAOA,SACPA,AAAU,SAAVA,SACA,UAAUA,SACV,AAAmD,YAAnD,OAAQA,MAAkC,IAAI,IAC9C,YAAYA,SACZ,AAAqD,YAArD,OAAQA,MAAkC,MAAM;AAExD;AAEA,MAAMC;IACF,YAAoBC,QAA+B,CAAE;aAAjCA,QAAQ,GAARA;IAAkC;IAEtD,MAAM,QAAQC,IAAa,EAAoB;QAC3C,IAAIA,QAAAA,MACA,OAAOA;QAGX,IAAIJ,eAAeI,OAAO;YACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAACA,KAAK,IAAI,GAC5B,OAAOA;YAEX,MAAMC,SAAS,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAACD,KAAK,IAAI,EAAEA,KAAK,MAAM;YAChE,OAAO,IAAI,CAAC,OAAO,CAACC;QACxB;QAEA,IAAIC,MAAM,OAAO,CAACF,OACd,OAAOG,QAAQ,GAAG,CAACH,KAAK,GAAG,CAACI,CAAAA,OAAQ,IAAI,CAAC,OAAO,CAACA;QAGrD,IAAI,AAAgB,YAAhB,OAAOJ,MAAmB;YAC1B,MAAMK,UAAUC,OAAO,OAAO,CAACN;YAC/B,MAAMO,iBAAiB,MAAMJ,QAAQ,GAAG,CACpCE,QAAQ,GAAG,CAAC,CAAC,GAAGR,MAAM,GAAK,IAAI,CAAC,OAAO,CAACA;YAE5C,OAAOS,OAAO,WAAW,CAACD,QAAQ,GAAG,CAAC,CAAC,CAACG,IAAI,EAAEC,IAAM;oBAACD;oBAAKD,cAAc,CAACE,EAAE;iBAAC;QAChF;QAEA,OAAOT;IACX;AACJ;AAEO,MAAMU,4CAAuBC,qBAAAA,oBAAgC,CAAC;IACjE,gBAAgBb;IAChB,cAAc;QAACc;KAAqB;AACxC"}

package/features/ai/toolPipeline/abstractions.d.ts

@@ -0,0 +1,23 @@
+export interface IAiOutputTool {
+    readonly name: string;
+    execute(params: Record<string, unknown>): Promise<unknown>;
+}
+export declare const AiOutputTool: import("@webiny/di").Abstraction<IAiOutputTool>;
+export declare namespace AiOutputTool {
+    type Interface = IAiOutputTool;
+}
+export interface IAiOutputToolRegistry {
+    has(name: string): boolean;
+    invoke(name: string, params: Record<string, unknown>): Promise<unknown>;
+}
+export declare const AiOutputToolRegistry: import("@webiny/di").Abstraction<IAiOutputToolRegistry>;
+export declare namespace AiOutputToolRegistry {
+    type Interface = IAiOutputToolRegistry;
+}
+export interface IAiToolPipelineRunner {
+    resolve(data: unknown): Promise<unknown>;
+}
+export declare const AiToolPipelineRunner: import("@webiny/di").Abstraction<IAiToolPipelineRunner>;
+export declare namespace AiToolPipelineRunner {
+    type Interface = IAiToolPipelineRunner;
+}

package/features/ai/toolPipeline/abstractions.js

@@ -0,0 +1,7 @@
+import { createAbstraction } from "@webiny/feature/api";
+const AiOutputTool = createAbstraction("AiOutputTool");
+const AiOutputToolRegistry = createAbstraction("AiOutputToolRegistry");
+const AiToolPipelineRunner = createAbstraction("AiToolPipelineRunner");
+export { AiOutputTool, AiOutputToolRegistry, AiToolPipelineRunner };
+
+//# sourceMappingURL=abstractions.js.map

package/features/ai/toolPipeline/abstractions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/ai/toolPipeline/abstractions.js","sources":["../../../../src/features/ai/toolPipeline/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\n\nexport interface IAiOutputTool {\n    readonly name: string;\n    execute(params: Record<string, unknown>): Promise<unknown>;\n}\n\nexport const AiOutputTool = createAbstraction<IAiOutputTool>(\"AiOutputTool\");\n\nexport namespace AiOutputTool {\n    export type Interface = IAiOutputTool;\n}\n\nexport interface IAiOutputToolRegistry {\n    has(name: string): boolean;\n    invoke(name: string, params: Record<string, unknown>): Promise<unknown>;\n}\n\nexport const AiOutputToolRegistry =\n    createAbstraction<IAiOutputToolRegistry>(\"AiOutputToolRegistry\");\n\nexport namespace AiOutputToolRegistry {\n    export type Interface = IAiOutputToolRegistry;\n}\n\nexport interface IAiToolPipelineRunner {\n    resolve(data: unknown): Promise<unknown>;\n}\n\nexport const AiToolPipelineRunner =\n    createAbstraction<IAiToolPipelineRunner>(\"AiToolPipelineRunner\");\n\nexport namespace AiToolPipelineRunner {\n    export type Interface = IAiToolPipelineRunner;\n}\n"],"names":["AiOutputTool","createAbstraction","AiOutputToolRegistry","AiToolPipelineRunner"],"mappings":";AAOO,MAAMA,eAAeC,kBAAiC;AAWtD,MAAMC,uBACTD,kBAAyC;AAUtC,MAAME,uBACTF,kBAAyC"}

package/features/ai/toolPipeline/index.d.ts

@@ -0,0 +1,2 @@
+export { AiOutputTool, AiOutputToolRegistry, AiToolPipelineRunner } from "./abstractions.js";
+export type { IAiOutputTool, IAiOutputToolRegistry, IAiToolPipelineRunner } from "./abstractions.js";

package/features/ai/toolPipeline/index.js

@@ -0,0 +1 @@
+export { AiOutputTool, AiOutputToolRegistry, AiToolPipelineRunner } from "./abstractions.js";

package/features/security/apiKeys/GetApiKey/GetApiKeyUseCase.d.ts

@@ -7,7 +7,7 @@ declare class GetApiKeyUseCaseImpl implements GetApiKeyUseCaseAbstraction.Interf
     private repository;
     private identityContext;
     constructor(repository: ApiKeysRepository.Interface, identityContext: IdentityContext.Interface);
-    execute(id: string): Promise<Result<ApiKey | null, GetApiKeyUseCaseAbstraction.Error>>;
+    execute(id: string): Promise<Result<ApiKey, GetApiKeyUseCaseAbstraction.Error>>;
 }
 export declare const GetApiKeyUseCase: typeof GetApiKeyUseCaseImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IGetApiKey>;

package/features/security/apiKeys/GetApiKey/GetApiKeyUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/GetApiKey/GetApiKeyUseCase.js","sources":["../../../../../src/features/security/apiKeys/GetApiKey/GetApiKeyUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { GetApiKeyUseCase as GetApiKeyUseCaseAbstraction } from \"./abstractions.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\nimport { IdentityContext } from \"../../IdentityContext/abstractions.js\";\nimport type { ApiKey } from \"../shared/types.js\";\nimport { ApiKeyNotAuthorizedError } from \"~/features/security/apiKeys/shared/errors.js\";\n\nclass GetApiKeyUseCaseImpl implements GetApiKeyUseCaseAbstraction.Interface {\n    private repository: ApiKeysRepository.Interface;\n    private identityContext: IdentityContext.Interface;\n\n    constructor(\n        repository: ApiKeysRepository.Interface,\n        identityContext: IdentityContext.Interface\n    ) {\n        this.repository = repository;\n        this.identityContext = identityContext;\n    }\n\n    async execute(id: string): Promise<Result<ApiKey | null, GetApiKeyUseCaseAbstraction.Error>> {\n        const hasPermission = await this.identityContext.getPermission(\"security.apiKey\");\n        if (!hasPermission) {\n            return Result.fail(new ApiKeyNotAuthorizedError());\n        }\n\n        return this.repository.get(id);\n    }\n}\n\nexport const GetApiKeyUseCase = GetApiKeyUseCaseAbstraction.createImplementation({\n    implementation: GetApiKeyUseCaseImpl,\n    dependencies: [ApiKeysRepository, IdentityContext]\n});\n"],"names":["GetApiKeyUseCaseImpl","repository","identityContext","id","hasPermission","Result","ApiKeyNotAuthorizedError","GetApiKeyUseCase","GetApiKeyUseCaseAbstraction","ApiKeysRepository","IdentityContext"],"mappings":";;;;;AAOA,MAAMA;IAIF,YACIC,UAAuC,EACvCC,eAA0C,CAC5C;QACE,IAAI,CAAC,UAAU,GAAGD;QAClB,IAAI,CAAC,eAAe,GAAGC;IAC3B;IAEA,MAAM,QAAQC,EAAU,EAAqE;QACzF,MAAMC,gBAAgB,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;QAC/D,IAAI,CAACA,eACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAACH;IAC/B;AACJ;AAEO,MAAMI,oCAAmBC,iBAAAA,oBAAgD,CAAC;IAC7E,gBAAgBR;IAChB,cAAc;QAACS;QAAmBC;KAAgB;AACtD"}
+{"version":3,"file":"features/security/apiKeys/GetApiKey/GetApiKeyUseCase.js","sources":["../../../../../src/features/security/apiKeys/GetApiKey/GetApiKeyUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { GetApiKeyUseCase as GetApiKeyUseCaseAbstraction } from \"./abstractions.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\nimport { IdentityContext } from \"../../IdentityContext/abstractions.js\";\nimport type { ApiKey } from \"../shared/types.js\";\nimport { ApiKeyNotAuthorizedError } from \"~/features/security/apiKeys/shared/errors.js\";\n\nclass GetApiKeyUseCaseImpl implements GetApiKeyUseCaseAbstraction.Interface {\n    private repository: ApiKeysRepository.Interface;\n    private identityContext: IdentityContext.Interface;\n\n    constructor(\n        repository: ApiKeysRepository.Interface,\n        identityContext: IdentityContext.Interface\n    ) {\n        this.repository = repository;\n        this.identityContext = identityContext;\n    }\n\n    async execute(id: string): Promise<Result<ApiKey, GetApiKeyUseCaseAbstraction.Error>> {\n        const hasPermission = await this.identityContext.getPermission(\"security.apiKey\");\n        if (!hasPermission) {\n            return Result.fail(new ApiKeyNotAuthorizedError());\n        }\n\n        return this.repository.get(id);\n    }\n}\n\nexport const GetApiKeyUseCase = GetApiKeyUseCaseAbstraction.createImplementation({\n    implementation: GetApiKeyUseCaseImpl,\n    dependencies: [ApiKeysRepository, IdentityContext]\n});\n"],"names":["GetApiKeyUseCaseImpl","repository","identityContext","id","hasPermission","Result","ApiKeyNotAuthorizedError","GetApiKeyUseCase","GetApiKeyUseCaseAbstraction","ApiKeysRepository","IdentityContext"],"mappings":";;;;;AAOA,MAAMA;IAIF,YACIC,UAAuC,EACvCC,eAA0C,CAC5C;QACE,IAAI,CAAC,UAAU,GAAGD;QAClB,IAAI,CAAC,eAAe,GAAGC;IAC3B;IAEA,MAAM,QAAQC,EAAU,EAA8D;QAClF,MAAMC,gBAAgB,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC;QAC/D,IAAI,CAACA,eACD,OAAOC,OAAO,IAAI,CAAC,IAAIC;QAG3B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAACH;IAC/B;AACJ;AAEO,MAAMI,oCAAmBC,iBAAAA,oBAAgD,CAAC;IAC7E,gBAAgBR;IAChB,cAAc;QAACS;QAAmBC;KAAgB;AACtD"}

package/features/security/apiKeys/GetApiKeyBySlug/GetApiKeyBySlugUseCase.d.ts

@@ -1,11 +1,9 @@
-import { Result } from "@webiny/feature/api";
 import { GetApiKeyBySlugUseCase as GetApiKeyBySlugUseCaseAbstraction } from "./abstractions.js";
 import { ApiKeysRepository } from "../shared/abstractions.js";
-import type { ApiKey } from "../shared/types.js";
 declare class GetApiKeyBySlugUseCaseImpl implements GetApiKeyBySlugUseCaseAbstraction.Interface {
     private repository;
     constructor(repository: ApiKeysRepository.Interface);
-    execute(slug: string): Promise<Result<ApiKey | null, GetApiKeyBySlugUseCaseAbstraction.Error>>;
+    execute(slug: string): Promise<import("@webiny/feature/api").Result<import("../shared/types.js").ApiKey, import("../shared/errors.js").ApiKeyNotFoundError | import("../shared/errors.js").ApiKeyPersistenceError | import("../shared/errors.js").ApiKeyValidationError>>;
 }
 export declare const GetApiKeyBySlugUseCase: typeof GetApiKeyBySlugUseCaseImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IGetApiKeyBySlug>;

package/features/security/apiKeys/GetApiKeyBySlug/GetApiKeyBySlugUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/GetApiKeyBySlug/GetApiKeyBySlugUseCase.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyBySlug/GetApiKeyBySlugUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { GetApiKeyBySlugUseCase as GetApiKeyBySlugUseCaseAbstraction } from \"./abstractions.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\nimport type { ApiKey } from \"../shared/types.js\";\n\nclass GetApiKeyBySlugUseCaseImpl implements GetApiKeyBySlugUseCaseAbstraction.Interface {\n    private repository: ApiKeysRepository.Interface;\n\n    constructor(repository: ApiKeysRepository.Interface) {\n        this.repository = repository;\n    }\n\n    async execute(\n        slug: string\n    ): Promise<Result<ApiKey | null, GetApiKeyBySlugUseCaseAbstraction.Error>> {\n        return this.repository.getBySlug(slug);\n    }\n}\n\nexport const GetApiKeyBySlugUseCase = GetApiKeyBySlugUseCaseAbstraction.createImplementation({\n    implementation: GetApiKeyBySlugUseCaseImpl,\n    dependencies: [ApiKeysRepository]\n});\n"],"names":["GetApiKeyBySlugUseCaseImpl","repository","slug","GetApiKeyBySlugUseCase","GetApiKeyBySlugUseCaseAbstraction","ApiKeysRepository"],"mappings":";;AAKA,MAAMA;IAGF,YAAYC,UAAuC,CAAE;QACjD,IAAI,CAAC,UAAU,GAAGA;IACtB;IAEA,MAAM,QACFC,IAAY,EAC2D;QACvE,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAACA;IACrC;AACJ;AAEO,MAAMC,gDAAyBC,uBAAAA,oBAAsD,CAAC;IACzF,gBAAgBJ;IAChB,cAAc;QAACK;KAAkB;AACrC"}
+{"version":3,"file":"features/security/apiKeys/GetApiKeyBySlug/GetApiKeyBySlugUseCase.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyBySlug/GetApiKeyBySlugUseCase.ts"],"sourcesContent":["import { GetApiKeyBySlugUseCase as GetApiKeyBySlugUseCaseAbstraction } from \"./abstractions.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\n\nclass GetApiKeyBySlugUseCaseImpl implements GetApiKeyBySlugUseCaseAbstraction.Interface {\n    constructor(private repository: ApiKeysRepository.Interface) {}\n\n    async execute(slug: string) {\n        return this.repository.getBySlug(slug);\n    }\n}\n\nexport const GetApiKeyBySlugUseCase = GetApiKeyBySlugUseCaseAbstraction.createImplementation({\n    implementation: GetApiKeyBySlugUseCaseImpl,\n    dependencies: [ApiKeysRepository]\n});\n"],"names":["GetApiKeyBySlugUseCaseImpl","repository","slug","GetApiKeyBySlugUseCase","GetApiKeyBySlugUseCaseAbstraction","ApiKeysRepository"],"mappings":";;AAGA,MAAMA;IACF,YAAoBC,UAAuC,CAAE;aAAzCA,UAAU,GAAVA;IAA0C;IAE9D,MAAM,QAAQC,IAAY,EAAE;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAACA;IACrC;AACJ;AAEO,MAAMC,gDAAyBC,uBAAAA,oBAAsD,CAAC;IACzF,gBAAgBJ;IAChB,cAAc;QAACK;KAAkB;AACrC"}

package/features/security/apiKeys/GetApiKeyBySlug/abstractions.d.ts

@@ -5,7 +5,7 @@ export interface IGetApiKeyBySlugErrors {
 }
 type GetApiKeyBySlugError = IGetApiKeyBySlugErrors[keyof IGetApiKeyBySlugErrors] | ApiKeysRepository.Error;
 export interface IGetApiKeyBySlug {
-    execute(slug: string): Promise<Result<ApiKey | null, GetApiKeyBySlugError>>;
+    execute(slug: string): Promise<Result<ApiKey, GetApiKeyBySlugError>>;
 }
 /** Retrieve an API key by its slug. */
 export declare const GetApiKeyBySlugUseCase: import("@webiny/di").Abstraction<IGetApiKeyBySlug>;

package/features/security/apiKeys/GetApiKeyBySlug/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/GetApiKeyBySlug/abstractions.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyBySlug/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { ApiKey } from \"../shared/types.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\n\nexport interface IGetApiKeyBySlugErrors {\n    // No use-case specific errors - only repository errors can occur\n}\n\ntype GetApiKeyBySlugError =\n    | IGetApiKeyBySlugErrors[keyof IGetApiKeyBySlugErrors]\n    | ApiKeysRepository.Error;\n\nexport interface IGetApiKeyBySlug {\n    execute(slug: string): Promise<Result<ApiKey | null, GetApiKeyBySlugError>>;\n}\n\n/** Retrieve an API key by its slug. */\nexport const GetApiKeyBySlugUseCase = createAbstraction<IGetApiKeyBySlug>(\"GetApiKeyBySlugUseCase\");\n\nexport namespace GetApiKeyBySlugUseCase {\n    export type Interface = IGetApiKeyBySlug;\n    export type Error = GetApiKeyBySlugError;\n}\n"],"names":["GetApiKeyBySlugUseCase","createAbstraction"],"mappings":";AAkBO,MAAMA,yBAAyBC,kBAAoC"}
+{"version":3,"file":"features/security/apiKeys/GetApiKeyBySlug/abstractions.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyBySlug/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { ApiKey } from \"../shared/types.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\n\nexport interface IGetApiKeyBySlugErrors {\n    // No use-case specific errors - only repository errors can occur\n}\n\ntype GetApiKeyBySlugError =\n    | IGetApiKeyBySlugErrors[keyof IGetApiKeyBySlugErrors]\n    | ApiKeysRepository.Error;\n\nexport interface IGetApiKeyBySlug {\n    execute(slug: string): Promise<Result<ApiKey, GetApiKeyBySlugError>>;\n}\n\n/** Retrieve an API key by its slug. */\nexport const GetApiKeyBySlugUseCase = createAbstraction<IGetApiKeyBySlug>(\"GetApiKeyBySlugUseCase\");\n\nexport namespace GetApiKeyBySlugUseCase {\n    export type Interface = IGetApiKeyBySlug;\n    export type Error = GetApiKeyBySlugError;\n}\n"],"names":["GetApiKeyBySlugUseCase","createAbstraction"],"mappings":";AAkBO,MAAMA,yBAAyBC,kBAAoC"}

package/features/security/apiKeys/GetApiKeyByToken/GetApiKeyByTokenUseCase.d.ts

@@ -1,11 +1,9 @@
-import { Result } from "@webiny/feature/api";
 import { GetApiKeyByTokenUseCase as GetApiKeyByTokenUseCaseAbstraction } from "./abstractions.js";
 import { ApiKeysRepository } from "../shared/abstractions.js";
-import type { ApiKey } from "../shared/types.js";
 declare class GetApiKeyByTokenUseCaseImpl implements GetApiKeyByTokenUseCaseAbstraction.Interface {
     private repository;
     constructor(repository: ApiKeysRepository.Interface);
-    execute(token: string): Promise<Result<ApiKey | null, GetApiKeyByTokenUseCaseAbstraction.Error>>;
+    execute(token: string): Promise<import("@webiny/feature/api").Result<import("../shared/types.js").ApiKey, import("../shared/errors.js").ApiKeyNotFoundError | import("../shared/errors.js").ApiKeyPersistenceError | import("../shared/errors.js").ApiKeyValidationError>>;
 }
 export declare const GetApiKeyByTokenUseCase: typeof GetApiKeyByTokenUseCaseImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IGetApiKeyByToken>;

package/features/security/apiKeys/GetApiKeyByToken/GetApiKeyByTokenUseCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/GetApiKeyByToken/GetApiKeyByTokenUseCase.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyByToken/GetApiKeyByTokenUseCase.ts"],"sourcesContent":["import { Result } from \"@webiny/feature/api\";\nimport { GetApiKeyByTokenUseCase as GetApiKeyByTokenUseCaseAbstraction } from \"./abstractions.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\nimport type { ApiKey } from \"../shared/types.js\";\n\nclass GetApiKeyByTokenUseCaseImpl implements GetApiKeyByTokenUseCaseAbstraction.Interface {\n    private repository: ApiKeysRepository.Interface;\n\n    constructor(repository: ApiKeysRepository.Interface) {\n        this.repository = repository;\n    }\n\n    async execute(\n        token: string\n    ): Promise<Result<ApiKey | null, GetApiKeyByTokenUseCaseAbstraction.Error>> {\n        return this.repository.getByToken(token);\n    }\n}\n\nexport const GetApiKeyByTokenUseCase = GetApiKeyByTokenUseCaseAbstraction.createImplementation({\n    implementation: GetApiKeyByTokenUseCaseImpl,\n    dependencies: [ApiKeysRepository]\n});\n"],"names":["GetApiKeyByTokenUseCaseImpl","repository","token","GetApiKeyByTokenUseCase","GetApiKeyByTokenUseCaseAbstraction","ApiKeysRepository"],"mappings":";;AAKA,MAAMA;IAGF,YAAYC,UAAuC,CAAE;QACjD,IAAI,CAAC,UAAU,GAAGA;IACtB;IAEA,MAAM,QACFC,KAAa,EAC2D;QACxE,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAACA;IACtC;AACJ;AAEO,MAAMC,kDAA0BC,wBAAAA,oBAAuD,CAAC;IAC3F,gBAAgBJ;IAChB,cAAc;QAACK;KAAkB;AACrC"}
+{"version":3,"file":"features/security/apiKeys/GetApiKeyByToken/GetApiKeyByTokenUseCase.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyByToken/GetApiKeyByTokenUseCase.ts"],"sourcesContent":["import { GetApiKeyByTokenUseCase as GetApiKeyByTokenUseCaseAbstraction } from \"./abstractions.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\n\nclass GetApiKeyByTokenUseCaseImpl implements GetApiKeyByTokenUseCaseAbstraction.Interface {\n    constructor(private repository: ApiKeysRepository.Interface) {}\n\n    async execute(token: string) {\n        return this.repository.getByToken(token);\n    }\n}\n\nexport const GetApiKeyByTokenUseCase = GetApiKeyByTokenUseCaseAbstraction.createImplementation({\n    implementation: GetApiKeyByTokenUseCaseImpl,\n    dependencies: [ApiKeysRepository]\n});\n"],"names":["GetApiKeyByTokenUseCaseImpl","repository","token","GetApiKeyByTokenUseCase","GetApiKeyByTokenUseCaseAbstraction","ApiKeysRepository"],"mappings":";;AAGA,MAAMA;IACF,YAAoBC,UAAuC,CAAE;aAAzCA,UAAU,GAAVA;IAA0C;IAE9D,MAAM,QAAQC,KAAa,EAAE;QACzB,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAACA;IACtC;AACJ;AAEO,MAAMC,kDAA0BC,wBAAAA,oBAAuD,CAAC;IAC3F,gBAAgBJ;IAChB,cAAc;QAACK;KAAkB;AACrC"}

package/features/security/apiKeys/GetApiKeyByToken/abstractions.d.ts

@@ -5,7 +5,7 @@ export interface IGetApiKeyByTokenErrors {
 }
 type GetApiKeyByTokenError = IGetApiKeyByTokenErrors[keyof IGetApiKeyByTokenErrors] | ApiKeysRepository.Error;
 export interface IGetApiKeyByToken {
-    execute(token: string): Promise<Result<ApiKey | null, GetApiKeyByTokenError>>;
+    execute(token: string): Promise<Result<ApiKey, GetApiKeyByTokenError>>;
 }
 /** Retrieve an API key by its token value. */
 export declare const GetApiKeyByTokenUseCase: import("@webiny/di").Abstraction<IGetApiKeyByToken>;

package/features/security/apiKeys/GetApiKeyByToken/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/GetApiKeyByToken/abstractions.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyByToken/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { ApiKey } from \"../shared/types.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\n\nexport interface IGetApiKeyByTokenErrors {\n    // No use-case specific errors - only repository errors can occur\n}\n\ntype GetApiKeyByTokenError =\n    | IGetApiKeyByTokenErrors[keyof IGetApiKeyByTokenErrors]\n    | ApiKeysRepository.Error;\n\nexport interface IGetApiKeyByToken {\n    execute(token: string): Promise<Result<ApiKey | null, GetApiKeyByTokenError>>;\n}\n\n/** Retrieve an API key by its token value. */\nexport const GetApiKeyByTokenUseCase =\n    createAbstraction<IGetApiKeyByToken>(\"GetApiKeyByTokenUseCase\");\n\nexport namespace GetApiKeyByTokenUseCase {\n    export type Interface = IGetApiKeyByToken;\n    export type Error = GetApiKeyByTokenError;\n}\n"],"names":["GetApiKeyByTokenUseCase","createAbstraction"],"mappings":";AAkBO,MAAMA,0BACTC,kBAAqC"}
+{"version":3,"file":"features/security/apiKeys/GetApiKeyByToken/abstractions.js","sources":["../../../../../src/features/security/apiKeys/GetApiKeyByToken/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { ApiKey } from \"../shared/types.js\";\nimport { ApiKeysRepository } from \"../shared/abstractions.js\";\n\nexport interface IGetApiKeyByTokenErrors {\n    // No use-case specific errors - only repository errors can occur\n}\n\ntype GetApiKeyByTokenError =\n    | IGetApiKeyByTokenErrors[keyof IGetApiKeyByTokenErrors]\n    | ApiKeysRepository.Error;\n\nexport interface IGetApiKeyByToken {\n    execute(token: string): Promise<Result<ApiKey, GetApiKeyByTokenError>>;\n}\n\n/** Retrieve an API key by its token value. */\nexport const GetApiKeyByTokenUseCase =\n    createAbstraction<IGetApiKeyByToken>(\"GetApiKeyByTokenUseCase\");\n\nexport namespace GetApiKeyByTokenUseCase {\n    export type Interface = IGetApiKeyByToken;\n    export type Error = GetApiKeyByTokenError;\n}\n"],"names":["GetApiKeyByTokenUseCase","createAbstraction"],"mappings":";AAkBO,MAAMA,0BACTC,kBAAqC"}

package/features/security/apiKeys/feature.js

@@ -7,12 +7,17 @@ import { ListApiKeysFeature } from "./ListApiKeys/feature.js";
 import { CreateApiKeyFeature } from "./CreateApiKey/feature.js";
 import { UpdateApiKeyFeature } from "./UpdateApiKey/feature.js";
 import { DeleteApiKeyFeature } from "./DeleteApiKey/feature.js";
-import { ApiKeyProvider } from "./shared/ApiKeyProvider.js";
+import { ApiKeyFactory, ApiKeyProvider } from "./shared/abstractions.js";
+import { ApiKeyProvider as ApiKeyProvider_js_ApiKeyProvider } from "./shared/ApiKeyProvider.js";
+import { TenantContext } from "../../tenancy/TenantContext/index.js";
 const ApiKeysFeature = createFeature({
     name: "ApiKeys",
     register (container) {
         container.register(ApiKeysRepository).inSingletonScope();
-        container.register(ApiKeyProvider).inSingletonScope();
+        container.registerFactory(ApiKeyProvider, ()=>{
+            const tenantContext = container.resolve(TenantContext);
+            return new ApiKeyProvider_js_ApiKeyProvider(tenantContext, ()=>container.resolveAll(ApiKeyFactory));
+        });
         GetApiKeyFeature.register(container);
         GetApiKeyByTokenFeature.register(container);
         GetApiKeyBySlugFeature.register(container);

package/features/security/apiKeys/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/feature.js","sources":["../../../../src/features/security/apiKeys/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { ApiKeysRepository } from \"./shared/ApiKeysRepository.js\";\nimport { GetApiKeyFeature } from \"./GetApiKey/feature.js\";\nimport { GetApiKeyByTokenFeature } from \"./GetApiKeyByToken/feature.js\";\nimport { GetApiKeyBySlugFeature } from \"./GetApiKeyBySlug/feature.js\";\nimport { ListApiKeysFeature } from \"./ListApiKeys/feature.js\";\nimport { CreateApiKeyFeature } from \"./CreateApiKey/feature.js\";\nimport { UpdateApiKeyFeature } from \"./UpdateApiKey/feature.js\";\nimport { DeleteApiKeyFeature } from \"./DeleteApiKey/feature.js\";\nimport { ApiKeyProvider } from \"./shared/ApiKeyProvider.js\";\n\nexport const ApiKeysFeature = createFeature({\n    name: \"ApiKeys\",\n    register(container) {\n        // Register repository in singleton scope\n        container.register(ApiKeysRepository).inSingletonScope();\n        container.register(ApiKeyProvider).inSingletonScope();\n\n        // Register all use cases\n        GetApiKeyFeature.register(container);\n        GetApiKeyByTokenFeature.register(container);\n        GetApiKeyBySlugFeature.register(container);\n        ListApiKeysFeature.register(container);\n        CreateApiKeyFeature.register(container);\n        UpdateApiKeyFeature.register(container);\n        DeleteApiKeyFeature.register(container);\n    }\n});\n"],"names":["ApiKeysFeature","createFeature","container","ApiKeysRepository","ApiKeyProvider","GetApiKeyFeature","GetApiKeyByTokenFeature","GetApiKeyBySlugFeature","ListApiKeysFeature","CreateApiKeyFeature","UpdateApiKeyFeature","DeleteApiKeyFeature"],"mappings":";;;;;;;;;;AAWO,MAAMA,iBAAiBC,cAAc;IACxC,MAAM;IACN,UAASC,SAAS;QAEdA,UAAU,QAAQ,CAACC,mBAAmB,gBAAgB;QACtDD,UAAU,QAAQ,CAACE,gBAAgB,gBAAgB;QAGnDC,iBAAiB,QAAQ,CAACH;QAC1BI,wBAAwB,QAAQ,CAACJ;QACjCK,uBAAuB,QAAQ,CAACL;QAChCM,mBAAmB,QAAQ,CAACN;QAC5BO,oBAAoB,QAAQ,CAACP;QAC7BQ,oBAAoB,QAAQ,CAACR;QAC7BS,oBAAoB,QAAQ,CAACT;IACjC;AACJ"}
+{"version":3,"file":"features/security/apiKeys/feature.js","sources":["../../../../src/features/security/apiKeys/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { ApiKeysRepository } from \"./shared/ApiKeysRepository.js\";\nimport { GetApiKeyFeature } from \"./GetApiKey/feature.js\";\nimport { GetApiKeyByTokenFeature } from \"./GetApiKeyByToken/feature.js\";\nimport { GetApiKeyBySlugFeature } from \"./GetApiKeyBySlug/feature.js\";\nimport { ListApiKeysFeature } from \"./ListApiKeys/feature.js\";\nimport { CreateApiKeyFeature } from \"./CreateApiKey/feature.js\";\nimport { UpdateApiKeyFeature } from \"./UpdateApiKey/feature.js\";\nimport { DeleteApiKeyFeature } from \"./DeleteApiKey/feature.js\";\nimport {\n    ApiKeyFactory,\n    ApiKeyProvider as ApiKeyProviderAbstraction\n} from \"~/features/security/apiKeys/shared/abstractions.js\";\nimport { ApiKeyProvider } from \"./shared/ApiKeyProvider.js\";\nimport { TenantContext } from \"~/features/tenancy/TenantContext/index.js\";\n\nexport const ApiKeysFeature = createFeature({\n    name: \"ApiKeys\",\n    register(container) {\n        // Register repository in singleton scope\n        container.register(ApiKeysRepository).inSingletonScope();\n\n        container.registerFactory(ApiKeyProviderAbstraction, () => {\n            const tenantContext = container.resolve(TenantContext);\n            return new ApiKeyProvider(tenantContext, () => {\n                return container.resolveAll(ApiKeyFactory);\n            });\n        });\n\n        // Register all use cases\n        GetApiKeyFeature.register(container);\n        GetApiKeyByTokenFeature.register(container);\n        GetApiKeyBySlugFeature.register(container);\n        ListApiKeysFeature.register(container);\n        CreateApiKeyFeature.register(container);\n        UpdateApiKeyFeature.register(container);\n        DeleteApiKeyFeature.register(container);\n    }\n});\n"],"names":["ApiKeysFeature","createFeature","container","ApiKeysRepository","ApiKeyProviderAbstraction","tenantContext","TenantContext","ApiKeyProvider","ApiKeyFactory","GetApiKeyFeature","GetApiKeyByTokenFeature","GetApiKeyBySlugFeature","ListApiKeysFeature","CreateApiKeyFeature","UpdateApiKeyFeature","DeleteApiKeyFeature"],"mappings":";;;;;;;;;;;;AAgBO,MAAMA,iBAAiBC,cAAc;IACxC,MAAM;IACN,UAASC,SAAS;QAEdA,UAAU,QAAQ,CAACC,mBAAmB,gBAAgB;QAEtDD,UAAU,eAAe,CAACE,gBAA2B;YACjD,MAAMC,gBAAgBH,UAAU,OAAO,CAACI;YACxC,OAAO,IAAIC,iCAAeF,eAAe,IAC9BH,UAAU,UAAU,CAACM;QAEpC;QAGAC,iBAAiB,QAAQ,CAACP;QAC1BQ,wBAAwB,QAAQ,CAACR;QACjCS,uBAAuB,QAAQ,CAACT;QAChCU,mBAAmB,QAAQ,CAACV;QAC5BW,oBAAoB,QAAQ,CAACX;QAC7BY,oBAAoB,QAAQ,CAACZ;QAC7Ba,oBAAoB,QAAQ,CAACb;IACjC;AACJ"}

package/features/security/apiKeys/shared/ApiKeyProvider.d.ts

@@ -2,14 +2,12 @@ import { TenantContext } from "../../../../features/tenancy/TenantContext/index.
 import { ApiKeyFactory } from "./abstractions.js";
 import { ApiKeyProvider as ProviderAbstraction } from "./abstractions.js";
 import type { ApiKey } from "./types.js";
-declare class ApiKeyProviderImpl implements ProviderAbstraction.Interface {
+export declare class ApiKeyProvider implements ProviderAbstraction.Interface {
     private tenantContext;
-    private apiKeyFactories;
+    private getApiKeyFactories;
     private cache;
-    constructor(tenantContext: TenantContext.Interface, apiKeyFactories: ApiKeyFactory.Interface[]);
+    constructor(tenantContext: TenantContext.Interface, getApiKeyFactories: () => ApiKeyFactory.Interface[]);
     getByToken(token: string): Promise<ApiKey | null>;
     getBySlug(slug: string): Promise<ApiKey | null>;
     private getCache;
 }
-export declare const ApiKeyProvider: import("@webiny/di").Implementation<typeof ApiKeyProviderImpl>;
-export {};

package/features/security/apiKeys/shared/ApiKeyProvider.js

@@ -1,11 +1,8 @@
-import { createImplementation } from "@webiny/feature/api";
-import { TenantContext } from "../../../tenancy/TenantContext/index.js";
-import { ApiKeyFactory, ApiKeyProvider } from "./abstractions.js";
 import { SystemIdentityValue } from "../../../../domain/identity/SystemIdentityValue.js";
-class ApiKeyProviderImpl {
-    constructor(tenantContext, apiKeyFactories){
+class ApiKeyProvider {
+    constructor(tenantContext, getApiKeyFactories){
         this.tenantContext = tenantContext;
-        this.apiKeyFactories = apiKeyFactories;
+        this.getApiKeyFactories = getApiKeyFactories;
     }
     async getByToken(token) {
         const cache = await this.getCache();
@@ -19,7 +16,8 @@ class ApiKeyProviderImpl {
     }
     async getCache() {
         if (void 0 === this.cache) {
-            const results = await Promise.all(this.apiKeyFactories.map((factory)=>factory.execute()));
+            const apiKeyFactories = this.getApiKeyFactories();
+            const results = await Promise.all(apiKeyFactories.map((factory)=>factory.execute()));
             this.cache = results.flat().map((codeKey)=>({
                     ...codeKey,
                     id: codeKey.slug,
@@ -33,19 +31,6 @@ class ApiKeyProviderImpl {
         return this.cache;
     }
 }
-const ApiKeyProvider_ApiKeyProvider = createImplementation({
-    abstraction: ApiKeyProvider,
-    implementation: ApiKeyProviderImpl,
-    dependencies: [
-        TenantContext,
-        [
-            ApiKeyFactory,
-            {
-                multiple: true
-            }
-        ]
-    ]
-});
-export { ApiKeyProvider_ApiKeyProvider as ApiKeyProvider };
+export { ApiKeyProvider };
 
 //# sourceMappingURL=ApiKeyProvider.js.map

package/features/security/apiKeys/shared/ApiKeyProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/shared/ApiKeyProvider.js","sources":["../../../../../src/features/security/apiKeys/shared/ApiKeyProvider.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport { TenantContext } from \"~/features/tenancy/TenantContext/index.js\";\nimport { ApiKeyFactory } from \"./abstractions.js\";\nimport { ApiKeyProvider as ProviderAbstraction } from \"./abstractions.js\";\nimport type { ApiKey } from \"./types.js\";\nimport { SystemIdentityValue } from \"~/domain/identity/SystemIdentityValue.js\";\n\nclass ApiKeyProviderImpl implements ProviderAbstraction.Interface {\n    private cache: ApiKey[] | undefined;\n\n    constructor(\n        private tenantContext: TenantContext.Interface,\n        private apiKeyFactories: ApiKeyFactory.Interface[]\n    ) {}\n\n    async getByToken(token: string): Promise<ApiKey | null> {\n        const cache = await this.getCache();\n\n        // Search for the API key by token in the cached array\n        const apiKey = cache.find(key => key.token === token);\n        return apiKey || null;\n    }\n\n    async getBySlug(slug: string): Promise<ApiKey | null> {\n        const cache = await this.getCache();\n\n        // Search for the API key by token in the cached array\n        const apiKey = cache.find(key => key.slug === slug);\n        return apiKey || null;\n    }\n\n    private async getCache(): Promise<ApiKey[]> {\n        if (this.cache === undefined) {\n            const results = await Promise.all(\n                this.apiKeyFactories.map(factory => factory.execute())\n            );\n            this.cache = results.flat().map<ApiKey>(codeKey => {\n                return {\n                    ...codeKey,\n                    id: codeKey.slug,\n                    slug: codeKey.slug,\n                    description: \"\",\n                    tenant: this.tenantContext.getTenant().id,\n                    createdOn: new Date().toISOString(),\n                    createdBy: SystemIdentityValue.create()\n                };\n            });\n        }\n\n        return this.cache;\n    }\n}\n\nexport const ApiKeyProvider = createImplementation({\n    abstraction: ProviderAbstraction,\n    implementation: ApiKeyProviderImpl,\n    dependencies: [TenantContext, [ApiKeyFactory, { multiple: true }]]\n});\n"],"names":["ApiKeyProviderImpl","tenantContext","apiKeyFactories","token","cache","apiKey","key","slug","undefined","results","Promise","factory","codeKey","Date","SystemIdentityValue","ApiKeyProvider","createImplementation","ProviderAbstraction","TenantContext","ApiKeyFactory"],"mappings":";;;;AAOA,MAAMA;IAGF,YACYC,aAAsC,EACtCC,eAA0C,CACpD;aAFUD,aAAa,GAAbA;aACAC,eAAe,GAAfA;IACT;IAEH,MAAM,WAAWC,KAAa,EAA0B;QACpD,MAAMC,QAAQ,MAAM,IAAI,CAAC,QAAQ;QAGjC,MAAMC,SAASD,MAAM,IAAI,CAACE,CAAAA,MAAOA,IAAI,KAAK,KAAKH;QAC/C,OAAOE,UAAU;IACrB;IAEA,MAAM,UAAUE,IAAY,EAA0B;QAClD,MAAMH,QAAQ,MAAM,IAAI,CAAC,QAAQ;QAGjC,MAAMC,SAASD,MAAM,IAAI,CAACE,CAAAA,MAAOA,IAAI,IAAI,KAAKC;QAC9C,OAAOF,UAAU;IACrB;IAEA,MAAc,WAA8B;QACxC,IAAI,AAAeG,WAAf,IAAI,CAAC,KAAK,EAAgB;YAC1B,MAAMC,UAAU,MAAMC,QAAQ,GAAG,CAC7B,IAAI,CAAC,eAAe,CAAC,GAAG,CAACC,CAAAA,UAAWA,QAAQ,OAAO;YAEvD,IAAI,CAAC,KAAK,GAAGF,QAAQ,IAAI,GAAG,GAAG,CAASG,CAAAA,UAC7B;oBACH,GAAGA,OAAO;oBACV,IAAIA,QAAQ,IAAI;oBAChB,MAAMA,QAAQ,IAAI;oBAClB,aAAa;oBACb,QAAQ,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,EAAE;oBACzC,WAAW,IAAIC,OAAO,WAAW;oBACjC,WAAWC,oBAAoB,MAAM;gBACzC;QAER;QAEA,OAAO,IAAI,CAAC,KAAK;IACrB;AACJ;AAEO,MAAMC,gCAAiBC,qBAAqB;IAC/C,aAAaC;IACb,gBAAgBjB;IAChB,cAAc;QAACkB;QAAe;YAACC;YAAe;gBAAE,UAAU;YAAK;SAAE;KAAC;AACtE"}
+{"version":3,"file":"features/security/apiKeys/shared/ApiKeyProvider.js","sources":["../../../../../src/features/security/apiKeys/shared/ApiKeyProvider.ts"],"sourcesContent":["import { TenantContext } from \"~/features/tenancy/TenantContext/index.js\";\nimport { ApiKeyFactory } from \"./abstractions.js\";\nimport { ApiKeyProvider as ProviderAbstraction } from \"./abstractions.js\";\nimport type { ApiKey } from \"./types.js\";\nimport { SystemIdentityValue } from \"~/domain/identity/SystemIdentityValue.js\";\n\nexport class ApiKeyProvider implements ProviderAbstraction.Interface {\n    private cache: ApiKey[] | undefined;\n\n    constructor(\n        private tenantContext: TenantContext.Interface,\n        private getApiKeyFactories: () => ApiKeyFactory.Interface[]\n    ) {}\n\n    async getByToken(token: string): Promise<ApiKey | null> {\n        const cache = await this.getCache();\n\n        // Search for the API key by token in the cached array\n        const apiKey = cache.find(key => key.token === token);\n        return apiKey || null;\n    }\n\n    async getBySlug(slug: string): Promise<ApiKey | null> {\n        const cache = await this.getCache();\n\n        // Search for the API key by token in the cached array\n        const apiKey = cache.find(key => key.slug === slug);\n        return apiKey || null;\n    }\n\n    private async getCache(): Promise<ApiKey[]> {\n        if (this.cache === undefined) {\n            const apiKeyFactories = this.getApiKeyFactories();\n            const results = await Promise.all(apiKeyFactories.map(factory => factory.execute()));\n            this.cache = results.flat().map<ApiKey>(codeKey => {\n                return {\n                    ...codeKey,\n                    id: codeKey.slug,\n                    slug: codeKey.slug,\n                    description: \"\",\n                    tenant: this.tenantContext.getTenant().id,\n                    createdOn: new Date().toISOString(),\n                    createdBy: SystemIdentityValue.create()\n                };\n            });\n        }\n\n        return this.cache;\n    }\n}\n"],"names":["ApiKeyProvider","tenantContext","getApiKeyFactories","token","cache","apiKey","key","slug","undefined","apiKeyFactories","results","Promise","factory","codeKey","Date","SystemIdentityValue"],"mappings":";AAMO,MAAMA;IAGT,YACYC,aAAsC,EACtCC,kBAAmD,CAC7D;aAFUD,aAAa,GAAbA;aACAC,kBAAkB,GAAlBA;IACT;IAEH,MAAM,WAAWC,KAAa,EAA0B;QACpD,MAAMC,QAAQ,MAAM,IAAI,CAAC,QAAQ;QAGjC,MAAMC,SAASD,MAAM,IAAI,CAACE,CAAAA,MAAOA,IAAI,KAAK,KAAKH;QAC/C,OAAOE,UAAU;IACrB;IAEA,MAAM,UAAUE,IAAY,EAA0B;QAClD,MAAMH,QAAQ,MAAM,IAAI,CAAC,QAAQ;QAGjC,MAAMC,SAASD,MAAM,IAAI,CAACE,CAAAA,MAAOA,IAAI,IAAI,KAAKC;QAC9C,OAAOF,UAAU;IACrB;IAEA,MAAc,WAA8B;QACxC,IAAI,AAAeG,WAAf,IAAI,CAAC,KAAK,EAAgB;YAC1B,MAAMC,kBAAkB,IAAI,CAAC,kBAAkB;YAC/C,MAAMC,UAAU,MAAMC,QAAQ,GAAG,CAACF,gBAAgB,GAAG,CAACG,CAAAA,UAAWA,QAAQ,OAAO;YAChF,IAAI,CAAC,KAAK,GAAGF,QAAQ,IAAI,GAAG,GAAG,CAASG,CAAAA,UAC7B;oBACH,GAAGA,OAAO;oBACV,IAAIA,QAAQ,IAAI;oBAChB,MAAMA,QAAQ,IAAI;oBAClB,aAAa;oBACb,QAAQ,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,EAAE;oBACzC,WAAW,IAAIC,OAAO,WAAW;oBACjC,WAAWC,oBAAoB,MAAM;gBACzC;QAER;QAEA,OAAO,IAAI,CAAC,KAAK;IACrB;AACJ"}

package/features/security/apiKeys/shared/ApiKeysRepository.d.ts

@@ -8,6 +8,7 @@ declare class ApiKeysRepositoryImpl implements RepositoryAbstraction.Interface {
     private tenantContext;
     private storageOperations;
     private apiKeyProvider;
+    private resolving;
     constructor(tenantContext: TenantContext.Interface, storageOperations: SecurityStorageOperations.Interface, apiKeyProvider: ApiKeyProvider.Interface);
     get(id: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>>;
     getByToken(token: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>>;

package/features/security/apiKeys/shared/ApiKeysRepository.js

@@ -8,6 +8,7 @@ class ApiKeysRepositoryImpl {
         this.tenantContext = tenantContext;
         this.storageOperations = storageOperations;
         this.apiKeyProvider = apiKeyProvider;
+        this.resolving = false;
     }
     async get(id) {
         try {
@@ -30,8 +31,15 @@ class ApiKeysRepositoryImpl {
                 tenant: tenant.id
             });
             if (apiKey) return Result.ok(apiKey);
-            const factoryApiKey = await this.apiKeyProvider.getByToken(token);
-            if (factoryApiKey) return Result.ok(factoryApiKey);
+            if (!this.resolving) {
+                this.resolving = true;
+                try {
+                    const factoryApiKey = await this.apiKeyProvider.getByToken(token);
+                    if (factoryApiKey) return Result.ok(factoryApiKey);
+                } finally{
+                    this.resolving = false;
+                }
+            }
             return Result.fail(new ApiKeyNotFoundError());
         } catch (error) {
             return Result.fail(new ApiKeyPersistenceError(error));
@@ -45,8 +53,15 @@ class ApiKeysRepositoryImpl {
                 tenant: tenant.id
             });
             if (apiKey) return Result.ok(apiKey);
-            const factoryApiKey = await this.apiKeyProvider.getBySlug(slug);
-            if (factoryApiKey) return Result.ok(factoryApiKey);
+            if (!this.resolving) {
+                this.resolving = true;
+                try {
+                    const factoryApiKey = await this.apiKeyProvider.getBySlug(slug);
+                    if (factoryApiKey) return Result.ok(factoryApiKey);
+                } finally{
+                    this.resolving = false;
+                }
+            }
             return Result.fail(new ApiKeyNotFoundError());
         } catch (error) {
             return Result.fail(new ApiKeyPersistenceError(error));

package/features/security/apiKeys/shared/ApiKeysRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/shared/ApiKeysRepository.js","sources":["../../../../../src/features/security/apiKeys/shared/ApiKeysRepository.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ApiKeysRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ApiKeyProvider } from \"./abstractions.js\";\nimport type { ApiKey, ListApiKeysInput } from \"./types.js\";\nimport { SecurityStorageOperations } from \"~/features/security/shared/abstractions.js\";\nimport { TenantContext } from \"~/features/tenancy/TenantContext/index.js\";\nimport { ApiKeyNotFoundError, ApiKeyPersistenceError, ApiKeyValidationError } from \"./errors.js\";\n\n// TODO: create an ApiKeyMapper\n\nclass ApiKeysRepositoryImpl implements RepositoryAbstraction.Interface {\n    constructor(\n        private tenantContext: TenantContext.Interface,\n        private storageOperations: SecurityStorageOperations.Interface,\n        private apiKeyProvider: ApiKeyProvider.Interface\n    ) {}\n\n    async get(id: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            const apiKey = await this.storageOperations.getApiKey({ id, tenant: tenant.id });\n            if (apiKey) {\n                return Result.ok(apiKey);\n            }\n\n            return Result.fail(new ApiKeyNotFoundError());\n        } catch (error) {\n            return Result.fail(error);\n        }\n    }\n\n    async getByToken(token: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>> {\n        try {\n            // First, check the database (database keys have priority over factory keys)\n            const tenant = this.tenantContext.getTenant();\n            const apiKey = await this.storageOperations.getApiKeyByToken({\n                token,\n                tenant: tenant.id\n            });\n\n            if (apiKey) {\n                return Result.ok(apiKey);\n            }\n\n            // If not found in database, check if the API key is provided by a factory\n            const factoryApiKey = await this.apiKeyProvider.getByToken(token);\n            if (factoryApiKey) {\n                return Result.ok(factoryApiKey);\n            }\n\n            return Result.fail(new ApiKeyNotFoundError());\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async getBySlug(slug: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>> {\n        try {\n            // First, check the database (database keys have priority over factory keys)\n            const tenant = this.tenantContext.getTenant();\n            const apiKey = await this.storageOperations.getApiKeyBySlug({\n                slug,\n                tenant: tenant.id\n            });\n\n            if (apiKey) {\n                return Result.ok(apiKey);\n            }\n\n            // If not found in database, check if the API key is provided by a factory\n            const factoryApiKey = await this.apiKeyProvider.getBySlug(slug);\n            if (factoryApiKey) {\n                return Result.ok(factoryApiKey);\n            }\n\n            return Result.fail(new ApiKeyNotFoundError());\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async list(params: ListApiKeysInput): Promise<Result<ApiKey[], RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            const result = await this.storageOperations.listApiKeys({\n                where: { tenant: tenant.id },\n                ...params\n            });\n            return Result.ok(result);\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async create(apiKey: ApiKey): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Check if an API key with the same slug already exists\n            const existingKeyResult = await this.getBySlug(apiKey.slug);\n\n            // If we found a key, it's a duplicate slug - return validation error\n            if (existingKeyResult.isOk()) {\n                return Result.fail(\n                    new ApiKeyValidationError(`API key with slug \"${apiKey.slug}\" already exists.`)\n                );\n            }\n\n            // \"NotFound\" error is ok. Everything else is not ok.\n            if (existingKeyResult.error.code !== \"ApiKey/NotFound\") {\n                return Result.fail(existingKeyResult.error);\n            }\n\n            // Slug is unique, proceed with creation\n            const tenant = this.tenantContext.getTenant();\n            await this.storageOperations.createApiKey({ apiKey: { ...apiKey, tenant: tenant.id } });\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async update(apiKey: ApiKey): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            await this.storageOperations.updateApiKey({ apiKey: { ...apiKey, tenant: tenant.id } });\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async delete(apiKey: ApiKey): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            await this.storageOperations.deleteApiKey({ apiKey: { ...apiKey, tenant: tenant.id } });\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n}\n\nexport const ApiKeysRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: ApiKeysRepositoryImpl,\n    dependencies: [TenantContext, SecurityStorageOperations, ApiKeyProvider]\n});\n"],"names":["ApiKeysRepositoryImpl","tenantContext","storageOperations","apiKeyProvider","id","tenant","apiKey","Result","ApiKeyNotFoundError","error","token","factoryApiKey","ApiKeyPersistenceError","slug","params","result","existingKeyResult","ApiKeyValidationError","ApiKeysRepository","createImplementation","RepositoryAbstraction","TenantContext","SecurityStorageOperations","ApiKeyProvider"],"mappings":"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"}
+{"version":3,"file":"features/security/apiKeys/shared/ApiKeysRepository.js","sources":["../../../../../src/features/security/apiKeys/shared/ApiKeysRepository.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport { ApiKeysRepository as RepositoryAbstraction } from \"./abstractions.js\";\nimport { ApiKeyProvider } from \"./abstractions.js\";\nimport type { ApiKey, ListApiKeysInput } from \"./types.js\";\nimport { SecurityStorageOperations } from \"~/features/security/shared/abstractions.js\";\nimport { TenantContext } from \"~/features/tenancy/TenantContext/index.js\";\nimport { ApiKeyNotFoundError, ApiKeyPersistenceError, ApiKeyValidationError } from \"./errors.js\";\n\n// TODO: create an ApiKeyMapper\n\nclass ApiKeysRepositoryImpl implements RepositoryAbstraction.Interface {\n    private resolving = false;\n\n    constructor(\n        private tenantContext: TenantContext.Interface,\n        private storageOperations: SecurityStorageOperations.Interface,\n        private apiKeyProvider: ApiKeyProvider.Interface\n    ) {}\n\n    async get(id: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            const apiKey = await this.storageOperations.getApiKey({ id, tenant: tenant.id });\n            if (apiKey) {\n                return Result.ok(apiKey);\n            }\n\n            return Result.fail(new ApiKeyNotFoundError());\n        } catch (error) {\n            return Result.fail(error);\n        }\n    }\n\n    async getByToken(token: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            const apiKey = await this.storageOperations.getApiKeyByToken({\n                token,\n                tenant: tenant.id\n            });\n\n            if (apiKey) {\n                return Result.ok(apiKey);\n            }\n\n            if (!this.resolving) {\n                this.resolving = true;\n                try {\n                    const factoryApiKey = await this.apiKeyProvider.getByToken(token);\n                    if (factoryApiKey) {\n                        return Result.ok(factoryApiKey);\n                    }\n                } finally {\n                    this.resolving = false;\n                }\n            }\n\n            return Result.fail(new ApiKeyNotFoundError());\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async getBySlug(slug: string): Promise<Result<ApiKey, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            const apiKey = await this.storageOperations.getApiKeyBySlug({\n                slug,\n                tenant: tenant.id\n            });\n\n            if (apiKey) {\n                return Result.ok(apiKey);\n            }\n\n            if (!this.resolving) {\n                this.resolving = true;\n                try {\n                    const factoryApiKey = await this.apiKeyProvider.getBySlug(slug);\n                    if (factoryApiKey) {\n                        return Result.ok(factoryApiKey);\n                    }\n                } finally {\n                    this.resolving = false;\n                }\n            }\n\n            return Result.fail(new ApiKeyNotFoundError());\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async list(params: ListApiKeysInput): Promise<Result<ApiKey[], RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            const result = await this.storageOperations.listApiKeys({\n                where: { tenant: tenant.id },\n                ...params\n            });\n            return Result.ok(result);\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async create(apiKey: ApiKey): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            // Check if an API key with the same slug already exists\n            const existingKeyResult = await this.getBySlug(apiKey.slug);\n\n            // If we found a key, it's a duplicate slug - return validation error\n            if (existingKeyResult.isOk()) {\n                return Result.fail(\n                    new ApiKeyValidationError(`API key with slug \"${apiKey.slug}\" already exists.`)\n                );\n            }\n\n            // \"NotFound\" error is ok. Everything else is not ok.\n            if (existingKeyResult.error.code !== \"ApiKey/NotFound\") {\n                return Result.fail(existingKeyResult.error);\n            }\n\n            // Slug is unique, proceed with creation\n            const tenant = this.tenantContext.getTenant();\n            await this.storageOperations.createApiKey({ apiKey: { ...apiKey, tenant: tenant.id } });\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async update(apiKey: ApiKey): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            await this.storageOperations.updateApiKey({ apiKey: { ...apiKey, tenant: tenant.id } });\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n\n    async delete(apiKey: ApiKey): Promise<Result<void, RepositoryAbstraction.Error>> {\n        try {\n            const tenant = this.tenantContext.getTenant();\n            await this.storageOperations.deleteApiKey({ apiKey: { ...apiKey, tenant: tenant.id } });\n\n            return Result.ok();\n        } catch (error) {\n            return Result.fail(new ApiKeyPersistenceError(error));\n        }\n    }\n}\n\nexport const ApiKeysRepository = createImplementation({\n    abstraction: RepositoryAbstraction,\n    implementation: ApiKeysRepositoryImpl,\n    dependencies: [TenantContext, SecurityStorageOperations, ApiKeyProvider]\n});\n"],"names":["ApiKeysRepositoryImpl","tenantContext","storageOperations","apiKeyProvider","id","tenant","apiKey","Result","ApiKeyNotFoundError","error","token","factoryApiKey","ApiKeyPersistenceError","slug","params","result","existingKeyResult","ApiKeyValidationError","ApiKeysRepository","createImplementation","RepositoryAbstraction","TenantContext","SecurityStorageOperations","ApiKeyProvider"],"mappings":"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"}

package/features/security/apiKeys/shared/generateToken.d.ts

@@ -4,4 +4,4 @@
  * When authentication plugins kick in, they will be able to tell if they should handle
  * the token by checking the first letter.
  */
-export declare const generateToken: (tokenLength?: number) => string;
+export declare const generateToken: (tokenLength?: number) => `wat_${string}`;

package/features/security/apiKeys/shared/generateToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/security/apiKeys/shared/generateToken.js","sources":["../../../../../src/features/security/apiKeys/shared/generateToken.ts"],"sourcesContent":["import crypto from \"crypto\";\n\n/**\n * Generates a random token for API keys.\n * API Keys are prefixed with letter \"wat_\" to make token verification easier.\n * When authentication plugins kick in, they will be able to tell if they should handle\n * the token by checking the first letter.\n */\nexport const generateToken = (tokenLength = 40): string => {\n    const token = crypto.randomBytes(Math.ceil(tokenLength / 2)).toString(\"hex\");\n\n    // API Keys are prefixed with letters \"wat_\" to make token verification easier\n    if (token.startsWith(\"wat_\")) {\n        return token;\n    }\n\n    return `wat_${token.slice(0, tokenLength - 4)}`;\n};\n"],"names":["generateToken","tokenLength","token","crypto","Math"],"mappings":";AAQO,MAAMA,gBAAgB,CAACC,cAAc,EAAE;IAC1C,MAAMC,QAAQC,SAAAA,WAAkB,CAACC,KAAK,IAAI,CAACH,cAAc,IAAI,QAAQ,CAAC;IAGtE,IAAIC,MAAM,UAAU,CAAC,SACjB,OAAOA;IAGX,OAAO,CAAC,IAAI,EAAEA,MAAM,KAAK,CAAC,GAAGD,cAAc,IAAI;AACnD"}
+{"version":3,"file":"features/security/apiKeys/shared/generateToken.js","sources":["../../../../../src/features/security/apiKeys/shared/generateToken.ts"],"sourcesContent":["import crypto from \"crypto\";\n\n/**\n * Generates a random token for API keys.\n * API Keys are prefixed with letter \"wat_\" to make token verification easier.\n * When authentication plugins kick in, they will be able to tell if they should handle\n * the token by checking the first letter.\n */\nexport const generateToken = (tokenLength = 40): `wat_${string}` => {\n    const token = crypto.randomBytes(Math.ceil(tokenLength / 2)).toString(\"hex\");\n\n    // API Keys are prefixed with letters \"wat_\" to make token verification easier\n    if (token.startsWith(\"wat_\")) {\n        return token as `wat_${string}`;\n    }\n\n    return `wat_${token.slice(0, tokenLength - 4)}`;\n};\n"],"names":["generateToken","tokenLength","token","crypto","Math"],"mappings":";AAQO,MAAMA,gBAAgB,CAACC,cAAc,EAAE;IAC1C,MAAMC,QAAQC,SAAAA,WAAkB,CAACC,KAAK,IAAI,CAACH,cAAc,IAAI,QAAQ,CAAC;IAGtE,IAAIC,MAAM,UAAU,CAAC,SACjB,OAAOA;IAGX,OAAO,CAAC,IAAI,EAAEA,MAAM,KAAK,CAAC,GAAGD,cAAc,IAAI;AACnD"}

package/features/security/apiKeys/shared/types.d.ts

@@ -4,7 +4,7 @@ export interface ApiKey {
     name: string;
     slug: string;
     description: string;
-    token: string;
+    token: `wat_${string}`;
     permissions: SecurityPermission[];
     createdBy: CreatedBy;
     createdOn: string;

package/features/security/authorization/GroupsTeamsAuthorizer/GetPermissionsFromIdentity.d.ts

@@ -13,8 +13,8 @@ declare class GetPermissionsFromGroupsAndTeamsImpl implements PermissionsProcess
     private teamsRepository;
     constructor(wcpContext: WcpContext.Interface, usersRepository: AdminUsersRepository.Interface, rolesRepository: RolesRepository.Interface, teamsRepository: TeamsRepository.Interface);
     getPermissions(identity: Identity): Promise<{
-        _src: string;
         name: string;
+        _src: string;
     }[] | null>;
 }
 export declare const GetPermissionsFromIdentity: typeof GetPermissionsFromGroupsAndTeamsImpl & {

package/features/security/utils/getPermissionsFromRoles.d.ts

@@ -3,6 +3,6 @@ export declare const getPermissionsFromRoles: (securityGroups: Array<{
     permissions: SecurityPermission[];
     id: string;
 }>) => {
-    _src: string;
     name: string;
+    _src: string;
 }[];

package/features/serviceDiscovery/ServiceDiscovery.d.ts

@@ -0,0 +1,17 @@
+import type { GenericRecord } from "@webiny/api/types.js";
+export interface IServiceManifest {
+    name: string;
+    manifest: GenericRecord<string>;
+}
+export interface IServiceManifestLoader {
+    load(): Promise<IServiceManifest[] | undefined>;
+}
+type Manifest = GenericRecord<string>;
+export declare class ServiceDiscovery {
+    private static loader;
+    private static manifest;
+    static setLoader(loader: IServiceManifestLoader): void;
+    static load(): Promise<Manifest | undefined>;
+    static clear(): void;
+}
+export {};

package/features/serviceDiscovery/ServiceDiscovery.js

@@ -0,0 +1,22 @@
+class ServiceDiscovery {
+    static setLoader(loader) {
+        this.loader = loader;
+    }
+    static async load() {
+        if (this.manifest) return this.manifest;
+        if (!this.loader) throw new Error("ServiceDiscovery loader not configured. Call ServiceDiscovery.setLoader() before loading manifests.");
+        const manifests = await this.loader.load();
+        if (!manifests) return;
+        this.manifest = manifests.reduce((acc, item)=>({
+                ...acc,
+                [item.name]: item.manifest
+            }), {});
+        return this.manifest;
+    }
+    static clear() {
+        this.manifest = void 0;
+    }
+}
+export { ServiceDiscovery };
+
+//# sourceMappingURL=ServiceDiscovery.js.map

package/features/serviceDiscovery/ServiceDiscovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/serviceDiscovery/ServiceDiscovery.js","sources":["../../../src/features/serviceDiscovery/ServiceDiscovery.ts"],"sourcesContent":["import type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport interface IServiceManifest {\n    name: string;\n    manifest: GenericRecord<string>;\n}\n\nexport interface IServiceManifestLoader {\n    load(): Promise<IServiceManifest[] | undefined>;\n}\n\ntype Manifest = GenericRecord<string>;\n\nexport class ServiceDiscovery {\n    private static loader: IServiceManifestLoader | undefined;\n    private static manifest: Manifest | undefined;\n\n    static setLoader(loader: IServiceManifestLoader): void {\n        this.loader = loader;\n    }\n\n    static async load(): Promise<Manifest | undefined> {\n        if (this.manifest) {\n            return this.manifest;\n        }\n\n        if (!this.loader) {\n            throw new Error(\n                \"ServiceDiscovery loader not configured. Call ServiceDiscovery.setLoader() before loading manifests.\"\n            );\n        }\n\n        const manifests = await this.loader.load();\n\n        if (!manifests) {\n            return undefined;\n        }\n\n        this.manifest = manifests.reduce<Manifest>((acc, item) => {\n            return { ...acc, [item.name]: item.manifest };\n        }, {});\n\n        return this.manifest;\n    }\n\n    static clear(): void {\n        this.manifest = undefined;\n    }\n}\n"],"names":["ServiceDiscovery","loader","Error","manifests","acc","item","undefined"],"mappings":"AAaO,MAAMA;IAIT,OAAO,UAAUC,MAA8B,EAAQ;QACnD,IAAI,CAAC,MAAM,GAAGA;IAClB;IAEA,aAAa,OAAsC;QAC/C,IAAI,IAAI,CAAC,QAAQ,EACb,OAAO,IAAI,CAAC,QAAQ;QAGxB,IAAI,CAAC,IAAI,CAAC,MAAM,EACZ,MAAM,IAAIC,MACN;QAIR,MAAMC,YAAY,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI;QAExC,IAAI,CAACA,WACD;QAGJ,IAAI,CAAC,QAAQ,GAAGA,UAAU,MAAM,CAAW,CAACC,KAAKC,OACtC;gBAAE,GAAGD,GAAG;gBAAE,CAACC,KAAK,IAAI,CAAC,EAAEA,KAAK,QAAQ;YAAC,IAC7C,CAAC;QAEJ,OAAO,IAAI,CAAC,QAAQ;IACxB;IAEA,OAAO,QAAc;QACjB,IAAI,CAAC,QAAQ,GAAGC;IACpB;AACJ"}