@docupace/pipeline 1.0.33-matttest.3 → 1.0.34

package/src/auth0/configure.js

@@ -1,28 +1,21 @@
-import fs from 'fs';
+import fs from 'fs-extra';
 import path from 'path';
 import axios from 'axios';
 import crypto from 'crypto';
-import { deploy } from 'auth0-deploy-cli';
-import fl from 'fs/promises';
 
 import {
   cloneEnvRepository,
-  cloneRepository,
   readDeployConfig,
-  pushDeployConfig
+  pushDeployConfig,
+  cloneRepository,
 } from '../next/deploy.js';
 
-import {
-  getVaultSecrets,
-  updateVaultSecrets
-} from './vault.js';
-
+import { getVaultSecrets, updateVaultSecrets } from './vault.js';
 import {
   getVaultSecretsConfigs,
-  environmentConfig
+  environmentConfig,
+  coreSiteEnvMap,
 } from '../next/config.js';
-import { connect } from 'http2';
-import { promise } from 'zod';
 
 async function ensureDirectoryExists(dirPath) {
   try {
@@ -33,359 +26,77 @@ async function ensureDirectoryExists(dirPath) {
   }
 }
 
-async function copyDirectory(source, destination) {
-  try {
-    await fl.mkdir(destination, { recursive: true });
-    const items = await fl.readdir(source, { withFileTypes: true });
-
-    for (const item of items) {
-      const sourcePath = path.join(source, item.name);
-      const destinationPath = path.join(destination, item.name);
-
-      if (item.isDirectory()) {
-        await copyDirectory(sourcePath, destinationPath);
-      } else {
-        await fl.copyFile(sourcePath, destinationPath);
-      }
-    }
-  } catch (err) {
-    console.error(`Error copying directory: ${err.message}`);
-    throw err;
-  }
-}
-
-async function addApplicationToApi ({application, auth0Domain, auth0AuthToken, coreApiIdentifier}){
-  console.log("Adding application to API authorized applications...");
-
+export async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
   try {
-    const auth0Response = await axios.get(`https://${auth0Domain}/api/v2/clients`, {
-      headers: {authorization: `Bearer ${auth0AuthToken}`},
-    });
-
-    const appAuth0ClientIdData = auth0Response.data.find(client => client.name === `${application}`);
-    const appAuth0ClientId = appAuth0ClientIdData.client_id;
-
-    await axios.post(
-          `https://${auth0Domain}/api/v2/client-grants`,
+    const response = await axios.post(
+      `https://${auth0Domain}/oauth/token`,
       {
-        client_id: appAuth0ClientId,
-        audience: `${coreApiIdentifier}`,
-        scope: [],
+        client_id: clientId,
+        client_secret: clientSecret,
+        audience: `https://${auth0Domain}/api/v2/`,
+        grant_type: 'client_credentials',
       },
       {
         headers: {
-          Authorization: `Bearer ${auth0AuthToken}`,
-          "Content-Type": "application/json",
+          'Content-Type': 'application/json',
         },
-      }
-    );
-    console.log(`Application (${appAuth0ClientId}) authorized for API: ${coreApiIdentifier}`);
-  } catch (err) {
-    console.error(`Failed to add application: ${application}: ${err.message}`);
-  }
-
-}
-
-async function initializeAuth0Configuration({
-                                              initConfiguration,
-                                              auth0Domain,
-                                              auth0AuthToken,
-                                              coreApiIdentifier,
-                                            }) {
-  if (initConfiguration === "true") {
-    try {
-      // Create a new resource server in Auth0
-      console.log("Creating resource server in Auth0...");
-
-      const resourceServerResponse = await axios.post(
-        `https://${auth0Domain}/api/v2/resource-servers`,
-        {
-          name: "docupace-core",
-          identifier: `${coreApiIdentifier}`,
-          token_lifetime: 86400,
-          allow_offline_access: false,
-          signing_alg: "RS256",
-          skip_consent_for_verifiable_first_party_clients: true,
-          scopes: [],
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${auth0AuthToken}`,
-            "Content-Type": "application/json",
-          },
-        }
-      );
-
-      const apiId = resourceServerResponse.data.id;
-
-      // Update tenant settings with the default audience
-      console.log("Updating tenant settings...");
-      await axios.patch(
-        `https://${auth0Domain}/api/v2/tenants/settings`,
-        {
-          default_audience: `${coreApiIdentifier}`,
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${auth0AuthToken}`,
-            "Content-Type": "application/json",
-          },
-        }
-      );
-      console.log("Tenant settings updated successfully.");
-    } catch (error) {
-      console.error("Error during Auth0 configuration:", error.response?.data || error.message);
-    }
-  }
-}
-
-async function importAuth0Templates(directoryPath, auth0Domain, auth0ClientID, auth0ClientSecret) {
-  try {
-    const config = {
-      input_file: directoryPath,
-      config: {
-        AUTH0_DOMAIN: auth0Domain,
-        AUTH0_CLIENT_ID: auth0ClientID,
-        AUTH0_CLIENT_SECRET: auth0ClientSecret,
-      },
-      debug: true,
-    };
-
-    console.log('Starting Auth0 template import...');
-    await deploy(config);
-    console.log('Auth0 template import completed successfully!');
-  } catch (error) {
-    console.error('Error during Auth0 template import:', error.message);
-    process.exit(1); // Exit with an error code
-  }
-}
-
-async function updateJsonFile(filePath, updates) {
-  const content = await fs.promises.readFile(filePath, 'utf8');
-  const jsonContent = JSON.parse(content);
-  const updatedContent = JSON.stringify({...jsonContent, ...updates}, null, 2);
-  await fs.promises.writeFile(filePath, updatedContent);
-}
-
-async function replaceInFile(filePath, replacements) {
-  let content = await fs.promises.readFile(filePath, 'utf8');
-
-  for (const [search, replace] of replacements) {
-    const escapedSearch = search.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); // Escape special chars
-    content = content.replace(new RegExp(escapedSearch, 'g'), replace);
-  }
-  await fs.promises.writeFile(filePath, content, 'utf8');
-}
-
-async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI, deployGraphQLServer, commonSecrets, configureMFA) {
-  try {
-    let uiAllowedCallbacksUrls,
-      uiAllowedLogoutUrls;
-    let graphqlAllowedCallbacksUrls,
-      graphqlAllowedLogoutUrls;
-    let connectAllowedCallbacksUrls,
-      connectlAllowedLogoutUrls;
-
-    let connectClientMetadata,
-        connectCallbacks,
-        connectAddons;
-    // Configure URLs based on environment
-    if (env === 'prd') {
-      uiAllowedCallbacksUrls = [`${siteUrl}/api/auth/callback`];
-      uiAllowedLogoutUrls = [`${siteUrl}`];
-
-      graphqlAllowedCallbacksUrls = [`${siteUrl}/api/graphql/callback`];
-      graphqlAllowedLogoutUrls = [`${siteUrl}/api/graphql/`];
-
-      connectAllowedCallbacksUrls = [`${siteUrl}/connect/samlCallback?client_name=auth0`];
-      connectlAllowedLogoutUrls = [ `${siteUrl}/connect`];
-    } else {
-      uiAllowedCallbacksUrls = [
-        `${siteUrl}/api/auth/callback`,
-        `http://localhost:3000/api/auth/callback`,
-      ];
-      uiAllowedLogoutUrls = [
-        `${siteUrl}`,
-        `http://localhost:3000`,
-      ];
-      graphqlAllowedCallbacksUrls = [
-        `${siteUrl}/api/graphql/callback`,
-        `http://localhost:4000/api/graphql/callback`,
-      ];
-      graphqlAllowedLogoutUrls = [
-        `http://localhost:4000/api/graphql/`,
-        `${siteUrl}/api/graphql/`,
-      ];
-      connectAllowedCallbacksUrls = [
-        `${siteUrl}/connect/samlCallback?client_name=auth0`,
-        `http://localhost:9000/connect/samlCallback?client_name=auth0`,
-      ];
-      connectlAllowedLogoutUrls = [
-        `${siteUrl}/connect`
-      ];
-
-      const siteUrlNoPrefix=siteUrl.replace(/^https?:\/\//, '');
-      connectClientMetadata ={
-        "docupaceContext" : "core",
-        "docupaceHost" : `${siteUrlNoPrefix}`,
-        "docupace_context" : "core",
-        "docupace_host" : `${siteUrlNoPrefix}  `
-      };
-
-      connectCallbacks = [
-        `${siteUrl}/connect/samlCallback?client_name=auth0`
-      ];
-
-      connectAddons = {
-        "samlp": {
-          "audience": `${siteUrl}/connect`,
-          "recipient": `${siteUrl}/connect/samlCallback?client_name=auth0`,
-          "destination": `${siteUrl}/connect/samlCallback?client_name=auth0`,
-          "nameIdentifierFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
-          "binding": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST",
-          "nameIdentifierProbes": [
-            "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/docupace-username"
-          ],
-          "mappings": {
-            "proposalHandle": "ProposalHandle"
-          }
-        }
-      };
-
-    }
-
-
-    const configureUI = deployUI === 'true';
-    if (configureUI) {
-      console.log('ui_allowed_callbacks_urls ->', uiAllowedCallbacksUrls);
-      console.log('ui_allowed_logout_urls ->', uiAllowedLogoutUrls);
-
-      await updateJsonFile(filePaths.uiJson, {
-        callbacks: uiAllowedCallbacksUrls,
-        allowed_logout_urls: uiAllowedLogoutUrls,
-      });
-
-
-      //TODO: move to separate function for connect
-      console.log('connect_allowed_callbacks_urls ->', connectAllowedCallbacksUrls);
-      console.log('connect_allowed_logout_urls ->', connectlAllowedLogoutUrls);
-
-      // update allowed callback url
-      await updateJsonFile(filePaths.connectJson, {
-        callbacks: connectAllowedCallbacksUrls,
-        allowed_logout_urls: connectlAllowedLogoutUrls,
-        client_metadata: connectClientMetadata,
-        addons: connectAddons
-      });
-
-
-
-      console.log('Updated URLs for main UI...');
-    } else {
-      await fs.promises.unlink(filePaths.uiJson);
-      await updateJsonFile(filePaths.databaseJson, {
-        enabled_clients: (content) => content.enabled_clients.filter((client) => client !== 'docupace-ui-main'),
-      });
-      console.log("Removed 'docupace-ui-main' from enabled_clients in database.json");
-    }
-
-    const configureGraphqlServer = deployGraphQLServer === 'true';
-    if (configureGraphqlServer) {
-      console.log('graphql_allowed_callbacks_urls ->', graphqlAllowedCallbacksUrls);
-      console.log('graphql_allowed_logout_urls ->', graphqlAllowedLogoutUrls);
-
-      await updateJsonFile(filePaths.graphqlJson, {
-        callbacks: graphqlAllowedCallbacksUrls,
-        allowed_logout_urls: graphqlAllowedLogoutUrls,
-      });
-      console.log('Updated URLs for GraphQL server...');
-    } else {
-      await fs.promises.unlink(filePaths.graphqlJson);
-      await updateJsonFile(filePaths.databaseJson, {
-        enabled_clients: (content) => content.enabled_clients.filter((client) => client !== 'docupace-graphql'),
-      });
-      console.log("Removed 'docupace-graphql' from enabled_clients in database.json");
-    }
-
-    // TWILIO configuration
-    await replaceInFile(filePaths.twilioJson, [
-      ['twilioauthtokenplaceholder', commonSecrets.TWILIO_AUTH_TOKEN],
-      ['twiliosidplaceholder', commonSecrets.TWILIO_SID],
-      ['twiliofromplaceholder', commonSecrets.TWILIO_FROM_NUMBER],
-    ]);
-
-    console.log('TWILIO configuration updated...');
-
-    const tmpSiteUrl = siteUrl.replace(/^https?:\/\//, '');
-    // Database configuration
-    await replaceInFile(filePaths.databaseLoginJs, [
-      ['${docupaceHost}', tmpSiteUrl],
-      ['${docupaceContext}', coreApiContext],
-    ]);
-
-    console.log('MFA Template configuration started...');
-
-    try {
-      const sourceDir = configureMFA === 'DISABLED' ? 'auth0-site-setup/templateNoMFA/' : 'auth0-site-setup/templateMFA/';
-      const destinationDir = 'auth0-site-setup/template/';
-
-      console.log(`AUTH0 MFA is ${configureMFA === 'DISABLED' ? 'disabled' : 'enabled'}`);
-      await copyDirectory(sourceDir, destinationDir);
-
-      console.log('MFA configuration completed.');
-    } catch (err) {
-      console.error('Error configuring MFA:', err);
-      throw err;
-    }
-
-    console.log('Template configuration completed.');
-  } catch (err) {
-    // console.error('Error configuring Auth0 templates:', err);
-    throw err;
-  }
-}
-
-export async function getAuth0AuthToken(auth0Domain, clientId, clientSecret) {
-  try {
-    const response = await axios.post(`https://${auth0Domain}/oauth/token`, {
-      client_id: clientId,
-      client_secret: clientSecret,
-      audience: `https://${auth0Domain}/api/v2/`,
-      grant_type: 'client_credentials',
-    }, {
-      headers: {
-        'Content-Type': 'application/json',
       },
-    });
+    );
 
     const authToken = response.data.access_token;
     // console.log("Auth0 Auth Token:", authToken);
     return authToken;
   } catch (error) {
-    console.error("Error fetching Auth0 token:", error.response ? error.response.data : error.message);
+    console.error(
+      'Error fetching Auth0 token:',
+      error.response ? error.response.data : error.message,
+    );
   }
 }
 
-async function configureUI(siteHost, coreURL, docupaceHost, site, env, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, vaultSiteSecretsPath, imageTag, repoPath) {
-  console.log(`Configuring UI for site: ${site} Host: ${siteHost} in env: ${env}`);
+async function configureUI(
+  siteHost,
+  coreURL,
+  docupaceHost,
+  site,
+  env,
+  auth0Domain,
+  auth0ClientId,
+  auth0ClientSecret,
+  auth0Token,
+  vaultSiteSecretsPath,
+  imageTag,
+  repoPath,
+  useS3,
+) {
+  console.log(
+    `Configuring UI for site: ${site} Host: ${siteHost} in env: ${env}`,
+  );
   siteHost = siteHost.replace('https://', '');
   coreURL = coreURL.replace('https://', '');
 
-
   try {
-    const auth0Response = await axios.get(`https://${auth0Domain}/api/v2/clients`, {
-      headers: {authorization: `Bearer ${auth0Token}`},
-    });
+    const auth0Response = await axios.get(
+      `https://${auth0Domain}/api/v2/clients`,
+      {
+        headers: { authorization: `Bearer ${auth0Token}` },
+      },
+    );
 
-    const uiClient = auth0Response.data.find(client => client.name === "docupace-ui-main");
+    const uiClient = auth0Response.data.find(
+      (client) => client.name === 'docupace-ui-main',
+    );
     const uiAuth0ClientId = uiClient.client_id;
     const uiAuth0ClientSecret = uiClient.client_secret;
 
     // Generate Auth0 Secret
-    const uiAuth0Secret = crypto.randomBytes(48).toString('base64').replace(/[^a-zA-Z0-9]/g, '');
+    const uiAuth0Secret = crypto
+      .randomBytes(48)
+      .toString('base64')
+      .replace(/[^a-zA-Z0-9]/g, '');
 
     // Prepare data payload
-    console.log("Preparing Vault UI data payload...");
+    console.log('Preparing Vault UI data payload...');
     const uiSecretData = JSON.stringify({
       data: {
         AUTH0_CLIENT_ID: uiAuth0ClientId,
@@ -415,9 +126,28 @@ uiMain:
   env:
     AUTH0_CLIENT_SECRET: vault:secret/data/${site}/ui/config#AUTH0_CLIENT_SECRET
     AUTH0_SECRET: vault:secret/data/${site}/ui/config#AUTH0_SECRET
+    ${
+      useS3 === true || useS3 === 'true'
+        ? `
+    AWS_ACCESS_KEY_ID: vault:secret/data/${site}/aws/config#AWS_ACCESS_KEY_ID
+    AWS_BUCKET_NAME: vault:secret/data/${site}/aws/config#AWS_BUCKET_NAME
+    AWS_SECRET_ACCESS_KEY: vault:secret/data/${site}/aws/config#AWS_SECRET_ACCESS_KEY
+    `.trim()
+        : ''
+    }
 image:
   repository: registry.paperout.com/docupace-ui-main-dev-docker-local/docupace-ui-main
   tag: ${imageTag}
+${
+  useS3 === true || useS3 === 'true'
+    ? `
+serviceAccount:
+  create: true
+  annotations:
+    eks.amazonaws.com/role-arn: arn:aws:iam::902873770924:role/eks-pod-identity-connect-next-${env}-${site}-bucket
+`.trim()
+    : ''
+}
 imagePullSecrets:
   - name: jf-artifactory
 ingress:
@@ -438,7 +168,7 @@ ingress:
         - ${siteHost}
       secretName: dp-next-ui-cert
 externalConnectIngress:
-  enabled: ${useNewDomain}
+  enabled: true
   className: nginx
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
@@ -467,57 +197,154 @@ externalConnectIngress:
         - ${siteHost}
       secretName: dp-next-ui-cert
 externalConnectService:
-  enabled: ${useNewDomain}
+  enabled: true
   name: external-connect
   domain: ${docupaceHost}
 `.trim();
 
-    // Write configuration files
-    console.log("Writing configuration files...");
+    console.log('Writing configuration files...');
     await ensureDirectoryExists(path.resolve(`${repoPath}/dp/${site}`));
 
-    await fs.writeFile(`${repoPath}/dp/${site}/ui.app.yaml`, uiAppYaml, (err) => {
-      if (err) {
-        console.error("Failed to write the file:", err);
-      } else {
-        console.log("File written successfully.");
-      }
-    });
+    await fs.writeFile(
+      `${repoPath}/dp/${site}/ui.app.yaml`,
+      uiAppYaml,
+      (err) => {
+        if (err) {
+          console.error('Failed to write the file:', err);
+        } else {
+          console.log('File written successfully.');
+        }
+      },
+    );
 
-    await fs.writeFile(`${repoPath}/dp/${site}/ui.values.yaml`, uiValuesYaml, (err) => {
-      if (err) {
-        console.error("Failed to write the file:", err);
-      } else {
-        console.log("File written successfully.");
-      }
-    });
-    console.log("Done!");
+    await fs.writeFile(
+      `${repoPath}/dp/${site}/ui.values.yaml`,
+      uiValuesYaml,
+      (err) => {
+        if (err) {
+          console.error('Failed to write the file:', err);
+        } else {
+          console.log('File written successfully.');
+        }
+      },
+    );
+    console.log('Done!');
+    console.log('Updating Core Site Config...');
+    await updateCoreSiteConfig(site, env, useS3);
+  } catch (error) {
+    console.error('Error configuring UI:', error);
+  }
+}
+
+export async function cleanAndWritePropertiesFile(configPath, content) {
+  try {
+    const cleanedContent = content
+      .split('\n')
+      .map((line) => line.trim())
+      .filter((line) => line !== '')
+      .join('\n');
+
+    await fs.writeFile(configPath, cleanedContent, 'utf8');
+    console.log(`Cleaned and written file to: ${configPath}`);
+  } catch (error) {
+    console.error('Error writing properties file:', error.message);
+    process.exit(1);
+  }
+}
+
+export async function updateCoreSiteConfig(site, env, useS3) {
+  try {
+    const coreSiteEnv = coreSiteEnvMap[env];
+
+    const coreSiteConfigRepoPath = await cloneRepository(
+      `${coreSiteEnv}-site-settings`,
+    );
+
+    const configPath = path.join(
+      `${coreSiteEnv}-site-settings`,
+      site.toUpperCase(),
+      'docucore-nextUI.properties',
+    );
+
+    let siteAWSSecrets = null;
+
+    if (useS3 === true || useS3 === 'true') {
+      const siteAWSSecretsPath = getVaultSecretsConfigs(site).awsSecretsPath;
+      siteAWSSecrets = await getVaultSecrets(siteAWSSecretsPath);
+      console.log(`siteAWSSecretsPath => ${siteAWSSecretsPath}`);
+    }
+
+    const coreSiteConfig = `
+        ${
+          siteAWSSecrets
+            ? `
+com.docupace.imports.files.FilesImportConfig.aws.accessKeyId=${siteAWSSecrets.AWS_ACCESS_KEY_ID}
+com.docupace.imports.files.FilesImportConfig.aws.accessKeySecret=${siteAWSSecrets.AWS_SECRET_ACCESS_KEY}
+com.docupace.imports.files.FilesImportConfig.aws.region=${siteAWSSecrets.AWS_REGION}
+`.trim()
+            : ''
+        }
+`;
+
+    await fs.ensureDir(path.join(coreSiteConfigRepoPath, site.toUpperCase()));
+    await cleanAndWritePropertiesFile(configPath, coreSiteConfig);
+    await pushDeployConfig(
+      coreSiteConfigRepoPath,
+      `Core config: docucore-nextUI.properties for site: (${site.toUpperCase()}) update in env: (${env})`,
+    );
   } catch (error) {
-    console.error("Error configuring UI:", error);
+    console.error('Error:', error.message);
+    process.exit(1);
   }
 }
 
-async function configureGraphQLServer(siteHost, coreURL, docupaceHost, site, env, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, vaultSiteSecretsPath, imageTag, standardConfigRemoteBranch, repoPath, commonSecrets) {
+async function configureGraphQLServer(
+  siteHost,
+  coreURL,
+  docupaceHost,
+  site,
+  env,
+  auth0Domain,
+  auth0ClientId,
+  auth0ClientSecret,
+  auth0Token,
+  vaultSiteSecretsPath,
+  imageTag,
+  standardConfigRemoteBranch,
+  repoPath,
+  commonSecrets,
+) {
   siteHost = siteHost.replace('https://', '');
   coreURL = coreURL.replace('https://', '');
-  console.log(`Configuring GraphQL Server for site: ${site} Host: ${siteHost} in env: ${env}`);
+  console.log(
+    `Configuring GraphQL Server for site: ${site} Host: ${siteHost} in env: ${env}`,
+  );
 
   try {
-    const auth0Response = await axios.get(`https://${auth0Domain}/api/v2/clients`, {
-      headers: {authorization: `Bearer ${auth0Token}`},
-    });
+    const auth0Response = await axios.get(
+      `https://${auth0Domain}/api/v2/clients`,
+      {
+        headers: { authorization: `Bearer ${auth0Token}` },
+      },
+    );
 
-    const graphQLServerClient = auth0Response.data.find(client => client.name === "docupace-graphql");
-    const graphQLServerClientCredentials = auth0Response.data.find(client => client.name === "docupace-graphql-client-credentials");
+    const graphQLServerClient = auth0Response.data.find(
+      (client) => client.name === 'docupace-graphql',
+    );
+    const graphQLServerClientCredentials = auth0Response.data.find(
+      (client) => client.name === 'docupace-graphql-client-credentials',
+    );
 
     const graphQLServerAuth0ClientId = graphQLServerClient.client_id;
     const graphQLServerAuth0ClientSecret = graphQLServerClient.client_secret;
 
-    const graphQLServerCCAuth0ClientId = graphQLServerClientCredentials.client_id;
-    const graphQLServerCCAuth0ClientSecret = graphQLServerClientCredentials.client_secret;
+    const graphQLServerCCAuth0ClientId =
+      graphQLServerClientCredentials.client_id;
+    const graphQLServerCCAuth0ClientSecret =
+      graphQLServerClientCredentials.client_secret;
 
     // Prepare data payload
-    console.log("Preparing Vault GraphQL Server data payload...");
+    console.log('Preparing Vault GraphQL Server data payload...');
     const graphQLServerSecretData = JSON.stringify({
       data: {
         AUTH0_CLIENT_ID: graphQLServerAuth0ClientId,
@@ -580,105 +407,129 @@ ingress:
 `.trim();
 
     // Write configuration files
-    console.log("Writing ArgoCD GraphQL Server configuration files...");
+    console.log('Writing ArgoCD GraphQL Server configuration files...');
     await ensureDirectoryExists(path.resolve(`${repoPath}/dp/${site}`));
 
-    await fs.writeFile(`${repoPath}/dp/${site}/graphql-server.app.yaml`, graphQLServerAppYaml, (err) => {
-      if (err) {
-        console.error("Failed to write the file:", err);
-      } else {
-        console.log("File written successfully.");
-      }
-    });
+    await fs.writeFile(
+      `${repoPath}/dp/${site}/graphql-server.app.yaml`,
+      graphQLServerAppYaml,
+      (err) => {
+        if (err) {
+          console.error('Failed to write the file:', err);
+        } else {
+          console.log('File written successfully.');
+        }
+      },
+    );
 
-    await fs.writeFile(`${repoPath}/dp/${site}/graphql-server.values.yaml`, graphQLServerValuesYaml, (err) => {
-      if (err) {
-        console.error("Failed to write the file:", err);
-      } else {
-        console.log("File written successfully.");
-      }
-    });
-    console.log("Done!");
+    await fs.writeFile(
+      `${repoPath}/dp/${site}/graphql-server.values.yaml`,
+      graphQLServerValuesYaml,
+      (err) => {
+        if (err) {
+          console.error('Failed to write the file:', err);
+        } else {
+          console.log('File written successfully.');
+        }
+      },
+    );
+    console.log('Done!');
   } catch (error) {
-    console.error("Error configuring GraphQL Server:", error);
+    console.error('Error configuring GraphQL Server:', error);
   }
 }
 
-
-export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployUI, deployGraphQLServer, useNewDomain, configureMFA) {
-  console.log(`Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`);
+export async function configureFromSite(
+  fromSite,
+  toSite,
+  fromEnv,
+  toEnv,
+  deployUI,
+  deployGraphQLServer,
+  useNewDomain,
+  useS3,
+) {
+  console.log(
+    `Configuring Auth0 tenants and ArgoCD apps for site: ${toSite} in env: ${toEnv} from site: ${fromSite}`,
+  );
   // Common Secrets
   const commonSecretsPath = getVaultSecretsConfigs(toSite).commonSecretsPath;
-  console.log(`commonSecretsPath => ${commonSecretsPath}`)
+  console.log(`commonSecretsPath => ${commonSecretsPath}`);
   const commonSecrets = await getVaultSecrets(commonSecretsPath);
 
   // Site Common Secrets
-  const siteCommonSecretsPath = getVaultSecretsConfigs(toSite).siteCommonSecretsPath;
-  console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`)
+  const siteCommonSecretsPath =
+    getVaultSecretsConfigs(toSite).siteCommonSecretsPath;
+  console.log(`siteCommonSecretsPath => ${siteCommonSecretsPath}`);
   const siteCommonSecrets = await getVaultSecrets(siteCommonSecretsPath);
 
-  const auth0Domain = `docupace-${toEnv}-${toSite}.us.auth0.com`
+  const auth0Domain = `docupace-${toEnv}-${toSite}.us.auth0.com`;
   const auth0ClientId = siteCommonSecrets.AUTH0_CLIENT_ID;
   const auth0ClientSecret = siteCommonSecrets.AUTH0_CLIENT_SECRET;
-  const auth0Token = await getAuth0AuthToken(auth0Domain, auth0ClientId, auth0ClientSecret);
+  const auth0Token = await getAuth0AuthToken(
+    auth0Domain,
+    auth0ClientId,
+    auth0ClientSecret,
+  );
 
   // UI app
   const uiSecretsPath = getVaultSecretsConfigs(toSite).uiSecretsPath;
-  console.log(`uiSecretsPath => ${uiSecretsPath}`)
+  console.log(`uiSecretsPath => ${uiSecretsPath}`);
 
   // GraphQL-Server app
-  const graphqlSecretsPath = getVaultSecretsConfigs(toSite).graphqlServerSecretsPath;
+  const graphqlSecretsPath =
+    getVaultSecretsConfigs(toSite).graphqlServerSecretsPath;
   console.log(`graphqlSecretsPath => ${graphqlSecretsPath}`);
 
-  let repoPathFromEnv ="";
-  let repoPathToEnv = "";
+  let repoPathFromEnv = '';
+  let repoPathToEnv = '';
   // Clone repositories
-  if ( fromEnv == toEnv ) {
-     repoPathFromEnv = await cloneEnvRepository(fromEnv);
-     repoPathToEnv = repoPathFromEnv;
-  }else {
-     repoPathFromEnv = await cloneEnvRepository(fromEnv);
-     repoPathToEnv = await cloneEnvRepository(toEnv);
+  if (fromEnv === toEnv) {
+    repoPathFromEnv = await cloneEnvRepository(fromEnv);
+    repoPathToEnv = repoPathFromEnv;
+  } else {
+    repoPathFromEnv = await cloneEnvRepository(fromEnv);
+    repoPathToEnv = await cloneEnvRepository(toEnv);
   }
 
   //TODO: clone fromEnv and toEnv. replace above with this
 
-  const auth0RepoPath = await cloneRepository('auth0-site-setup');
+  // const auth0RepoPath = await cloneRepository('auth0-site-setup');
 
   // Read deploy configs
-  const { deployConfig: deployUIConfig } = await readDeployConfig('ui', fromEnv, fromSite, 'values');
+  const { deployConfig: deployUIConfig } = await readDeployConfig(
+    'ui',
+    fromEnv,
+    fromSite,
+    'values',
+  );
   const uiImageTag = deployUIConfig.image.tag;
 
-  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig('graphql-server', fromEnv, fromSite, 'values');
+  const { deployConfig: deployGraphQLServerConfig } = await readDeployConfig(
+    'graphql-server',
+    fromEnv,
+    fromSite,
+    'values',
+  );
   const graphqlImageTag = deployGraphQLServerConfig.image.tag;
-  const graphqlStandardConfigRemoteBranch = deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
-
-  // File paths
-  const filePaths = {
-    databaseLoginJs: './auth0-site-setup/template/database-connections/docupace/login.js',
-    loginHtml: './auth0-site-setup/template/pages/login.html',
-    graphqlJson: './auth0-site-setup/template/clients/docupace-graphql.json',
-    uiJson: './auth0-site-setup/template/clients/docupace-ui-main.json',
-    connectJson: './auth0-site-setup/template/clients/docupace-connect.json',
-    databaseJson: './auth0-site-setup/template/database-connections/docupace/database.json',
-    twilioJson: './auth0-site-setup/template/guardian/providers/sms-twilio.json',
-  };
-
-  console.log(`Copying Latest UI Image Tag: ${deployUIConfig.image.tag} from site: ${fromSite} to site: ${toSite}`);
-  console.log(`Copying Latest GraphQL Server Image Tag: ${deployGraphQLServerConfig.image.tag} from site: ${fromSite} to site: ${toSite}`);
+  const graphqlStandardConfigRemoteBranch =
+    deployGraphQLServerConfig.graphqlServer.standardConfigRemoteBranch;
+
+  console.log(
+    `Copying Latest UI Image Tag: ${deployUIConfig.image.tag} from site: ${fromSite} to site: ${toSite}`,
+  );
+  console.log(
+    `Copying Latest GraphQL Server Image Tag: ${deployGraphQLServerConfig.image.tag} from site: ${fromSite} to site: ${toSite}`,
+  );
 
   const envConfig = environmentConfig[toEnv];
 
-  let CORE_URL,
-    SITE_HOST,
-    CORE_API_CONTEXT,
-    CONNECT_URL,
-    DOCUPACE_HOST;
+  let CORE_URL, SITE_HOST, CORE_API_CONTEXT, CONNECT_URL, DOCUPACE_HOST;
   if (useNewDomain) {
     const newUrl = envConfig.newUrl(toSite);
     CORE_URL = `${newUrl}/core`;
     SITE_HOST = newUrl;
-    CORE_API_CONTEXT = "core";
+    CORE_API_CONTEXT = 'core';
     CONNECT_URL = `${newUrl}/connect`;
     DOCUPACE_HOST = envConfig.docupaceHost();
   } else {
@@ -689,27 +540,42 @@ export async function configureFromSite(fromSite, toSite, fromEnv,toEnv, deployU
     CONNECT_URL = `${oldUrl}_ui`;
   }
 
-  await templateAuth0(SITE_HOST, CORE_API_CONTEXT, toEnv, filePaths, deployUI, deployGraphQLServer, commonSecrets, configureMFA);
-  await importAuth0Templates('./auth0-site-setup/template', auth0Domain, auth0ClientId, auth0ClientSecret);
-
-  if (deployUI === 'true') {
-    await configureUI(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, toEnv, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, uiSecretsPath, uiImageTag, repoPathToEnv);
+  if (deployUI === true || deployUI === 'true') {
+    await configureUI(
+      SITE_HOST,
+      CORE_URL,
+      DOCUPACE_HOST,
+      toSite,
+      toEnv,
+      auth0Domain,
+      auth0ClientId,
+      auth0ClientSecret,
+      auth0Token,
+      uiSecretsPath,
+      uiImageTag,
+      repoPathToEnv,
+      useS3,
+    );
   }
 
-  await configureGraphQLServer(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, toEnv, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, graphqlSecretsPath, graphqlImageTag, graphqlStandardConfigRemoteBranch, repoPathToEnv, commonSecrets);
-  await pushDeployConfig(repoPathToEnv, `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`);
-
-  await initializeAuth0Configuration({
-    initConfiguration: "true",
-    auth0Domain: auth0Domain,
-    auth0AuthToken: auth0Token,
-    coreApiIdentifier: commonSecrets.CORE_API_IDENTIFIER,
-  });
-
-  await addApplicationToApi({
-    application: 'docupace-graphql-client-credentials',
-    auth0Domain: auth0Domain,
-    auth0AuthToken: auth0Token,
-    coreApiIdentifier: commonSecrets.CORE_API_IDENTIFIER
-  })
+  await configureGraphQLServer(
+    SITE_HOST,
+    CORE_URL,
+    DOCUPACE_HOST,
+    toSite,
+    toEnv,
+    auth0Domain,
+    auth0ClientId,
+    auth0ClientSecret,
+    auth0Token,
+    graphqlSecretsPath,
+    graphqlImageTag,
+    graphqlStandardConfigRemoteBranch,
+    repoPathToEnv,
+    commonSecrets,
+  );
+  await pushDeployConfig(
+    repoPathToEnv,
+    `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`,
+  );
 }