Update Cookie Expiry Logic

package-shared/utils/backend/export-mariadb-database.ts

@@ -26,7 +26,7 @@ export default function exportMariadbDatabase({
     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: ExecSyncOptions = {
         encoding: "utf-8",

package-shared/utils/backend/import-mariadb-database.ts

@@ -32,7 +32,7 @@ export default async function importMariadbDatabase({
         `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: ExecSyncOptions = {
         encoding: "utf-8",

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

@@ -73,7 +73,13 @@ export default function grabDirNames(param?: Param) {
 
     const dockerComposeFile = path.join(appDir, "docker-compose.yml");
     const testDockerComposeFile = path.join(appDir, "test.docker-compose.yml");
+    const extraDockerComposeFile = path.join(
+        appDir,
+        "extra.docker-compose.yml"
+    );
+
     const siteSetupFile = path.join(appDir, "site-setup.json");
+
     const envFile = path.join(appDir, ".env");
     const testEnvFile = path.join(appDir, "test.env");
 
@@ -99,6 +105,7 @@ export default function grabDirNames(param?: Param) {
         dbNginxLoadBalancerConfigFile,
         dockerComposeFile,
         testDockerComposeFile,
+        extraDockerComposeFile,
         siteSetupFile,
         envFile,
         testEnvFile,

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

@@ -0,0 +1,18 @@
+import numberfy from "./numberfy";
+
+export default 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
+        ? numberfy(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;
+}