feat(sdk-openint): fixing auth

packages/fetch-links/index.spec.ts

@@ -2,7 +2,7 @@
 import type {HTTPMethod} from './link.js'
 import {applyLinks} from './link.js'
 import {axiosLink} from './links/axiosLink.js'
-import {fetchLink, logLink, retryLink, throwLink} from './links/index.js'
+import {authLink, echoLink, fetchLink, logLink, retryLink, throwLink} from './links/index.js'
 import {modifyRequest, modifyResponse} from './modifyRequestResponse.js'
 
 const req = new Request('https://httpbin.org/anything', {method: 'GET'})
@@ -152,3 +152,66 @@
 
   // TODO: Test error handling for both 4xx and 5xx errors
 })
+
+describe('authLink', () => {
+  test('openInt user auth fails with no resourceId', async () => {
+    try {
+      await applyLinks(req, [authLink({openInt: {token: '123'}}, 'https://httpbin.org'), fetchLink()])
+    } catch (e) {
+      expect(e).toBeInstanceOf(Error)
+    }
+  })
+
+  test('OpenInt user auth succeeds with resourceId', async () => {
+    const res = await applyLinks(req, [authLink({openInt: {token: '123', resourceId: '123'}}, 'https://httpbin.org'), echoLink()])
+    const json: any = await res.json()
+    expect(json.headers['authorization']).toEqual('Bearer 123')
+    expect(json.headers['x-resource-id']).toEqual('123')
+    expect(json.headers['x-resource-connector-name']).toEqual(undefined)
+    expect(json.headers['x-resource-connector-config-id']).toEqual(undefined)
+    expect(json.headers['x-resource-end-user-id']).toEqual(undefined)
+    expect(json.url).toContain('openint.dev')
+  })
+
+  test('openInt admin auth', async () => {
+    const res = await applyLinks(req, [authLink({openInt: {apiKey: '123', resourceId: '456'}}, 'https://httpbin.org'), echoLink()])
+    const json: any = await res.json()
+    expect(json.headers['x-apikey']).toEqual('123')
+    expect(json.headers['x-resource-id']).toEqual('456')
+    expect(json.headers['x-resource-connector-name']).toEqual(undefined)
+    expect(json.headers['x-resource-connector-config-id']).toEqual(undefined)
+    expect(json.headers['x-resource-end-user-id']).toEqual(undefined)
+    expect(json.url).toContain('openint.dev')
+  })
+
+  test('openInt user auth fails with token and no connectorName', async () => {
+    try {
+      await applyLinks(req, [authLink({openInt: {token: '123'}}, 'https://httpbin.org'), fetchLink()])
+    } catch (e) {
+      expect(e).toBeInstanceOf(Error)
+    }
+  })
+
+  test('openInt user auth succeeds with token and connectorName', async () => {
+    const res = await applyLinks(req, [authLink({openInt: {token: '123', connectorName: 'myConnector'}}, 'https://httpbin.org'), echoLink()])
+    const json: any = await res.json()
+    expect(json.headers['authorization']).toEqual('Bearer 123')
+    expect(json.headers['x-resource-connector-name']).toEqual('myConnector')
+  })
+
+  test('openInt admin auth fails with apiKey and no endUserId or connectorName', async () => {
+    try {
+      await applyLinks(req, [authLink({openInt: {apiKey: '123'}}, 'https://httpbin.org'), fetchLink()])
+    } catch (e) {
+      expect(e).toBeInstanceOf(Error)
+    }
+  })
+
+  test('openInt admin auth succeeds with apiKey, endUserId, and connectorName', async () => {
+    const res = await applyLinks(req, [authLink({openInt: {apiKey: '123', endUserId: '789', connectorName: 'myConnector'}}, 'https://httpbin.org'), echoLink()])
+    const json: any = await res.json()
+    expect(json.headers['x-apikey']).toEqual('123')
+    expect(json.headers['x-resource-end-user-id']).toEqual('789')
+    expect(json.headers['x-resource-connector-name']).toEqual('myConnector')
+  })
+})

packages/fetch-links/links/index.ts

@@ -10,6 +10,14 @@ export * from './authLink.js'
 
 // MARK: Built-in links
 
+export function echoLink(): Link {
+  return async (req) => Response.json({
+      url: req.url,
+      headers: Object.fromEntries(req.headers.entries()),
+      bodyText: await req.text(),
+    })
+}
+
 export function fetchLink({
   fetch = globalThis.fetch.bind(globalThis),
 }: {

sdks/sdk-openint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensdks/sdk-openint",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "type": "module",
   "exports": {
     ".": {

sdks/sdk-openint/src/index.ts

@@ -7,6 +7,10 @@ export type OpenIntSDKTypes = SDKTypes<
   openintTypes,
   Omit<ClientOptions, 'headers'> & {
     headers: {
+      /** organization auth */
+      'x-apikey'?: string
+      /** Bearer token, for end user auth */
+      authorization?: `Bearer ${string}`
       /** For passthrough and resource specific api */
       'x-resource-id'?: string
       /** Alternative ways to pass the resource id, works in case there is a single connector */
@@ -27,19 +31,37 @@ export const openintSdkDef = {
   oasMeta: openintOasMeta,
 } satisfies SdkDefinition<OpenIntSDKTypes>
 
+function generateHeaders(opts: OpenIntSDKTypes['options']) {
+  const headers: Record<string, string> = {};
+
+  if (opts.apiKey) {
+    headers['x-apikey'] = opts.apiKey;
+  }
+  if (opts.token) {
+    headers['authorization'] = `Bearer ${opts.token}`;
+  }
+  if (opts.resourceId) {
+    headers['x-resource-id'] = opts.resourceId;
+  }
+  if (opts.endUserId) {
+    headers['x-resource-end-user-id'] = opts.endUserId;
+  }
+  if (opts.connectorName) {
+    headers['x-resource-connector-name'] = opts.connectorName;
+  }
+
+  return headers;
+}
+
 export function initOpenIntSDK(opts: OpenIntSDKTypes['options']) {
+  // @ts-expect-error
+  const headers = {...opts.headers, ...generateHeaders({...opts, ...opts?.auth?.openInt})}  
+  // @ts-expect-error
+  delete opts?.auth?.openInt;
+
   return initSDK(openintSdkDef, {
     ...opts,
-    // new way of passing auth options
-    auth: {
-      openInt: {
-        token: opts.token,
-        apiKey: opts.apiKey,
-        resourceId: opts.resourceId,
-        endUserId: opts.endUserId,
-        connectorName: opts.connectorName,
-      }
-    }
+    headers
   })
 }