fix: misc slack fixes (#73)

Author: zlalvani

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesselapi/integrations",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "description": "Vessel integrations",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

src/platforms/slack/actions/conversations/list.ts

@@ -1,4 +1,3 @@
-// import { outreachUrl } from '@/platforms/outreach/actions/validators';
 import { client } from '@/platforms/slack/client';
 import { action } from '@/sdk';
 import { z } from 'zod';

src/platforms/slack/client.ts

@@ -30,12 +30,11 @@ export const client = {
         ...(cursor ? { cursor } : {}),
         limit: `${DEFAULT_PAGE_SIZE}`,
       },
-      schema: z.intersection(
-        custom.object({
+      schema: custom
+        .object({
           members: z.array(slackUser),
-        }),
-        slackPaginated,
-      ),
+        })
+        .extend(slackPaginated.shape),
     })),
   },
   conversations: {
@@ -46,12 +45,11 @@ export const client = {
         ...(cursor ? { cursor } : {}),
         limit: `${DEFAULT_PAGE_SIZE}`,
       },
-      schema: z.intersection(
-        custom.object({
+      schema: custom
+        .object({
           channels: z.array(slackConversation),
-        }),
-        slackPaginated,
-      ),
+        })
+        .extend(slackPaginated.shape),
     })),
   },
   messages: {

src/platforms/slack/icon.ts

@@ -1 +1,2 @@
-export const icon = 'tbd';
+export const icon =
+  'data:text/html;base64,PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ImVuIj4KICA8aGVhZD4KICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAgIDxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsaW5pdGlhbC1zY2FsZT0xIj4KICAgIDxtZXRhIG5hbWU9InJvYm90cyIgY29udGVudD0ibm9pbmRleCxub2ZvbGxvdyI+CgogICAgPHRpdGxlPkZvcmJpZGRlbjwvdGl0bGU+CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIHR5cGU9InRleHQvY3NzIiBocmVmPSIvY3NzL2JsYW5rLmNzcyI+CiAgPC9oZWFkPgoKICA8Ym9keT4KICAgIDxoMT5Gb3JiaWRkZW48L2gxPgogICAgPHA+U29ycnksIHlvdSBkb24ndCBoYXZlIHBlcm1pc3Npb24gdG8gYWNjZXNzIHRoaXMgcmVzb3VyY2UgZnJvbSBoZXJlLjwvcD4KICA8L2JvZHk+CjwvaHRtbD4K';

src/platforms/slack/index.ts

@@ -5,17 +5,22 @@ import listUsers from '@/platforms/slack/actions/users/list';
 import { client } from '@/platforms/slack/client';
 import * as constants from '@/platforms/slack/constants';
 import { icon } from '@/platforms/slack/icon';
+import { slackExpiredAuth } from '@/platforms/slack/schemas';
 import { auth, platform } from '@/sdk';
 
 export * as types from '@/platforms/slack/schemas';
 
 export default platform('slack', {
   auth: auth.oauth2({
-    authUrl: 'https://slack.com/oauth/authorize',
-    tokenUrl: 'https://slack.com/api/oauth.access',
+    authUrl: 'https://slack.com/oauth/v2/authorize',
+    tokenUrl: 'https://slack.com/api/oauth.v2.access',
     oauthBodyFormat: 'form',
-    scopeSeparator: ' ',
+    scopeSeparator: ',',
     default: true,
+    isRetryable: async ({ response }) => {
+      const zodResult = slackExpiredAuth.safeParse(await response.json());
+      return zodResult.success;
+    },
   }),
   display: {
     name: 'Slack',

src/platforms/slack/schemas.ts

@@ -7,6 +7,11 @@ export const slackPaginated = custom.object({
   }),
 });
 
+export const slackExpiredAuth = custom.object({
+  ok: z.literal(false),
+  error: z.literal('token_expired'),
+});
+
 export const slackUser = custom.object({
   id: z.string(),
   name: z.string(),

src/sdk/auth.ts

@@ -63,7 +63,7 @@ export const auth = {
         }?${toQueryString(query)}`;
       }),
     isRetryable:
-      options.isRetryable ?? (({ response }) => response.status === 401),
+      options.isRetryable ?? (async ({ response }) => response.status === 401),
   }),
   apiToken: <T extends Record<string, string> = Record<string, string>>(
     options: {

src/sdk/types.ts

@@ -61,7 +61,7 @@ export type RetryableCheckFunction = ({
   response,
 }: {
   response: Response;
-}) => boolean;
+}) => Promise<boolean>;
 
 export type StandardAuthConfig<
   TAnswers extends Record<string, string> = Record<string, string>,