Merge pull request #4 from superfaceai/feat/unauthorize_handling

Handle unauthorized requests

Author: freaz

typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superface",
-  "version": "0.1.0-rc.6",
+  "version": "0.1.0-rc.7",
   "description": "Intelligent Tools for Agentic AI",
   "author": "Superface Team <[email protected]>",
   "repository": {

typescript/src/client/index.test.ts

@@ -12,6 +12,8 @@ describe('SuperfaceClient', () => {
 
     beforeEach(() => {
       fetchSpy = jest.spyOn(global, 'fetch').mockResolvedValue({
+        ok: true,
+        status: 200,
         json: () =>
           Promise.resolve([
             {
@@ -50,6 +52,92 @@ describe('SuperfaceClient', () => {
       expect(fetchSpy).toHaveBeenCalledTimes(2);
       jest.useRealTimers();
     });
+
+    it('throws when user is not authenticated', async () => {
+      fetchSpy.mockReset().mockResolvedValue({
+        ok: false,
+        status: 401,
+        json: () =>
+          Promise.resolve({
+            title: 'Unauthorized',
+            detail: `Toolhub URL (https://pod.superface.ai) for Function Descriptors is unauthorized`,
+          }),
+      } as Response);
+
+      const client = new Superface({ apiKey: 'stub', cacheTimeout: 50 });
+
+      expect(client.getTools()).rejects.toThrow(SuperfaceError);
+    });
+  });
+
+  describe('runTool', () => {
+    let fetchSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      fetchSpy = jest.spyOn(global, 'fetch').mockResolvedValue({
+        ok: true,
+        status: 200,
+        json: () =>
+          Promise.resolve([
+            {
+              type: 'function',
+              function: {
+                name: 'stub',
+                description: 'description',
+                parameters: {},
+              },
+            },
+          ]),
+      } as Response);
+    });
+
+    afterEach(() => {
+      fetchSpy.mockRestore();
+    });
+
+    it('throws when user is not authenticated', async () => {
+      fetchSpy.mockReset().mockResolvedValue({
+        ok: false,
+        status: 401,
+        json: () =>
+          Promise.resolve({
+            title: 'Unauthorized',
+            detail: `Toolhub URL (https://pod.superface.ai) for Function Descriptors is unauthorized`,
+          }),
+      } as Response);
+
+      const client = new Superface({ apiKey: 'stub' });
+
+      expect(
+        client.runTool({ userId: 'example_user', name: 'stub', args: {} })
+      ).rejects.toThrow(SuperfaceError);
+    });
+  });
+
+  describe('linkToUserConnections', () => {
+    let fetchSpy: jest.SpyInstance;
+
+    afterEach(() => {
+      fetchSpy.mockRestore();
+    });
+
+    it('throws when user is not authenticated', async () => {
+      fetchSpy = jest.spyOn(global, 'fetch').mockResolvedValue({
+        ok: false,
+        status: 401,
+        json: () =>
+          Promise.resolve({
+            title: 'Unauthorized',
+            detail: `Toolhub URL (https://pod.superface.ai) for Function Descriptors is unauthorized`,
+          }),
+      } as Response);
+
+      const client = new Superface({ apiKey: 'stub' });
+
+      expect(
+        client.linkToUserConnections({ userId: 'example_user' })
+      ).rejects.toThrow(SuperfaceError);
+    });
   });
 });
 

typescript/src/client/index.ts

@@ -207,6 +207,23 @@ export class Superface {
         continue;
       }
 
+      if (!response.ok) {
+        if (response.status === 401) {
+          const body = (await response.json()) as {
+            title: string;
+            detail: string;
+          };
+
+          throw new SuperfaceError(`${body.title}. ${body.detail}`);
+        }
+
+        lastError = new SuperfaceError(
+          `Failed to fetch tool definitions. HTTP status ${response.status}`
+        );
+        await delay(attempt);
+        continue;
+      }
+
       let body: ToolDefinition[];
       try {
         body = await response.json();
@@ -303,6 +320,23 @@ export class Superface {
           headers,
         });
 
+        if (!response.ok) {
+          if (response.status === 401) {
+            const body = (await response.json()) as {
+              title: string;
+              detail: string;
+            };
+
+            throw new SuperfaceError(`${body.title}. ${body.detail}`);
+          }
+
+          lastErrorResult = {
+            status: 'error',
+            error: `Failed to connect to Superface. HTTP status ${response.status}`,
+            assistant_hint: 'Please try again.',
+          };
+        }
+
         const contentType = response.headers.get('content-type');
         if (contentType && contentType.includes('application/json')) {
           try {
@@ -382,6 +416,23 @@ export class Superface {
           headers,
         });
 
+        if (!response.ok) {
+          if (response.status === 401) {
+            const body = (await response.json()) as {
+              title: string;
+              detail: string;
+            };
+
+            throw new SuperfaceError(`${body.title}. ${body.detail}`);
+          }
+
+          lastError = new SuperfaceError(
+            `Failed to fetch configuration link. HTTP status ${response.status}`
+          );
+          await delay(attempt);
+          continue;
+        }
+
         const body = (await response.json()) as {
           status: 'success';
           configuration_url: string;