Merge pull request #656 from panoratech/feat/squarespace-amazon

✨ Added amazon oauth
panoratech · Aug 12, 2024 · 0dd37c0 · 0dd37c0
2 parents 10dae7f + 772008b
commit 0dd37c0
Show file tree

Hide file tree

Showing 50 changed files with 1,915 additions and 589 deletions.
diff --git a/apps/webapp/src/components/Configuration/Connector/ConnectorDisplay.tsx b/apps/webapp/src/components/Configuration/Connector/ConnectorDisplay.tsx
@@ -76,7 +76,6 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
   })
 
   // Extract oauth_attributes from the connector metadata
-  console.log('item is '+JSON.stringify(item))
   const oauthAttributes = CONNECTORS_METADATA[item?.vertical!][item?.name!].options?.oauth_attributes || [];
 
   // Update the form schema to include dynamic fields
@@ -359,15 +358,25 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
         onSuccess(data) {
           if (item?.authStrategy.strategy === AuthStrategy.oauth2) {
             let i = 0;
-            if(needsSubdomain(item.name.toLowerCase(), item.vertical!.toLowerCase())){
+            if (needsSubdomain(item.name.toLowerCase(), item.vertical?.toLowerCase()!)) {
               form.setValue("subdomain", data[i]);
-              i = 1;
+              i += 1;
             }
+
+            // Set client_id and client_secret
             form.setValue("client_id", data[i]);
             form.setValue("client_secret", data[i + 1]);
-            form.setValue("scope", data[i + 2]);
+            i += 2; // Increment i after setting client_id and client_secret
+
+            // Check if scope is needed and set the value if so
+            if (needsScope(item.name.toLowerCase(), item.vertical?.toLowerCase()!)) {
+              form.setValue("scope", data[i]);
+              i += 1;
+            }
+
+            // Set any additional OAuth attributes
             oauthAttributes.forEach((attr: string, index: number) => {
-              form.setValue(attr as keyof z.infer<typeof formSchema>, data[i + 3 + index]);
+              form.setValue(attr as keyof z.infer<typeof formSchema>, data[i + index]);
             });
           }
           if (item?.authStrategy.strategy === AuthStrategy.api_key) {

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -174,6 +174,9 @@ services:
       FAIRE_ECOMMERCE_CLOUD_CLIENT_SECRET: ${FAIRE_ECOMMERCE_CLOUD_CLIENT_SECRET}
       WEBFLOW_ECOMMERCE_CLOUD_CLIENT_ID: ${WEBFLOW_ECOMMERCE_CLOUD_CLIENT_ID}
       WEBFLOW_ECOMMERCE_CLOUD_CLIENT_SECRET: ${WEBFLOW_ECOMMERCE_CLOUD_CLIENT_SECRET}
+      AMAZON_ECOMMERCE_CLOUD_CLIENT_ID: ${AMAZON_ECOMMERCE_CLOUD_CLIENT_ID}
+      AMAZON_ECOMMERCE_CLOUD_CLIENT_SECRET: ${AMAZON_ECOMMERCE_CLOUD_CLIENT_SECRET}
+      AMAZON_ECOMMERCE_CLOUD_APPLICATION_ID: ${AMAZON_ECOMMERCE_CLOUD_APPLICATION_ID}
       EMAIL_SENDING_ADDRESS: ${EMAIL_SENDING_ADDRESS}
       SMTP_HOST: ${SMTP_HOST}
       SMTP_PORT: ${SMTP_PORT}

diff --git a/docker-compose.source.yml b/docker-compose.source.yml
@@ -174,6 +174,9 @@ services:
       FAIRE_ECOMMERCE_CLOUD_CLIENT_SECRET: ${FAIRE_ECOMMERCE_CLOUD_CLIENT_SECRET}
       WEBFLOW_ECOMMERCE_CLOUD_CLIENT_ID: ${WEBFLOW_ECOMMERCE_CLOUD_CLIENT_ID}
       WEBFLOW_ECOMMERCE_CLOUD_CLIENT_SECRET: ${WEBFLOW_ECOMMERCE_CLOUD_CLIENT_SECRET}
+      AMAZON_ECOMMERCE_CLOUD_CLIENT_ID: ${AMAZON_ECOMMERCE_CLOUD_CLIENT_ID}
+      AMAZON_ECOMMERCE_CLOUD_CLIENT_SECRET: ${AMAZON_ECOMMERCE_CLOUD_CLIENT_SECRET}
+      AMAZON_ECOMMERCE_CLOUD_APPLICATION_ID: ${AMAZON_ECOMMERCE_CLOUD_APPLICATION_ID}
       EMAIL_SENDING_ADDRESS: ${EMAIL_SENDING_ADDRESS}
       SMTP_HOST: ${SMTP_HOST}
       SMTP_PORT: ${SMTP_PORT}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -168,6 +168,9 @@ services:
       FAIRE_ECOMMERCE_CLOUD_CLIENT_SECRET: ${FAIRE_ECOMMERCE_CLOUD_CLIENT_SECRET}
       WEBFLOW_ECOMMERCE_CLOUD_CLIENT_ID: ${WEBFLOW_ECOMMERCE_CLOUD_CLIENT_ID}
       WEBFLOW_ECOMMERCE_CLOUD_CLIENT_SECRET: ${WEBFLOW_ECOMMERCE_CLOUD_CLIENT_SECRET}
+      AMAZON_ECOMMERCE_CLOUD_CLIENT_ID: ${AMAZON_ECOMMERCE_CLOUD_CLIENT_ID}
+      AMAZON_ECOMMERCE_CLOUD_CLIENT_SECRET: ${AMAZON_ECOMMERCE_CLOUD_CLIENT_SECRET}
+      AMAZON_ECOMMERCE_CLOUD_APPLICATION_ID: ${AMAZON_ECOMMERCE_CLOUD_APPLICATION_ID}
       EMAIL_SENDING_ADDRESS: ${EMAIL_SENDING_ADDRESS}
       SMTP_HOST: ${SMTP_HOST}
       SMTP_PORT: ${SMTP_PORT}