@adobe/spacecat-shared-data-access 1.49.7 → 1.50.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v1.50.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.49.8...@adobe/spacecat-shared-data-access-v1.50.0) (2024-11-08)
+
+
+### Features
+
+* support queries to generate self-service api-keys ([#428](https://github.com/adobe/spacecat-shared/issues/428)) ([90a46c2](https://github.com/adobe/spacecat-shared/commit/90a46c2f095e07d77636189c04f52ba31a626c7b))
+
+# [@adobe/spacecat-shared-data-access-v1.49.8](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.49.7...@adobe/spacecat-shared-data-access-v1.49.8) (2024-11-08)
+
+
+### Bug Fixes
+
+* engine spec ([#433](https://github.com/adobe/spacecat-shared/issues/433)) ([19dd309](https://github.com/adobe/spacecat-shared/commit/19dd30956c0a9d35ea343c580e589205bfdbdfd8))
+
 # [@adobe/spacecat-shared-data-access-v1.49.7](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.49.6...@adobe/spacecat-shared-data-access-v1.49.7) (2024-11-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "1.49.7",
+  "version": "1.50.0",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "engines": {
@@ -33,10 +33,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@adobe/spacecat-shared-dynamo": "1.3.45",
+    "@adobe/spacecat-shared-dynamo": "1.3.46",
     "@adobe/spacecat-shared-utils": "1.22.3",
-    "@aws-sdk/client-dynamodb": "3.682.0",
-    "@aws-sdk/lib-dynamodb": "3.685.0",
+    "@aws-sdk/client-dynamodb": "3.687.0",
+    "@aws-sdk/lib-dynamodb": "3.687.0",
     "@types/joi": "17.2.3",
     "joi": "17.13.3",
     "uuid": "11.0.2"

package/src/dto/api-key.js

@@ -10,15 +10,16 @@
  * governing permissions and limitations under the License.
  */
 
-import { createApiKey } from '../models/api-key.js';
+import { createApiKey } from '../models/api-key/api-key.js';
 
 export const ApiKeyDto = {
 
   /**
      * Converts an ApiKey object into a DynamoDB item.
      * @param apiKey
-     * @returns {{createdAt: *, name: *, imsUserId, scopes, revokedAt, key: *,
-     *          imsOrgId: *, expiresAt: *}}
+     * @returns {{createdAt: string, name: string, imsUserId: string,
+     * scopes: array<object>, revokedAt: string, deletedAt: string,
+     * hashedApiKey: string, imsOrgId: string, expiresAt: string}}
      */
   toDynamoItem: (apiKey) => ({
     id: apiKey.getId(),
@@ -29,6 +30,7 @@ export const ApiKeyDto = {
     createdAt: apiKey.getCreatedAt(),
     expiresAt: apiKey.getExpiresAt(),
     revokedAt: apiKey.getRevokedAt(),
+    deletedAt: apiKey.getDeletedAt(),
     scopes: apiKey.getScopes(),
   }),
 
@@ -47,6 +49,7 @@ export const ApiKeyDto = {
       createdAt: dynamoItem.createdAt,
       expiresAt: dynamoItem.expiresAt,
       revokedAt: dynamoItem.revokedAt,
+      deletedAt: dynamoItem.deletedAt,
       scopes: dynamoItem.scopes,
     };
 

package/src/index.d.ts

@@ -635,11 +635,26 @@ export interface ApiKey {
      */
     getRevokedAt: () => string;
 
+    /**
+      * Retrieves the deletedAt of the API Key.
+      */
+    getDeletedAt: () => string;
+
     /**
      * Retrieves the scopes of the API Key.
      */
     getScopes: () => Array<string>;
 
+    /**
+    * Updates the deletedAt attribute of the API Key.
+    */
+    updateDeletedAt: (deletedAt: string) => ApiKey;
+
+    /**
+     * Indicates whether the API Key is valid.
+     */
+    isValid: () => boolean;
+
 }
 
 /**
@@ -839,6 +854,16 @@ export interface DataAccess {
   createNewApiKey: (
       apiKeyData: object,
   ) => Promise<ApiKey>;
+  updateApiKey: (
+      apiKey: ApiKey,
+  ) => Promise<ApiKey>;
+  getApiKeysByImsUserIdAndImsOrgId: (
+      imsUserId: string,
+      imsOrgId: string,
+  ) => Promise<ApiKey[] | null>;
+  getApiKeyById: (
+      id: string,
+  ) => Promise<ApiKey | null>;
 
   // site candidate functions
   getSiteCandidateByBaseURL: (baseURL: string) => Promise<SiteCandidate>;
@@ -893,6 +918,7 @@ interface DataAccessConfig {
   indexNameAllImportJobsByDateRange: string,
   indexNameImportUrlsByJobIdAndStatus: string,
   indexNameApiKeyByHashedApiKey: string,
+  indexNameApiKeyByImsUserIdAndImsOrgId: string,
   pkAllSites: string;
   pkAllLatestAudits: string;
   pkAllOrganizations: string;

package/src/index.js

@@ -38,6 +38,7 @@ const INDEX_NAME_ALL_IMPORT_JOBS_BY_STATUS = 'spacecat-services-all-import-jobs-
 const INDEX_NAME_ALL_IMPORT_JOBS_BY_DATE_RANGE = 'spacecat-services-all-import-jobs-by-date-range-dev';
 const INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS = 'spacecat-services-all-import-urls-by-job-id-and-status-dev';
 const INDEX_NAME_API_KEY_BY_HASHED_API_KEY = 'spacecat-services-api-key-by-hashed-api-key-dev';
+const INDEX_NAME_API_KEY_BY_IMS_USER_ID_AND_IMS_ORG_ID = 'spacecat-services-api-key-by-ims-user-id-and-ims-org-id-dev';
 
 const PK_ALL_SITES = 'ALL_SITES';
 const PK_ALL_CONFIGURATIONS = 'ALL_CONFIGURATIONS';
@@ -76,6 +77,8 @@ export default function dataAccessWrapper(fn) {
         DYNAMO_INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS =
         INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS,
         DYNAMO_INDEX_NAME_API_KEY_BY_HASHED_API_KEY = INDEX_NAME_API_KEY_BY_HASHED_API_KEY,
+        DYNAMO_INDEX_NAME_API_KEY_BY_IMS_USER_ID_AND_IMS_ORG_ID =
+        INDEX_NAME_API_KEY_BY_IMS_USER_ID_AND_IMS_ORG_ID,
       } = context.env;
 
       context.dataAccess = createDataAccess({
@@ -102,6 +105,8 @@ export default function dataAccessWrapper(fn) {
         indexNameAllImportJobsByDateRange: DYNAMO_INDEX_NAME_ALL_IMPORT_JOBS_BY_DATE_RANGE,
         indexNameImportUrlsByJobIdAndStatus: DYNAMO_INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS,
         indexNameApiKeyByHashedApiKey: DYNAMO_INDEX_NAME_API_KEY_BY_HASHED_API_KEY,
+        indexNameApiKeyByImsUserIdAndImsOrgId:
+        DYNAMO_INDEX_NAME_API_KEY_BY_IMS_USER_ID_AND_IMS_ORG_ID,
         pkAllSites: PK_ALL_SITES,
         pkAllOrganizations: PK_ALL_ORGANIZATIONS,
         pkAllLatestAudits: PK_ALL_LATEST_AUDITS,

package/src/models/{api-key.js → api-key/api-key.js}

@@ -13,7 +13,7 @@
 import {
   hasText, isIsoDate, isObject, isValidUrl,
 } from '@adobe/spacecat-shared-utils';
-import { Base } from './base.js';
+import { Base } from '../base.js';
 
 // List of known scope names that can be used with scoped API keys
 const scopeNames = [
@@ -40,8 +40,79 @@ const ApiKey = (data) => {
   self.getCreatedAt = () => self.state.createdAt;
   self.getExpiresAt = () => self.state.expiresAt;
   self.getRevokedAt = () => self.state.revokedAt;
+  self.getDeletedAt = () => self.state.deletedAt;
   self.getScopes = () => self.state.scopes;
 
+  /**
+   * Checks if the apiKey is valid.
+   * @returns {boolean} True if the apiKey is valid, false otherwise
+   */
+  self.isValid = () => {
+    const now = new Date();
+
+    if (self.state.deletedAt && new Date(self.state.deletedAt) < now) {
+      return false;
+    }
+
+    if (self.state.revokedAt && new Date(self.state.revokedAt) < now) {
+      return false;
+    }
+
+    if (self.state.expiresAt && new Date(self.state.expiresAt) < now) {
+      return false;
+    }
+
+    return true;
+  };
+
+  /**
+   * Updates the state of the ApiKey.
+   * @param key - The key to update.
+   * @param value - The new value.
+   * @param validator - An optional validation function to use before updating the value.
+   * @returns {ApiKey} The updated ApiKey object.
+   */
+  const updateState = (key, value, validator) => {
+    if (validator && typeof validator === 'function') {
+      validator(value);
+    }
+
+    self.state[key] = value;
+    self.touch();
+
+    return self;
+  };
+
+  /**
+   * Updates the deletedAt attribute of the ApiKey.
+   * @param {string} deletedAt - The deletedAt timestamp - ISO 8601 date string.
+   */
+  self.updateDeletedAt = (deletedAt) => updateState('deletedAt', deletedAt, (value) => {
+    if (!isIsoDate(value)) {
+      throw new Error(`Invalid deletedAt during update: ${value}. Must be a valid ISO 8601 date string.`);
+    }
+  });
+
+  /**
+   * Updates the expiresAt attribute of the ApiKey.
+   * @param {string} expiresAt - The expiresAt timestamp - ISO 8601 date string.
+   */
+  self.updateExpiresAt = (expiresAt) => updateState('expiresAt', expiresAt, (value) => {
+    if (!isIsoDate(value)) {
+      throw new Error(`Invalid expiresAt during update: ${value}. Must be a valid ISO 8601 date string.`);
+    }
+  });
+
+  /**
+   * Updates the revokedAt attribute of the ApiKey.
+   * @param {string} revokedAt - The revokedAt timestamp - ISO 8601 date string.
+   */
+  self.updateRevokedAt = (revokedAt) => updateState('revokedAt', revokedAt, (value) => {
+    if (!isIsoDate(value)) {
+      throw new Error(`Invalid revokedAt during update: ${value}. Must be a valid ISO 8601 date string.`);
+    }
+  });
+
   return Object.freeze(self);
 };
 

package/src/service/api-key/accessPatterns.js

@@ -11,6 +11,7 @@
  */
 
 import { ApiKeyDto } from '../../dto/api-key.js';
+import { createApiKey } from '../../models/api-key/api-key.js';
 
 /**
  * Get ApiKey by Hashed Key
@@ -18,7 +19,7 @@ import { ApiKeyDto } from '../../dto/api-key.js';
  * @param {DynamoClient} dynamoClient
  * @param {Object} config
  * @param {Logger} log
- * @returns {Promise<ApiKeyDto>}
+ * @returns {Promise<ApiKey>}
  */
 export const getApiKeyByHashedApiKey = async (hashedApiKey, dynamoClient, log, config) => {
   const items = await dynamoClient.query({
@@ -42,10 +43,68 @@ export const getApiKeyByHashedApiKey = async (hashedApiKey, dynamoClient, log, c
  * @param {DynamoClient} dynamoClient
  * @param {Object} config
  * @param {Logger} log
- * @returns {Promise<ApiKeyDto>}
+ * @returns {Promise<ApiKey>}
  */
 export const createNewApiKey = async (apiKey, dynamoClient, config, log) => {
-  const item = ApiKeyDto.toDynamoItem(apiKey);
-  await dynamoClient.putItem(config.tableNameApiKeys, item, log);
+  const item = createApiKey(apiKey);
+  await dynamoClient.putItem(config.tableNameApiKeys, ApiKeyDto.toDynamoItem(item), log);
   return item;
 };
+
+/**
+ * Get ApiKeys by IMS User ID and IMS Org ID
+ * @param imsUserId
+ * @param imsOrgId
+ * @param dynamoClient
+ * @param config
+ * @returns {Promise<ApiKey[]>}
+ */
+export const getApiKeysByImsUserIdAndImsOrgId = async (
+  imsUserId,
+  imsOrgId,
+  dynamoClient,
+  config,
+) => {
+  const items = await dynamoClient.query({
+    TableName: config.tableNameApiKeys,
+    IndexName: config.indexNameApiKeyByImsUserIdAndImsOrgId,
+    KeyConditionExpression: '#imsUserId = :imsUserId AND #imsOrgId = :imsOrgId',
+    ExpressionAttributeNames: {
+      '#imsUserId': 'imsUserId',
+      '#imsOrgId': 'imsOrgId',
+    },
+    ExpressionAttributeValues: {
+      ':imsUserId': imsUserId,
+      ':imsOrgId': imsOrgId,
+    },
+  });
+  return items.map((item) => ApiKeyDto.fromDynamoItem(item));
+};
+
+/**
+ * Get ApiKey by ID
+ * @param id
+ * @param dynamoClient
+ * @param config
+ * @returns {Promise<ApiKey|null>}
+ */
+export const getApiKeyById = async (id, dynamoClient, config) => {
+  const item = await dynamoClient.getItem(config.tableNameApiKeys, { id });
+  return item ? ApiKeyDto.fromDynamoItem(item) : null;
+};
+
+/**
+ * Update ApiKey
+ * @param apiKey
+ * @param dynamoClient
+ * @param config
+ * @returns {Promise<ApiKey>}
+ */
+export const updateApiKey = async (apiKey, dynamoClient, config) => {
+  const existingApiKey = await getApiKeyById(apiKey.getId(), dynamoClient, config);
+  if (!existingApiKey) {
+    throw new Error(`API Key with id ${apiKey.getId()} not found`);
+  }
+  await dynamoClient.putItem(config.tableNameApiKeys, ApiKeyDto.toDynamoItem(apiKey));
+  return apiKey;
+};

package/src/service/api-key/index.js

@@ -10,7 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import { createNewApiKey, getApiKeyByHashedApiKey } from './accessPatterns.js';
+import {
+  createNewApiKey,
+  getApiKeyByHashedApiKey,
+  getApiKeyById,
+  getApiKeysByImsUserIdAndImsOrgId,
+  updateApiKey,
+} from './accessPatterns.js';
 
 export const apiKeyFunctions = (dynamoClient, config, log) => ({
   getApiKeyByHashedApiKey: (hashedApiKey) => getApiKeyByHashedApiKey(
@@ -20,4 +26,12 @@ export const apiKeyFunctions = (dynamoClient, config, log) => ({
     config,
   ),
   createNewApiKey: (apiKey) => createNewApiKey(apiKey, dynamoClient, config, log),
+  getApiKeysByImsUserIdAndImsOrgId: (imsUserId, imsOrgId) => getApiKeysByImsUserIdAndImsOrgId(
+    imsUserId,
+    imsOrgId,
+    dynamoClient,
+    config,
+  ),
+  getApiKeyById: (id) => getApiKeyById(id, dynamoClient, config),
+  updateApiKey: (apiKey) => updateApiKey(apiKey, dynamoClient, config),
 });