@docupace/pipeline 1.0.7-alpha.8 → 1.0.7-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.7-alpha.8",
+  "version": "1.0.7-alpha.9",
   "description": "",
   "main": "index.js",
   "type": "module",

package/src/auth0/cli.js

@@ -15,10 +15,10 @@ dotenv.config({ path: ['.env.pipeline.local', 'config/.env.pipeline.local'] });
 const program = new Command();
 
 program
-    .command('configureFromSite <fromSite> <toSite> <env> <deployUI> <deployGraphQLServer> <deployClientCredentials> <useNewDomain>')
+    .command('configureFromSite <fromSite> <toSite> <env> <deployUI> <deployGraphQLServer> <useNewDomain>')
     .description('Configure the Auth0 tenants in env for the given site')
-    .action(async (fromSite, toSite, env, deployUI, deployGraphQLServer, deployClientCredentials, useNewDomain) => {
-        await configureFromSite(fromSite, toSite, env, deployUI, deployGraphQLServer, deployClientCredentials, useNewDomain);
+    .action(async (fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain) => {
+        await configureFromSite(fromSite, toSite, env, deployUI, deployGraphQLServer, useNewDomain);
     });
 
 program

package/src/auth0/configure.js

@@ -42,7 +42,6 @@ async function initializeAuth0Configuration({
     try {
       // Create a new resource server in Auth0
       console.log("Creating resource server in Auth0...");
-      console.log(`Secret => ${coreApiIdentifier}`);
 
       const resourceServerResponse = await axios.post(
         `https://${auth0Domain}/api/v2/resource-servers`,
@@ -124,7 +123,7 @@ async function replaceInFile(filePath, replacements) {
   await fs.promises.writeFile(filePath, content);
 }
 
-async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI, deployGraphQLServer, deployClientCredentials, commonSecrets) {
+async function templateAuth0(siteUrl, coreApiContext, env, filePaths, deployUI, deployGraphQLServer, commonSecrets) {
   try {
     let uiAllowedCallbacksUrls,
       uiAllowedLogoutUrls;
@@ -382,15 +381,22 @@ async function configureGraphQLServer(siteHost, coreURL, docupaceHost, site, env
     });
 
     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;
+
     // Prepare data payload
     console.log("Preparing Vault GraphQL Server data payload...");
     const graphQLServerSecretData = JSON.stringify({
       data: {
         AUTH0_CLIENT_ID: graphQLServerAuth0ClientId,
         AUTH0_CLIENT_SECRET: graphQLServerAuth0ClientSecret,
+        AUTH0_CC_CLIENT_ID: graphQLServerCCAuth0ClientId,
+        AUTH0_CC_CLIENT_SECRET: graphQLServerCCAuth0ClientSecret,
         CORE_PASSWORD: commonSecrets.CORE_PASSWORD,
         REMOTE_CONFIG_PATH: commonSecrets.REMOTE_CONFIG_PATH,
         STANDARD_CONFIG_REMOTE_PATH: commonSecrets.STANDARD_CONFIG_REMOTE_PATH,
@@ -421,6 +427,8 @@ graphqlServer:
     CORE_PASSWORD: vault:secret/data/common/config#CORE_PASSWORD
     REMOTE_CONFIG_PATH: vault:secret/data/common/config#REMOTE_CONFIG_PATH
     STANDARD_CONFIG_REMOTE_PATH: vault:secret/data/common/config#STANDARD_CONFIG_REMOTE_PATH
+    AUTH0_CC_CLIENT_ID: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_ID
+    AUTH0_CC_CLIENT_SECRET: vault:secret/data/${site}/graphql-server/config#AUTH0_CC_CLIENT_SECRET
 image:
   repository: registry.paperout.com/docupace-graphql-server-dev-docker-local/docupace-graphql-server
   tag: ${imageTag}
@@ -559,17 +567,16 @@ export async function configureFromSite(fromSite, toSite, env, deployUI, deployG
     CONNECT_URL = `${oldUrl}_ui`;
   }
 
-  await templateAuth0(SITE_HOST, CORE_API_CONTEXT, env, filePaths, deployUI, deployGraphQLServer, false, commonSecrets);
+  await templateAuth0(SITE_HOST, CORE_API_CONTEXT, env, filePaths, deployUI, deployGraphQLServer, commonSecrets);
   await importAuth0Templates('./auth0-site-setup/template', auth0Domain, auth0ClientId, auth0ClientSecret);
 
   if (deployUI === 'true') {
-    await configureUI(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, true, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, uiSecretsPath, uiImageTag, repoPath);
+    await configureUI(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, useNewDomain, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, uiSecretsPath, uiImageTag, repoPath);
   }
-  
+
   await configureGraphQLServer(SITE_HOST, CORE_URL, DOCUPACE_HOST, toSite, env, auth0Domain, auth0ClientId, auth0ClientSecret, auth0Token, graphqlSecretsPath, graphqlImageTag, shortCommitId, repoPath, commonSecrets);
   await pushDeployConfig(repoPath, `Config update for ${toSite} from ${fromSite} with UI: ${uiImageTag} and GraphQL: ${graphqlImageTag}`);
 
-
   await initializeAuth0Configuration({
     initConfiguration: "true",
     auth0Domain: auth0Domain,

package/src/auth0/vault.js

@@ -105,21 +105,3 @@ export async function updateVaultSecrets(vaultPath, secretData) {
     // throw error;
   }
 }
-
-// Example usage
-// (async () => {
-//   try {
-//     const secretPath = 'secret/data/common/config';
-//     const secretData = {
-//       data: {
-//         key1: 'value1',
-//         key2: 'value2',
-//       },
-//     };
-//
-//     const result = await updateVaultSecret(secretPath, secretData);
-//     console.log('Secret updated successfully:', result);
-//   } catch (err) {
-//     console.error(err.message);
-//   }
-// })();