@slates/profiles 1.0.0-rc.4 → 1.0.0-rc.5

package/dist/index.cjs

@@ -378,20 +378,25 @@ var createSlatesClientFromProfile = async (profile, opts = {}) => {
       } : null
     }
   });
-  if (firstAuth) {
+  if (firstAuth && opts.autoRefresh !== false) {
     attachAutoRefresh(client, profile, firstAuth, opts.store);
   }
   return client;
 };
 var EXPIRY_BUFFER_MS = 60 * 1e3;
-var shouldRefreshOAuthAuth = (auth) => {
-  if (auth.authType !== "auth.oauth") return false;
-  if (!auth.clientId || !auth.clientSecret) return false;
-  if (typeof auth.output?.refreshToken !== "string" || !auth.output.refreshToken) return false;
+var hasExpiredOrExpiringOutput = (auth) => {
   if (typeof auth.output?.expiresAt !== "string" || !auth.output.expiresAt) return false;
   let expiresAt = Date.parse(auth.output.expiresAt);
   return Number.isFinite(expiresAt) && expiresAt <= Date.now() + EXPIRY_BUFFER_MS;
 };
+var shouldRefreshAuth = (auth) => {
+  if (!hasExpiredOrExpiringOutput(auth)) return false;
+  if (auth.authType === "auth.oauth") {
+    if (!auth.clientId || !auth.clientSecret) return false;
+    if (typeof auth.output?.refreshToken !== "string" || !auth.output.refreshToken) return false;
+  }
+  return true;
+};
 var attachAutoRefresh = (client, profile, storedAuth, store) => {
   let baseRequest = client.request.bind(client);
   let inflightRefresh = null;
@@ -400,7 +405,7 @@ var attachAutoRefresh = (client, profile, storedAuth, store) => {
       await inflightRefresh;
       return;
     }
-    if (!shouldRefreshOAuthAuth(storedAuth)) {
+    if (!shouldRefreshAuth(storedAuth)) {
       return;
     }
     inflightRefresh = (async () => {

package/dist/index.d.cts

@@ -120,6 +120,7 @@ declare let openSlatesCliStore: (opts?: {
 declare let createSlatesClientFromProfile: (profile: SlatesProfileRecord, opts?: {
     cwd?: string;
     store?: SlatesCliStore;
+    autoRefresh?: boolean;
 }) => Promise<_slates_client.SlatesProtocolClient>;
 
 export { SlatesCliStore, type SlatesCliStoreData, type SlatesCliStoreScope, type SlatesLocalProfileTarget, type SlatesOAuthCredentialRecord, type SlatesProfileRecord, type SlatesProfileTarget, type SlatesStoredAuth, createSlatesClientFromProfile, openSlatesCliStore, resolveSlatesCliDir, resolveSlatesCliProfilesDir, resolveSlatesCliRoot };

package/dist/index.d.ts

@@ -120,6 +120,7 @@ declare let openSlatesCliStore: (opts?: {
 declare let createSlatesClientFromProfile: (profile: SlatesProfileRecord, opts?: {
     cwd?: string;
     store?: SlatesCliStore;
+    autoRefresh?: boolean;
 }) => Promise<_slates_client.SlatesProtocolClient>;
 
 export { SlatesCliStore, type SlatesCliStoreData, type SlatesCliStoreScope, type SlatesLocalProfileTarget, type SlatesOAuthCredentialRecord, type SlatesProfileRecord, type SlatesProfileTarget, type SlatesStoredAuth, createSlatesClientFromProfile, openSlatesCliStore, resolveSlatesCliDir, resolveSlatesCliProfilesDir, resolveSlatesCliRoot };

package/dist/index.module.js

@@ -337,20 +337,25 @@ var createSlatesClientFromProfile = async (profile, opts = {}) => {
       } : null
     }
   });
-  if (firstAuth) {
+  if (firstAuth && opts.autoRefresh !== false) {
     attachAutoRefresh(client, profile, firstAuth, opts.store);
   }
   return client;
 };
 var EXPIRY_BUFFER_MS = 60 * 1e3;
-var shouldRefreshOAuthAuth = (auth) => {
-  if (auth.authType !== "auth.oauth") return false;
-  if (!auth.clientId || !auth.clientSecret) return false;
-  if (typeof auth.output?.refreshToken !== "string" || !auth.output.refreshToken) return false;
+var hasExpiredOrExpiringOutput = (auth) => {
   if (typeof auth.output?.expiresAt !== "string" || !auth.output.expiresAt) return false;
   let expiresAt = Date.parse(auth.output.expiresAt);
   return Number.isFinite(expiresAt) && expiresAt <= Date.now() + EXPIRY_BUFFER_MS;
 };
+var shouldRefreshAuth = (auth) => {
+  if (!hasExpiredOrExpiringOutput(auth)) return false;
+  if (auth.authType === "auth.oauth") {
+    if (!auth.clientId || !auth.clientSecret) return false;
+    if (typeof auth.output?.refreshToken !== "string" || !auth.output.refreshToken) return false;
+  }
+  return true;
+};
 var attachAutoRefresh = (client, profile, storedAuth, store) => {
   let baseRequest = client.request.bind(client);
   let inflightRefresh = null;
@@ -359,7 +364,7 @@ var attachAutoRefresh = (client, profile, storedAuth, store) => {
       await inflightRefresh;
       return;
     }
-    if (!shouldRefreshOAuthAuth(storedAuth)) {
+    if (!shouldRefreshAuth(storedAuth)) {
       return;
     }
     inflightRefresh = (async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slates/profiles",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "publishConfig": {
     "access": "public"
   },
@@ -31,11 +31,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@slates/client": "1.0.0-rc.6",
-    "@slates/proto": "1.0.0-rc.8"
+    "@slates/client": "1.0.0-rc.7",
+    "@slates/proto": "1.0.0-rc.9"
   },
   "devDependencies": {
-    "@slates/provider": "1.0.0-rc.10",
+    "@slates/provider": "1.0.0-rc.11",
     "@slates/tsconfig": "1.0.0-rc.1",
     "typescript": "5.8.2",
     "vitest": "^3.1.2",

package/src/client.ts

@@ -43,7 +43,7 @@ let loadSlateFromProfile = async (
 
 export let createSlatesClientFromProfile = async (
   profile: SlatesProfileRecord,
-  opts: { cwd?: string; store?: SlatesCliStore } = {}
+  opts: { cwd?: string; store?: SlatesCliStore; autoRefresh?: boolean } = {}
 ) => {
   let firstAuth = Object.values(profile.auth)[0];
   let slate = await loadSlateFromProfile(profile, opts);
@@ -61,7 +61,7 @@ export let createSlatesClientFromProfile = async (
     }
   });
 
-  if (firstAuth) {
+  if (firstAuth && opts.autoRefresh !== false) {
     attachAutoRefresh(client, profile, firstAuth, opts.store);
   }
 
@@ -70,16 +70,24 @@ export let createSlatesClientFromProfile = async (
 
 let EXPIRY_BUFFER_MS = 60 * 1000;
 
-let shouldRefreshOAuthAuth = (auth: SlatesStoredAuth) => {
-  if (auth.authType !== 'auth.oauth') return false;
-  if (!auth.clientId || !auth.clientSecret) return false;
-  if (typeof auth.output?.refreshToken !== 'string' || !auth.output.refreshToken) return false;
+let hasExpiredOrExpiringOutput = (auth: SlatesStoredAuth) => {
   if (typeof auth.output?.expiresAt !== 'string' || !auth.output.expiresAt) return false;
 
   let expiresAt = Date.parse(auth.output.expiresAt);
   return Number.isFinite(expiresAt) && expiresAt <= Date.now() + EXPIRY_BUFFER_MS;
 };
 
+let shouldRefreshAuth = (auth: SlatesStoredAuth) => {
+  if (!hasExpiredOrExpiringOutput(auth)) return false;
+
+  if (auth.authType === 'auth.oauth') {
+    if (!auth.clientId || !auth.clientSecret) return false;
+    if (typeof auth.output?.refreshToken !== 'string' || !auth.output.refreshToken) return false;
+  }
+
+  return true;
+};
+
 let attachAutoRefresh = (
   client: ReturnType<typeof createSlatesClient>,
   profile: SlatesProfileRecord,
@@ -95,7 +103,7 @@ let attachAutoRefresh = (
       return;
     }
 
-    if (!shouldRefreshOAuthAuth(storedAuth)) {
+    if (!shouldRefreshAuth(storedAuth)) {
       return;
     }
 

package/src/store.test.ts

@@ -413,4 +413,115 @@ export let provider = Slate.create({
       token: 'expired-token-refreshed'
     });
   });
+
+  it('refreshes expired custom auth automatically in the profile-backed client', async () => {
+    let cwd = await createTempDir();
+    let entry = path.join(cwd, 'custom-slate.mjs');
+    await writeFile(
+      entry,
+      `
+import { Slate, SlateAuth, SlateConfig, SlateSpecification, SlateTool } from '@slates/provider';
+import { z } from 'zod';
+
+let config = SlateConfig.create(z.object({})).getDefaultConfig(() => ({}));
+let auth = SlateAuth.create()
+  .output(
+    z.object({
+      token: z.string(),
+      expiresAt: z.string().optional()
+    })
+  )
+  .addCustomAuth({
+    type: 'auth.custom',
+    key: 'custom',
+    name: 'Custom',
+    inputSchema: z.object({
+      tokenPrefix: z.string()
+    }),
+    getOutput: async ctx => ({
+      output: {
+        token: \`\${ctx.input.tokenPrefix}-initial\`,
+        expiresAt: new Date(Date.now() + 60 * 60 * 1000).toISOString()
+      }
+    }),
+    handleTokenRefresh: async ctx => ({
+      output: {
+        token: \`\${ctx.input.tokenPrefix}-refreshed\`,
+        expiresAt: new Date(Date.now() + 60 * 60 * 1000).toISOString()
+      }
+    })
+  });
+
+let spec = SlateSpecification.create({
+  key: 'custom-demo',
+  name: 'Custom Demo',
+  description: 'Custom auth test slate',
+  config,
+  auth
+});
+
+let tool = SlateTool.create(spec, {
+  key: 'whoami',
+  name: 'Who Am I'
+})
+  .input(z.object({}))
+  .output(
+    z.object({
+      token: z.string()
+    })
+  )
+  .handleInvocation(async ctx => ({
+    output: {
+      token: ctx.auth.token
+    }
+  }))
+  .build();
+
+export let provider = Slate.create({
+  spec,
+  tools: [tool],
+  triggers: []
+});
+`,
+      'utf-8'
+    );
+
+    let store = await SlatesCliStore.open({
+      cwd,
+      scope: {
+        key: 'integrations/demo',
+        name: 'demo'
+      }
+    });
+    let profile = store.upsertProfile({
+      name: 'Demo',
+      target: {
+        type: 'local',
+        entry: './custom-slate.mjs',
+        exportName: 'provider'
+      }
+    });
+    store.setProfileConfig(profile.id, {});
+    store.upsertAuth(profile.id, {
+      authMethodId: 'custom',
+      authType: 'auth.custom',
+      input: {
+        tokenPrefix: 'custom-token'
+      },
+      output: {
+        token: 'expired-token',
+        expiresAt: new Date(Date.now() - 60 * 1000).toISOString()
+      },
+      scopes: []
+    });
+    await store.save();
+
+    let client = await createSlatesClientFromProfile(profile, { cwd, store });
+    let result = await client.invokeTool('whoami', {});
+
+    expect(result.output).toEqual({ token: 'custom-token-refreshed' });
+    expect(store.getAuth(profile.id, 'custom')?.output).toMatchObject({
+      token: 'custom-token-refreshed'
+    });
+  });
 });