@adobe/spacecat-shared-data-access 1.45.5 → 1.46.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v1.46.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.45.6...@adobe/spacecat-shared-data-access-v1.46.0) (2024-10-02)
+
+
+### Features
+
+* Expire Import URLs automatically after set period of time ([#392](https://github.com/adobe/spacecat-shared/issues/392)) ([294fd9e](https://github.com/adobe/spacecat-shared/commit/294fd9ec112b99a66e7025bed9219fed280eb128))
+
+# [@adobe/spacecat-shared-data-access-v1.45.6](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.45.5...@adobe/spacecat-shared-data-access-v1.45.6) (2024-10-02)
+
+
+### Bug Fixes
+
+* content client should use the hlxConfig ([8e74827](https://github.com/adobe/spacecat-shared/commit/8e74827613421828eaef29cf1372d329433526cc))
+
 # [@adobe/spacecat-shared-data-access-v1.45.5](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.45.4...@adobe/spacecat-shared-data-access-v1.45.5) (2024-09-30)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "1.45.5",
+  "version": "1.46.0",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "engines": {

package/src/dto/audit.js

@@ -13,15 +13,7 @@
 import { isObject } from '@adobe/spacecat-shared-utils';
 
 import { createAudit } from '../models/audit.js';
-
-function parseEpochToDate(epochInSeconds) {
-  const milliseconds = epochInSeconds * 1000;
-  return new Date(milliseconds);
-}
-
-function convertDateToEpochSeconds(date) {
-  return Math.floor(date.getTime() / 1000);
-}
+import { convertDateToEpochSeconds, parseEpochToDate } from './dto-utils.js';
 
 /**
  * Data transfer object for Audit.

package/src/dto/dto-utils.js

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+/**
+ * Parse the given Epoch timestamp, in seconds, to a Date object.
+ * @param {number} epochInSeconds - The Epoch timestamp in seconds.
+ * @returns {Date} A new Date object set to the given timestamp.
+ */
+export function parseEpochToDate(epochInSeconds) {
+  const milliseconds = epochInSeconds * 1000;
+  return new Date(milliseconds);
+}
+
+/**
+ * Convert the given Date object to an Epoch timestamp, in seconds.
+ * @param {Date} date - The Date object to convert.
+ * @returns {number} The Epoch timestamp in seconds.
+ */
+export function convertDateToEpochSeconds(date) {
+  return Math.floor(date.getTime() / 1000);
+}

package/src/dto/import-url.js

@@ -11,6 +11,7 @@
  */
 
 import { createImportUrl } from '../models/importer/import-url.js';
+import { convertDateToEpochSeconds, parseEpochToDate } from './dto-utils.js';
 
 /**
  * The ImportUrlDto is a helper that can convert an ImportUrl object to a DynamoDB item and
@@ -30,6 +31,7 @@ export const ImportUrlDto = {
     reason: importUrl.getReason(),
     path: importUrl.getPath(),
     file: importUrl.getFile(),
+    expiresAt: convertDateToEpochSeconds(importUrl.getExpiresAt()),
   }),
 
   /**
@@ -46,6 +48,7 @@ export const ImportUrlDto = {
       reason: dynamoItem.reason,
       path: dynamoItem.path,
       file: dynamoItem.file,
+      expiresAt: parseEpochToDate(dynamoItem.expiresAt),
     };
     return createImportUrl(importUrlData);
   },

package/src/models/importer/import-url.js

@@ -14,6 +14,8 @@ import { hasText, isValidUrl } from '@adobe/spacecat-shared-utils';
 import { Base } from '../base.js';
 import { ImportUrlStatus } from './import-constants.js';
 
+export const IMPORT_URL_EXPIRES_IN_DAYS = 30;
+
 /**
  * Creates a new ImportUrl object
  *
@@ -31,6 +33,8 @@ const ImportUrl = (data) => {
   self.getPath = () => self.state.path;
   // Resulting path and filename of the imported .docx file
   self.getFile = () => self.state.file;
+  // Expiration date for the URL
+  self.getExpiresAt = () => self.state.expiresAt;
 
   /**
    * Updates the state of the ImportJob.
@@ -102,5 +106,10 @@ export const createImportUrl = (data) => {
     throw new Error(`Invalid Import URL status: ${newState.status}`);
   }
 
+  if (!newState.expiresAt) {
+    newState.expiresAt = new Date();
+    newState.expiresAt.setDate(newState.expiresAt.getDate() + IMPORT_URL_EXPIRES_IN_DAYS);
+  }
+
   return ImportUrl(newState);
 };

package/src/models/site/config.js

@@ -60,7 +60,6 @@ export const Config = (data = {}) => {
   self.getSlackMentions = (type) => state?.handlers[type]?.mentions?.slack;
   self.getHandlerConfig = (type) => state?.handlers[type];
   self.getHandlers = () => state.handlers;
-  self.getHlxContentConfig = () => state.content;
   self.getImports = () => state.imports;
   self.getExcludedURLs = (type) => state?.handlers[type]?.excludedURLs;
   self.getManualOverwrites = (type) => state?.handlers[type]?.manualOverwrites;
@@ -75,13 +74,6 @@ export const Config = (data = {}) => {
     };
   };
 
-  self.updateHlxContentConfig = (source, path) => {
-    state.content = {
-      source,
-      path,
-    };
-  };
-
   self.updateImports = (imports) => {
     state.imports = imports;
   };
@@ -118,7 +110,6 @@ Config.fromDynamoItem = (dynamoItem) => Config(dynamoItem);
 
 Config.toDynamoItem = (config) => ({
   slack: config.getSlackConfig(),
-  content: config.getHlxContentConfig(),
   handlers: config.getHandlers(),
   imports: config.getImports(),
 });