Update Cookie Expiry Logic

dist/package-shared/utils/backend/export-mariadb-database.js

@@ -15,7 +15,7 @@ function exportMariadbDatabase({ dbFullName, targetFilePath, mariadbHost, mariad
     const finalMariadbUser = mariadbUser || process.env.DSQL_DB_USERNAME;
     const finalMariadbHost = mariadbHost || process.env.DSQL_DB_HOST;
     const finalMariadbPass = mariadbPass || process.env.DSQL_DB_PASSWORD;
-    const cmd = `${mysqlDumpPath} -u ${finalMariadbUser} -h ${finalMariadbHost} -p${finalMariadbPass} ${dbFullName} > ${targetFilePath}`;
+    const cmd = `${mysqlDumpPath} -u ${finalMariadbUser} -h ${finalMariadbHost} -p"${finalMariadbPass}" ${dbFullName} > ${targetFilePath}`;
     let execSyncOptions = {
         encoding: "utf-8",
     };

dist/package-shared/utils/backend/import-mariadb-database.js

@@ -27,7 +27,7 @@ function importMariadbDatabase(_a) {
         const finalMariadbHost = mariadbHost || process.env.DSQL_DB_HOST;
         const finalMariadbPass = mariadbPass || process.env.DSQL_DB_PASSWORD;
         yield (0, conn_db_handler_1.default)(global.DSQL_DB_CONN, `CREATE DATABASE IF NOT EXISTS ${dbFullName}`);
-        const cmd = `${mysqlPath} -u ${finalMariadbUser} -h ${finalMariadbHost} -p${finalMariadbPass} ${dbFullName} < ${targetFilePath}`;
+        const cmd = `${mysqlPath} -u ${finalMariadbUser} -h ${finalMariadbHost} -p"${finalMariadbPass}" ${dbFullName} < ${targetFilePath}`;
         let execSyncOptions = {
             encoding: "utf-8",
         };

dist/package-shared/utils/backend/names/grab-dir-names.d.ts

@@ -26,6 +26,7 @@ export default function grabDirNames(param?: Param): {
     dbNginxLoadBalancerConfigFile: string;
     dockerComposeFile: string;
     testDockerComposeFile: string;
+    extraDockerComposeFile: string;
     siteSetupFile: string;
     envFile: string;
     testEnvFile: string;

dist/package-shared/utils/backend/names/grab-dir-names.js

@@ -54,6 +54,7 @@ function grabDirNames(param) {
     const dbNginxLoadBalancerConfigFile = path_1.default.join(appDir, "docker/mariadb/load-balancer/config/template/nginx.conf");
     const dockerComposeFile = path_1.default.join(appDir, "docker-compose.yml");
     const testDockerComposeFile = path_1.default.join(appDir, "test.docker-compose.yml");
+    const extraDockerComposeFile = path_1.default.join(appDir, "extra.docker-compose.yml");
     const siteSetupFile = path_1.default.join(appDir, "site-setup.json");
     const envFile = path_1.default.join(appDir, ".env");
     const testEnvFile = path_1.default.join(appDir, "test.env");
@@ -79,6 +80,7 @@ function grabDirNames(param) {
         dbNginxLoadBalancerConfigFile,
         dockerComposeFile,
         testDockerComposeFile,
+        extraDockerComposeFile,
         siteSetupFile,
         envFile,
         testEnvFile,

dist/package-shared/utils/grab-cookie-expirt-date.d.ts

@@ -0,0 +1 @@
+export default function grabCookieExpiryDate(): string;

dist/package-shared/utils/grab-cookie-expirt-date.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = grabCookieExpiryDate;
+const numberfy_1 = __importDefault(require("./numberfy"));
+function grabCookieExpiryDate() {
+    const ONE_DAY_IN_SECONDS = 60 * 60 * 24;
+    const ONE_WEEK_IN_SECONDS = ONE_DAY_IN_SECONDS * 7;
+    const COOKIE_EXPIRY_TIME_IN_SECONDS = process.env.DSQL_SESSION_EXPIRY_TIME
+        ? (0, numberfy_1.default)(process.env.DSQL_SESSION_EXPIRY_TIME)
+        : ONE_WEEK_IN_SECONDS;
+    const COOKIE_EXPIRY_IN_MILLISECONDS = COOKIE_EXPIRY_TIME_IN_SECONDS * 1000;
+    const COOKIE_EXPIRY_DATE = new Date(Date.now() + COOKIE_EXPIRY_IN_MILLISECONDS).toUTCString();
+    return COOKIE_EXPIRY_DATE;
+}