@slates/cli 1.0.0-rc.5 → 1.0.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slates/cli",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.6",
   "publishConfig": {
     "access": "public"
   },
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.4.0",
-    "@slates/client": "1.0.0-rc.7",
-    "@slates/oauth-microsoft": "1.0.0-rc.2",
-    "@slates/profiles": "1.0.0-rc.5",
+    "@slates/client": "1.0.0-rc.8",
+    "@slates/oauth-microsoft": "1.0.0-rc.3",
+    "@slates/profiles": "1.0.0-rc.6",
     "sade": "^1.8.1"
   },
   "devDependencies": {

package/src/commands/auth.test.ts

@@ -8,6 +8,30 @@ describe('normalizeCallbackRedirectUriForIntegration', () => {
     ).toBe('http://localhost:45873/callback');
   });
 
+  it('normalizes Intercom loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('intercom', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
+  it('normalizes Typeform loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('typeform', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
+  it('normalizes Xero loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('xero', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
+  it('normalizes Zendesk loopback redirects to localhost', () => {
+    expect(
+      normalizeCallbackRedirectUriForIntegration('zendesk', 'http://127.0.0.1:45873/callback')
+    ).toBe('http://localhost:45873/callback');
+  });
+
   it('leaves unrelated integration redirects unchanged', () => {
     expect(
       normalizeCallbackRedirectUriForIntegration('attio', 'http://127.0.0.1:45873/callback')

package/src/commands/auth.ts

@@ -22,11 +22,19 @@ import { JsonInput, WithProfile } from '../lib/types';
 type JsonObject = Record<string, any>;
 let NOTION_INTEGRATION_KEY = 'notion';
 let SALESFORCE_INTEGRATION_KEY = 'salesforce';
+let INTERCOM_INTEGRATION_KEY = 'intercom';
+let TYPEFORM_INTEGRATION_KEY = 'typeform';
+let XERO_INTEGRATION_KEY = 'xero';
+let ZENDESK_INTEGRATION_KEY = 'zendesk';
 let HUBSPOT_INTEGRATION_KEY = 'hubspot';
 let HUBSPOT_DEVELOPER_PLATFORM_OAUTH_METHOD_ID = 'developer_platform_oauth';
 let LOOPBACK_REDIRECT_NORMALIZED_INTEGRATIONS = new Set([
+  INTERCOM_INTEGRATION_KEY,
   NOTION_INTEGRATION_KEY,
-  SALESFORCE_INTEGRATION_KEY
+  SALESFORCE_INTEGRATION_KEY,
+  TYPEFORM_INTEGRATION_KEY,
+  XERO_INTEGRATION_KEY,
+  ZENDESK_INTEGRATION_KEY
 ]);
 
 type AuthSetupOptions = WithProfile &
@@ -345,6 +353,7 @@ let runAuthSetup = async (opts: AuthSetupOptions): Promise<SlatesStoredAuth> =>
       clientId,
       clientSecret,
       scopes,
+      callbackParams: callbackResult.callbackParams,
       callbackState: callbackState ?? undefined
     });
 

package/src/lib/oauth.ts

@@ -34,7 +34,11 @@ export let createOAuthCallbackListener = async () => {
   return new Promise<{
     redirectUri: string;
     state: string;
-    wait: () => Promise<{ code: string; state: string }>;
+    wait: () => Promise<{
+      code: string;
+      state: string;
+      callbackParams: Record<string, string>;
+    }>;
   }>((resolve, reject) => {
     let expectedState = randomUUID();
     let settled = false;
@@ -79,7 +83,11 @@ export let createOAuthCallbackListener = async () => {
         res.end('Authentication complete. You can close this window.');
         server.close();
         settled = true;
-        waiter.resolve({ code, state });
+        waiter.resolve({
+          code,
+          state,
+          callbackParams: Object.fromEntries(url.searchParams.entries())
+        });
       } catch (error) {
         server.close();
         settled = true;
@@ -88,9 +96,17 @@ export let createOAuthCallbackListener = async () => {
     });
 
     let waiter = (() => {
-      let resolvePromise!: (value: { code: string; state: string }) => void;
+      let resolvePromise!: (value: {
+        code: string;
+        state: string;
+        callbackParams: Record<string, string>;
+      }) => void;
       let rejectPromise!: (error: unknown) => void;
-      let promise = new Promise<{ code: string; state: string }>((resolveFn, rejectFn) => {
+      let promise = new Promise<{
+        code: string;
+        state: string;
+        callbackParams: Record<string, string>;
+      }>((resolveFn, rejectFn) => {
         resolvePromise = resolveFn;
         rejectPromise = rejectFn;
       });