@webiny/api-core 0.0.0-unstable.ac6ebf63c6 → 0.0.0-unstable.b6d7105cee

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

@@ -1,153 +1,141 @@
-import { createImplementation } from "@webiny/feature/api";
-import { Result } from "@webiny/feature/api";
-import { ApiKeysRepository as RepositoryAbstraction } from "./abstractions.js";
-import { ApiKeyProvider } from "./abstractions.js";
+import { Result, createImplementation } from "@webiny/feature/api";
+import { ApiKeyProvider, ApiKeysRepository } from "./abstractions.js";
 import { SecurityStorageOperations } from "../../shared/abstractions.js";
 import { TenantContext } from "../../../tenancy/TenantContext/index.js";
 import { ApiKeyNotFoundError, ApiKeyPersistenceError, ApiKeyValidationError } from "./errors.js";
-
-// TODO: create an ApiKeyMapper
-
 class ApiKeysRepositoryImpl {
-  constructor(tenantContext, storageOperations, apiKeyProvider) {
-    this.tenantContext = tenantContext;
-    this.storageOperations = storageOperations;
-    this.apiKeyProvider = apiKeyProvider;
-  }
-  async get(id) {
-    try {
-      const tenant = this.tenantContext.getTenant();
-      const apiKey = await this.storageOperations.getApiKey({
-        id,
-        tenant: tenant.id
-      });
-      if (apiKey) {
-        return Result.ok(apiKey);
-      }
-      return Result.fail(new ApiKeyNotFoundError());
-    } catch (error) {
-      return Result.fail(error);
+    constructor(tenantContext, storageOperations, apiKeyProvider){
+        this.tenantContext = tenantContext;
+        this.storageOperations = storageOperations;
+        this.apiKeyProvider = apiKeyProvider;
+        this.resolving = false;
     }
-  }
-  async getByToken(token) {
-    try {
-      // First, check the database (database keys have priority over factory keys)
-      const tenant = this.tenantContext.getTenant();
-      const apiKey = await this.storageOperations.getApiKeyByToken({
-        token,
-        tenant: tenant.id
-      });
-      if (apiKey) {
-        return Result.ok(apiKey);
-      }
-
-      // If not found in database, check if the API key is provided by a factory
-      const factoryApiKey = await this.apiKeyProvider.getByToken(token);
-      if (factoryApiKey) {
-        return Result.ok(factoryApiKey);
-      }
-      return Result.fail(new ApiKeyNotFoundError());
-    } catch (error) {
-      return Result.fail(new ApiKeyPersistenceError(error));
+    async get(id) {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            const apiKey = await this.storageOperations.getApiKey({
+                id,
+                tenant: tenant.id
+            });
+            if (apiKey) return Result.ok(apiKey);
+            return Result.fail(new ApiKeyNotFoundError());
+        } catch (error) {
+            return Result.fail(error);
+        }
     }
-  }
-  async getBySlug(slug) {
-    try {
-      // First, check the database (database keys have priority over factory keys)
-      const tenant = this.tenantContext.getTenant();
-      const apiKey = await this.storageOperations.getApiKeyBySlug({
-        slug,
-        tenant: tenant.id
-      });
-      if (apiKey) {
-        return Result.ok(apiKey);
-      }
-
-      // If not found in database, check if the API key is provided by a factory
-      const factoryApiKey = await this.apiKeyProvider.getBySlug(slug);
-      if (factoryApiKey) {
-        return Result.ok(factoryApiKey);
-      }
-      return Result.fail(new ApiKeyNotFoundError());
-    } catch (error) {
-      return Result.fail(new ApiKeyPersistenceError(error));
+    async getByToken(token) {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            const apiKey = await this.storageOperations.getApiKeyByToken({
+                token,
+                tenant: tenant.id
+            });
+            if (apiKey) return Result.ok(apiKey);
+            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));
+        }
     }
-  }
-  async list(params) {
-    try {
-      const tenant = this.tenantContext.getTenant();
-      const result = await this.storageOperations.listApiKeys({
-        where: {
-          tenant: tenant.id
-        },
-        ...params
-      });
-      return Result.ok(result);
-    } catch (error) {
-      return Result.fail(new ApiKeyPersistenceError(error));
+    async getBySlug(slug) {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            const apiKey = await this.storageOperations.getApiKeyBySlug({
+                slug,
+                tenant: tenant.id
+            });
+            if (apiKey) return Result.ok(apiKey);
+            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));
+        }
     }
-  }
-  async create(apiKey) {
-    try {
-      // Check if an API key with the same slug already exists
-      const existingKeyResult = await this.getBySlug(apiKey.slug);
-
-      // If we found a key, it's a duplicate slug - return validation error
-      if (existingKeyResult.isOk()) {
-        return Result.fail(new ApiKeyValidationError(`API key with slug "${apiKey.slug}" already exists.`));
-      }
-
-      // "NotFound" error is ok. Everything else is not ok.
-      if (existingKeyResult.error.code !== "ApiKey/NotFound") {
-        return Result.fail(existingKeyResult.error);
-      }
-
-      // Slug is unique, proceed with creation
-      const tenant = this.tenantContext.getTenant();
-      await this.storageOperations.createApiKey({
-        apiKey: {
-          ...apiKey,
-          tenant: tenant.id
+    async list(params) {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            const result = await this.storageOperations.listApiKeys({
+                where: {
+                    tenant: tenant.id
+                },
+                ...params
+            });
+            return Result.ok(result);
+        } catch (error) {
+            return Result.fail(new ApiKeyPersistenceError(error));
+        }
+    }
+    async create(apiKey) {
+        try {
+            const existingKeyResult = await this.getBySlug(apiKey.slug);
+            if (existingKeyResult.isOk()) return Result.fail(new ApiKeyValidationError(`API key with slug "${apiKey.slug}" already exists.`));
+            if ("ApiKey/NotFound" !== existingKeyResult.error.code) return Result.fail(existingKeyResult.error);
+            const tenant = this.tenantContext.getTenant();
+            await this.storageOperations.createApiKey({
+                apiKey: {
+                    ...apiKey,
+                    tenant: tenant.id
+                }
+            });
+            return Result.ok();
+        } catch (error) {
+            return Result.fail(new ApiKeyPersistenceError(error));
         }
-      });
-      return Result.ok();
-    } catch (error) {
-      return Result.fail(new ApiKeyPersistenceError(error));
     }
-  }
-  async update(apiKey) {
-    try {
-      const tenant = this.tenantContext.getTenant();
-      await this.storageOperations.updateApiKey({
-        apiKey: {
-          ...apiKey,
-          tenant: tenant.id
+    async update(apiKey) {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            await this.storageOperations.updateApiKey({
+                apiKey: {
+                    ...apiKey,
+                    tenant: tenant.id
+                }
+            });
+            return Result.ok();
+        } catch (error) {
+            return Result.fail(new ApiKeyPersistenceError(error));
         }
-      });
-      return Result.ok();
-    } catch (error) {
-      return Result.fail(new ApiKeyPersistenceError(error));
     }
-  }
-  async delete(apiKey) {
-    try {
-      const tenant = this.tenantContext.getTenant();
-      await this.storageOperations.deleteApiKey({
-        apiKey: {
-          ...apiKey,
-          tenant: tenant.id
+    async delete(apiKey) {
+        try {
+            const tenant = this.tenantContext.getTenant();
+            await this.storageOperations.deleteApiKey({
+                apiKey: {
+                    ...apiKey,
+                    tenant: tenant.id
+                }
+            });
+            return Result.ok();
+        } catch (error) {
+            return Result.fail(new ApiKeyPersistenceError(error));
         }
-      });
-      return Result.ok();
-    } catch (error) {
-      return Result.fail(new ApiKeyPersistenceError(error));
     }
-  }
 }
-export const ApiKeysRepository = createImplementation({
-  abstraction: RepositoryAbstraction,
-  implementation: ApiKeysRepositoryImpl,
-  dependencies: [TenantContext, SecurityStorageOperations, ApiKeyProvider]
+const ApiKeysRepository_ApiKeysRepository = createImplementation({
+    abstraction: ApiKeysRepository,
+    implementation: ApiKeysRepositoryImpl,
+    dependencies: [
+        TenantContext,
+        SecurityStorageOperations,
+        ApiKeyProvider
+    ]
 });
+export { ApiKeysRepository_ApiKeysRepository as ApiKeysRepository };
 
 //# sourceMappingURL=ApiKeysRepository.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createImplementation","Result","ApiKeysRepository","RepositoryAbstraction","ApiKeyProvider","SecurityStorageOperations","TenantContext","ApiKeyNotFoundError","ApiKeyPersistenceError","ApiKeyValidationError","ApiKeysRepositoryImpl","constructor","tenantContext","storageOperations","apiKeyProvider","get","id","tenant","getTenant","apiKey","getApiKey","ok","fail","error","getByToken","token","getApiKeyByToken","factoryApiKey","getBySlug","slug","getApiKeyBySlug","list","params","result","listApiKeys","where","create","existingKeyResult","isOk","code","createApiKey","update","updateApiKey","delete","deleteApiKey","abstraction","implementation","dependencies"],"sources":["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"],"mappings":"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","ignoreList":[]}
+{"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/abstractions.d.ts

@@ -14,6 +14,7 @@ export interface IApiKeysRepository {
     update(data: ApiKey): Promise<Result<void, RepositoryError>>;
     delete(apiKey: ApiKey): Promise<Result<void, RepositoryError>>;
 }
+/** Persist and retrieve API keys. */
 export declare const ApiKeysRepository: import("@webiny/di").Abstraction<IApiKeysRepository>;
 export declare namespace ApiKeysRepository {
     type Interface = IApiKeysRepository;
@@ -23,18 +24,20 @@ export type CodeApiKey = Pick<ApiKey, "name" | "permissions" | "slug"> & {
     token: `wat_${string}`;
 };
 export interface IApiKeyFactory {
-    execute(): Promise<CodeApiKey[]> | CodeApiKey[];
+    execute(): Promise<CodeApiKey[]>;
 }
+/** Provide code-defined API keys. */
 export declare const ApiKeyFactory: import("@webiny/di").Abstraction<IApiKeyFactory>;
 export declare namespace ApiKeyFactory {
     type Interface = IApiKeyFactory;
-    type Return = Promise<CodeApiKey[]> | CodeApiKey[];
+    type Return = Promise<CodeApiKey[]>;
     type ApiKey = CodeApiKey;
 }
 export interface IApiKeyProvider {
     getByToken(token: string): Promise<ApiKey | null>;
     getBySlug(slug: string): Promise<ApiKey | null>;
 }
+/** Retrieve API keys by token or slug. */
 export declare const ApiKeyProvider: import("@webiny/di").Abstraction<IApiKeyProvider>;
 export declare namespace ApiKeyProvider {
     type Interface = IApiKeyProvider;

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

@@ -1,6 +1,7 @@
 import { createAbstraction } from "@webiny/feature/api";
-export const ApiKeysRepository = createAbstraction("ApiKeysRepository");
-export const ApiKeyFactory = createAbstraction("ApiKeyFactory");
-export const ApiKeyProvider = createAbstraction("ApiKeyProvider");
+const ApiKeysRepository = createAbstraction("ApiKeysRepository");
+const ApiKeyFactory = createAbstraction("ApiKeyFactory");
+const ApiKeyProvider = createAbstraction("ApiKeyProvider");
+export { ApiKeyFactory, ApiKeyProvider, ApiKeysRepository };
 
 //# sourceMappingURL=abstractions.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createAbstraction","ApiKeysRepository","ApiKeyFactory","ApiKeyProvider"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { ApiKey, ListApiKeysInput } from \"./types.js\";\nimport {\n    type ApiKeyNotFoundError,\n    ApiKeyPersistenceError,\n    ApiKeyValidationError\n} from \"./errors.js\";\n\nexport interface IApiKeysRepositoryErrors {\n    base: ApiKeyNotFoundError | ApiKeyPersistenceError | ApiKeyValidationError;\n}\n\ntype RepositoryError = IApiKeysRepositoryErrors[keyof IApiKeysRepositoryErrors];\n\nexport interface IApiKeysRepository {\n    get(id: string): Promise<Result<ApiKey, RepositoryError>>;\n    getByToken(token: string): Promise<Result<ApiKey, RepositoryError>>;\n    getBySlug(token: string): Promise<Result<ApiKey, RepositoryError>>;\n    list(params: ListApiKeysInput): Promise<Result<ApiKey[], RepositoryError>>;\n    create(data: ApiKey): Promise<Result<void, RepositoryError>>;\n    update(data: ApiKey): Promise<Result<void, RepositoryError>>;\n    delete(apiKey: ApiKey): Promise<Result<void, RepositoryError>>;\n}\n\nexport const ApiKeysRepository = createAbstraction<IApiKeysRepository>(\"ApiKeysRepository\");\n\nexport namespace ApiKeysRepository {\n    export type Interface = IApiKeysRepository;\n    export type Error = RepositoryError;\n}\n\nexport type CodeApiKey = Pick<ApiKey, \"name\" | \"permissions\" | \"slug\"> & {\n    token: `wat_${string}`;\n};\n\nexport interface IApiKeyFactory {\n    execute(): Promise<CodeApiKey[]> | CodeApiKey[];\n}\n\nexport const ApiKeyFactory = createAbstraction<IApiKeyFactory>(\"ApiKeyFactory\");\n\nexport namespace ApiKeyFactory {\n    export type Interface = IApiKeyFactory;\n    export type Return = Promise<CodeApiKey[]> | CodeApiKey[];\n    export type ApiKey = CodeApiKey;\n}\n\nexport interface IApiKeyProvider {\n    getByToken(token: string): Promise<ApiKey | null>;\n    getBySlug(slug: string): Promise<ApiKey | null>;\n}\n\nexport const ApiKeyProvider = createAbstraction<IApiKeyProvider>(\"ApiKeyProvider\");\n\nexport namespace ApiKeyProvider {\n    export type Interface = IApiKeyProvider;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;AAyBvD,OAAO,MAAMC,iBAAiB,GAAGD,iBAAiB,CAAqB,mBAAmB,CAAC;AAe3F,OAAO,MAAME,aAAa,GAAGF,iBAAiB,CAAiB,eAAe,CAAC;AAa/E,OAAO,MAAMG,cAAc,GAAGH,iBAAiB,CAAkB,gBAAgB,CAAC","ignoreList":[]}
+{"version":3,"file":"features/security/apiKeys/shared/abstractions.js","sources":["../../../../../src/features/security/apiKeys/shared/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport { Result } from \"@webiny/feature/api\";\nimport type { ApiKey, ListApiKeysInput } from \"./types.js\";\nimport {\n    type ApiKeyNotFoundError,\n    ApiKeyPersistenceError,\n    ApiKeyValidationError\n} from \"./errors.js\";\n\nexport interface IApiKeysRepositoryErrors {\n    base: ApiKeyNotFoundError | ApiKeyPersistenceError | ApiKeyValidationError;\n}\n\ntype RepositoryError = IApiKeysRepositoryErrors[keyof IApiKeysRepositoryErrors];\n\nexport interface IApiKeysRepository {\n    get(id: string): Promise<Result<ApiKey, RepositoryError>>;\n    getByToken(token: string): Promise<Result<ApiKey, RepositoryError>>;\n    getBySlug(token: string): Promise<Result<ApiKey, RepositoryError>>;\n    list(params: ListApiKeysInput): Promise<Result<ApiKey[], RepositoryError>>;\n    create(data: ApiKey): Promise<Result<void, RepositoryError>>;\n    update(data: ApiKey): Promise<Result<void, RepositoryError>>;\n    delete(apiKey: ApiKey): Promise<Result<void, RepositoryError>>;\n}\n\n/** Persist and retrieve API keys. */\nexport const ApiKeysRepository = createAbstraction<IApiKeysRepository>(\"ApiKeysRepository\");\n\nexport namespace ApiKeysRepository {\n    export type Interface = IApiKeysRepository;\n    export type Error = RepositoryError;\n}\n\nexport type CodeApiKey = Pick<ApiKey, \"name\" | \"permissions\" | \"slug\"> & {\n    token: `wat_${string}`;\n};\n\nexport interface IApiKeyFactory {\n    execute(): Promise<CodeApiKey[]>;\n}\n\n/** Provide code-defined API keys. */\nexport const ApiKeyFactory = createAbstraction<IApiKeyFactory>(\"ApiKeyFactory\");\n\nexport namespace ApiKeyFactory {\n    export type Interface = IApiKeyFactory;\n    export type Return = Promise<CodeApiKey[]>;\n    export type ApiKey = CodeApiKey;\n}\n\nexport interface IApiKeyProvider {\n    getByToken(token: string): Promise<ApiKey | null>;\n    getBySlug(slug: string): Promise<ApiKey | null>;\n}\n\n/** Retrieve API keys by token or slug. */\nexport const ApiKeyProvider = createAbstraction<IApiKeyProvider>(\"ApiKeyProvider\");\n\nexport namespace ApiKeyProvider {\n    export type Interface = IApiKeyProvider;\n}\n"],"names":["ApiKeysRepository","createAbstraction","ApiKeyFactory","ApiKeyProvider"],"mappings":";AA0BO,MAAMA,oBAAoBC,kBAAsC;AAgBhE,MAAMC,gBAAgBD,kBAAkC;AAcxD,MAAME,iBAAiBF,kBAAmC"}

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

@@ -1,39 +1,36 @@
 import { BaseError } from "@webiny/feature/api";
-export class ApiKeyPersistenceError extends BaseError {
-  code = "ApiKey/Persistence";
-  constructor(error) {
-    super({
-      message: error.message
-    });
-  }
+class ApiKeyPersistenceError extends BaseError {
+    constructor(error){
+        super({
+            message: error.message
+        }), this.code = "ApiKey/Persistence";
+    }
 }
-export class ApiKeyNotFoundError extends BaseError {
-  code = "ApiKey/NotFound";
-  constructor() {
-    super({
-      message: `API key was not found!`
-    });
-  }
+class ApiKeyNotFoundError extends BaseError {
+    constructor(){
+        super({
+            message: "API key was not found!"
+        }), this.code = "ApiKey/NotFound";
+    }
 }
-export class ApiKeyNotAuthorizedError extends BaseError {
-  code = "ApiKey/NotAuthorized";
-  constructor(data = {}) {
-    super({
-      message: data.message || "Not authorized!",
-      data
-    });
-  }
+class ApiKeyNotAuthorizedError extends BaseError {
+    constructor(data = {}){
+        super({
+            message: data.message || "Not authorized!",
+            data
+        }), this.code = "ApiKey/NotAuthorized";
+    }
 }
-export class ApiKeyValidationError extends BaseError {
-  code = "ApiKey/Validation";
-  constructor(message) {
-    super({
-      message,
-      data: {
-        message
-      }
-    });
-  }
+class ApiKeyValidationError extends BaseError {
+    constructor(message){
+        super({
+            message,
+            data: {
+                message
+            }
+        }), this.code = "ApiKey/Validation";
+    }
 }
+export { ApiKeyNotAuthorizedError, ApiKeyNotFoundError, ApiKeyPersistenceError, ApiKeyValidationError };
 
 //# sourceMappingURL=errors.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["BaseError","ApiKeyPersistenceError","code","constructor","error","message","ApiKeyNotFoundError","ApiKeyNotAuthorizedError","data","ApiKeyValidationError"],"sources":["errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\n\nexport class ApiKeyPersistenceError extends BaseError {\n    override readonly code = \"ApiKey/Persistence\" as const;\n\n    constructor(error: Error) {\n        super({\n            message: error.message\n        });\n    }\n}\n\nexport class ApiKeyNotFoundError extends BaseError {\n    override readonly code = \"ApiKey/NotFound\" as const;\n\n    constructor() {\n        super({\n            message: `API key was not found!`\n        });\n    }\n}\n\ntype NotAuthorizedErrorData = {\n    message?: string;\n};\n\nexport class ApiKeyNotAuthorizedError extends BaseError<NotAuthorizedErrorData> {\n    override readonly code = \"ApiKey/NotAuthorized\" as const;\n\n    constructor(data: NotAuthorizedErrorData = {}) {\n        super({\n            message: data.message || \"Not authorized!\",\n            data\n        });\n    }\n}\n\ntype ApiKeyValidationErrorData = {\n    message: string;\n};\n\nexport class ApiKeyValidationError extends BaseError<ApiKeyValidationErrorData> {\n    override readonly code = \"ApiKey/Validation\" as const;\n\n    constructor(message: string) {\n        super({\n            message,\n            data: { message }\n        });\n    }\n}\n"],"mappings":"AAAA,SAASA,SAAS,QAAQ,qBAAqB;AAE/C,OAAO,MAAMC,sBAAsB,SAASD,SAAS,CAAC;EAChCE,IAAI,GAAG,oBAAoB;EAE7CC,WAAWA,CAACC,KAAY,EAAE;IACtB,KAAK,CAAC;MACFC,OAAO,EAAED,KAAK,CAACC;IACnB,CAAC,CAAC;EACN;AACJ;AAEA,OAAO,MAAMC,mBAAmB,SAASN,SAAS,CAAC;EAC7BE,IAAI,GAAG,iBAAiB;EAE1CC,WAAWA,CAAA,EAAG;IACV,KAAK,CAAC;MACFE,OAAO,EAAE;IACb,CAAC,CAAC;EACN;AACJ;AAMA,OAAO,MAAME,wBAAwB,SAASP,SAAS,CAAyB;EAC1DE,IAAI,GAAG,sBAAsB;EAE/CC,WAAWA,CAACK,IAA4B,GAAG,CAAC,CAAC,EAAE;IAC3C,KAAK,CAAC;MACFH,OAAO,EAAEG,IAAI,CAACH,OAAO,IAAI,iBAAiB;MAC1CG;IACJ,CAAC,CAAC;EACN;AACJ;AAMA,OAAO,MAAMC,qBAAqB,SAAST,SAAS,CAA4B;EAC1DE,IAAI,GAAG,mBAAmB;EAE5CC,WAAWA,CAACE,OAAe,EAAE;IACzB,KAAK,CAAC;MACFA,OAAO;MACPG,IAAI,EAAE;QAAEH;MAAQ;IACpB,CAAC,CAAC;EACN;AACJ","ignoreList":[]}
+{"version":3,"file":"features/security/apiKeys/shared/errors.js","sources":["../../../../../src/features/security/apiKeys/shared/errors.ts"],"sourcesContent":["import { BaseError } from \"@webiny/feature/api\";\n\nexport class ApiKeyPersistenceError extends BaseError {\n    override readonly code = \"ApiKey/Persistence\" as const;\n\n    constructor(error: Error) {\n        super({\n            message: error.message\n        });\n    }\n}\n\nexport class ApiKeyNotFoundError extends BaseError {\n    override readonly code = \"ApiKey/NotFound\" as const;\n\n    constructor() {\n        super({\n            message: `API key was not found!`\n        });\n    }\n}\n\ntype NotAuthorizedErrorData = {\n    message?: string;\n};\n\nexport class ApiKeyNotAuthorizedError extends BaseError<NotAuthorizedErrorData> {\n    override readonly code = \"ApiKey/NotAuthorized\" as const;\n\n    constructor(data: NotAuthorizedErrorData = {}) {\n        super({\n            message: data.message || \"Not authorized!\",\n            data\n        });\n    }\n}\n\ntype ApiKeyValidationErrorData = {\n    message: string;\n};\n\nexport class ApiKeyValidationError extends BaseError<ApiKeyValidationErrorData> {\n    override readonly code = \"ApiKey/Validation\" as const;\n\n    constructor(message: string) {\n        super({\n            message,\n            data: { message }\n        });\n    }\n}\n"],"names":["ApiKeyPersistenceError","BaseError","error","ApiKeyNotFoundError","ApiKeyNotAuthorizedError","data","ApiKeyValidationError","message"],"mappings":";AAEO,MAAMA,+BAA+BC;IAGxC,YAAYC,KAAY,CAAE;QACtB,KAAK,CAAC;YACF,SAASA,MAAM,OAAO;QAC1B,SALc,IAAI,GAAG;IAMzB;AACJ;AAEO,MAAMC,4BAA4BF;IAGrC,aAAc;QACV,KAAK,CAAC;YACF,SAAS;QACb,SALc,IAAI,GAAG;IAMzB;AACJ;AAMO,MAAMG,iCAAiCH;IAG1C,YAAYI,OAA+B,CAAC,CAAC,CAAE;QAC3C,KAAK,CAAC;YACF,SAASA,KAAK,OAAO,IAAI;YACzBA;QACJ,SANc,IAAI,GAAG;IAOzB;AACJ;AAMO,MAAMC,8BAA8BL;IAGvC,YAAYM,OAAe,CAAE;QACzB,KAAK,CAAC;YACFA;YACA,MAAM;gBAAEA;YAAQ;QACpB,SANc,IAAI,GAAG;IAOzB;AACJ"}

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

@@ -1,19 +1,9 @@
-import crypto from "crypto";
-
-/**
- * Generates a random token for API keys.
- * API Keys are prefixed with letter "wat_" to make token verification easier.
- * When authentication plugins kick in, they will be able to tell if they should handle
- * the token by checking the first letter.
- */
-export const generateToken = (tokenLength = 40) => {
-  const token = crypto.randomBytes(Math.ceil(tokenLength / 2)).toString("hex");
-
-  // API Keys are prefixed with letters "wat_" to make token verification easier
-  if (token.startsWith("wat_")) {
-    return token;
-  }
-  return `wat_${token.slice(0, tokenLength - 4)}`;
+import crypto_0 from "crypto";
+const generateToken = (tokenLength = 40)=>{
+    const token = crypto_0.randomBytes(Math.ceil(tokenLength / 2)).toString("hex");
+    if (token.startsWith("wat_")) return token;
+    return `wat_${token.slice(0, tokenLength - 4)}`;
 };
+export { generateToken };
 
 //# sourceMappingURL=generateToken.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["crypto","generateToken","tokenLength","token","randomBytes","Math","ceil","toString","startsWith","slice"],"sources":["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"],"mappings":"AAAA,OAAOA,MAAM,MAAM,QAAQ;;AAE3B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,aAAa,GAAGA,CAACC,WAAW,GAAG,EAAE,KAAa;EACvD,MAAMC,KAAK,GAAGH,MAAM,CAACI,WAAW,CAACC,IAAI,CAACC,IAAI,CAACJ,WAAW,GAAG,CAAC,CAAC,CAAC,CAACK,QAAQ,CAAC,KAAK,CAAC;;EAE5E;EACA,IAAIJ,KAAK,CAACK,UAAU,CAAC,MAAM,CAAC,EAAE;IAC1B,OAAOL,KAAK;EAChB;EAEA,OAAO,OAAOA,KAAK,CAACM,KAAK,CAAC,CAAC,EAAEP,WAAW,GAAG,CAAC,CAAC,EAAE;AACnD,CAAC","ignoreList":[]}
+{"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/schemas.d.ts

@@ -5,87 +5,26 @@ export declare const createApiKeyInputSchema: z.ZodObject<{
     description: z.ZodString;
     permissions: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
-    }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">>, "many">>>;
-}, "strip", z.ZodTypeAny, {
-    permissions: z.objectOutputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">[];
-    name: string;
-    description: string;
-    slug: string;
-}, {
-    name: string;
-    description: string;
-    slug: string;
-    permissions?: z.objectInputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">[] | undefined;
-}>;
+    }, z.core.$loose>>>>;
+}, z.core.$strip>;
 export declare const updateApiKeyInputSchema: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     description: z.ZodOptional<z.ZodString>;
     permissions: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
-    }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">>, "many">>>;
-}, "strip", z.ZodTypeAny, {
-    permissions: z.objectOutputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">[];
-    name?: string | undefined;
-    description?: string | undefined;
-}, {
-    permissions?: z.objectInputType<{
-        name: z.ZodString;
-    }, z.ZodTypeAny, "passthrough">[] | undefined;
-    name?: string | undefined;
-    description?: string | undefined;
-}>;
+    }, z.core.$loose>>>>;
+}, z.core.$strip>;
 export declare const listApiKeysInputSchema: z.ZodObject<{
     where: z.ZodOptional<z.ZodObject<{
         name: z.ZodOptional<z.ZodString>;
         name_contains: z.ZodOptional<z.ZodString>;
         description: z.ZodOptional<z.ZodString>;
         description_contains: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        name?: string | undefined;
-        description?: string | undefined;
-        name_contains?: string | undefined;
-        description_contains?: string | undefined;
-    }, {
-        name?: string | undefined;
-        description?: string | undefined;
-        name_contains?: string | undefined;
-        description_contains?: string | undefined;
-    }>>;
+    }, z.core.$strip>>;
     limit: z.ZodOptional<z.ZodNumber>;
     after: z.ZodOptional<z.ZodString>;
-    sort: z.ZodOptional<z.ZodArray<z.ZodEnum<["createdOn_ASC", "createdOn_DESC"]>, "many">>;
-}, "strip", z.ZodTypeAny, {
-    sort?: ("createdOn_ASC" | "createdOn_DESC")[] | undefined;
-    where?: {
-        name?: string | undefined;
-        description?: string | undefined;
-        name_contains?: string | undefined;
-        description_contains?: string | undefined;
-    } | undefined;
-    limit?: number | undefined;
-    after?: string | undefined;
-}, {
-    sort?: ("createdOn_ASC" | "createdOn_DESC")[] | undefined;
-    where?: {
-        name?: string | undefined;
-        description?: string | undefined;
-        name_contains?: string | undefined;
-        description_contains?: string | undefined;
-    } | undefined;
-    limit?: number | undefined;
-    after?: string | undefined;
-}>;
+    sort: z.ZodOptional<z.ZodArray<z.ZodEnum<{
+        createdOn_ASC: "createdOn_ASC";
+        createdOn_DESC: "createdOn_DESC";
+    }>>>;
+}, z.core.$strip>;