Merge branch 'main' of https://github.com/panoratech/Panora into feat…

…/amazon-integration
panoratech · Aug 10, 2024 · c859a93 · c859a93
2 parents f72884f + 84d7bea
commit c859a93
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/packages/api/scripts/init.sql b/packages/api/scripts/init.sql
@@ -374,7 +374,9 @@ CREATE TABLE connector_sets
  crm_zendesk      boolean NULL,
  crm_close        boolean NULL,
  fs_box           boolean NULL,
-  tcg_github boolean NULL,
+ tcg_github       boolean NULL,
+ ecom_woocommerce boolean NULL,
+ ecom_shopify     boolean NULL,
 CONSTRAINT PK_project_connector PRIMARY KEY ( id_connector_set )
 );
 

diff --git a/packages/api/src/@core/connections/connections.controller.ts b/packages/api/src/@core/connections/connections.controller.ts
@@ -67,6 +67,7 @@ export class ConnectionsController {
   async handleOAuthCallback(@Res() res: Response, @Query() query: any) {
     try {
       const { state, code, ...otherParams } = query;
+
       if (!code) {
         throw new ConnectionsError({
           name: 'OAUTH_CALLBACK_CODE_NOT_FOUND_ERROR',
@@ -93,6 +94,13 @@ export class ConnectionsController {
         // Step 3: Parse the JSON
         stateData = JSON.parse(decodedState);
         console.log(stateData);
+      } else if (state.includes(':')) {
+        // squarespace asks for a random alphanumeric value
+        // Split the random part and the base64 part
+        const [randomPart, base64Part] = decodeURIComponent(state).split(':');
+        // Decode the base64 part to get the original JSON
+        const jsonString = Buffer.from(base64Part, 'base64').toString('utf-8');
+        stateData = JSON.parse(jsonString);
       } else {
         // If no HTML entities are present, parse directly
         stateData = JSON.parse(state);

diff --git a/packages/shared/src/authUrl.ts b/packages/shared/src/authUrl.ts
@@ -59,7 +59,17 @@ export const constructAuthUrl = async ({ projectId, linkedUserId, providerName,
   if (providerName === 'microsoftdynamicssales') {
     state = encodeURIComponent(JSON.stringify({ projectId, linkedUserId, providerName, vertical, returnUrl, resource: additionalParams!.end_user_domain }));
   }
-
+  if(providerName === 'squarespace'){
+    const randomState = randomString();
+    state = encodeURIComponent(randomState + ':' + Buffer.from(JSON.stringify({
+      projectId,
+      linkedUserId,
+      providerName,
+      vertical,
+      returnUrl,
+      resource: additionalParams.end_user_domain
+  })).toString('base64'));
+  }
   // console.log('State : ', JSON.stringify({ projectId, linkedUserId, providerName, vertical, returnUrl }));
   // console.log('encodedRedirect URL : ', encodedRedirectUrl); 
   // const vertical = findConnectorCategory(providerName);