@adminforth/agent 1.46.0 → 1.47.1

package/build.log

@@ -7,7 +7,6 @@ custom/
 custom/ChatFooter.vue
 custom/ChatHeader.vue
 custom/ChatSurface.vue
-custom/ChatSurfaceSettings.vue
 custom/CustomAutoScrollContainer.vue
 custom/SessionsHistory.vue
 custom/chat.ts
@@ -63,5 +62,5 @@ custom/speech_recognition_frontend/voiceActivityDetection.ts
 custom/speech_recognition_frontend/types/
 custom/speech_recognition_frontend/types/voice-activity-detection.d.ts
 
-sent 1,671,668 bytes  received 940 bytes  3,345,216.00 bytes/sec
-total size is 1,667,436  speedup is 1.00
+sent 1,667,665 bytes  received 921 bytes  3,337,172.00 bytes/sec
+total size is 1,663,512  speedup is 1.00

package/chatSurfaceService.ts

@@ -6,23 +6,16 @@ import type {
   IAdminForth,
 } from "adminforth";
 import { Filters, logger } from "adminforth";
-import { randomUUID } from "crypto";
 import type { AgentEventEmitter } from "./agentEvents.js";
 import type {
   HandleTurnInput,
   RunAndPersistAgentResponseInput,
   RunAndPersistAgentResponseResult,
 } from "./agentTurnService.js";
-import type { PluginOptions } from "./types.js";
-import type { AgentSessionStore } from "./sessionStore.js";
 import { getErrorMessage, isAbortError } from "./errors.js";
+import type { AgentSessionStore } from "./sessionStore.js";
 import { sanitizeSpeechText } from "./sanitizeSpeechText.js";
-
-type ChatSurfaceConnectAction = {
-  type: "url";
-  label: string;
-  url: string;
-};
+import type { PluginOptions } from "./types.js";
 
 type ChatSurfaceIncomingMessageWithAudio = ChatSurfaceIncomingMessage & {
   audio?: {
@@ -41,24 +34,7 @@ type ChatSurfaceEventSinkWithAudio = ChatSurfaceEventSink & {
   }): void | Promise<void>;
 };
 
-export type ChatSurfaceAdapterWithConnectAction = ChatSurfaceAdapter & {
-  createConnectAction?(input: {
-    token: string;
-  }): ChatSurfaceConnectAction | Promise<ChatSurfaceConnectAction>;
-};
-
-type ChatSurfaceLinkTokenPayload = {
-  surface: string;
-  adminUserId: AdminUser["pk"];
-  expiresAt: number;
-};
-
-const DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD = "externalUserId";
-const CHAT_SURFACE_LINK_TOKEN_TTL_MS = 60 * 1000;
-
 export class ChatSurfaceService {
-  private linkTokens = new Map<string, ChatSurfaceLinkTokenPayload>();
-
   constructor(
     private getAdminforth: () => IAdminForth,
     private options: PluginOptions,
@@ -69,40 +45,6 @@ export class ChatSurfaceService {
     ) => Promise<RunAndPersistAgentResponseResult>,
   ) {}
 
-  getConnectActionAdapters() {
-    return (this.options.chatSurfaceAdapters ?? [])
-      .map((adapter) => adapter as ChatSurfaceAdapterWithConnectAction)
-      .filter((adapter) => adapter.createConnectAction);
-  }
-
-  createLinkToken(surface: string, adminUser: AdminUser) {
-    for (const [token, payload] of this.linkTokens) {
-      if (payload.expiresAt <= Date.now()) {
-        this.linkTokens.delete(token);
-      }
-    }
-
-    const token = randomUUID();
-    this.linkTokens.set(token, {
-      surface,
-      adminUserId: adminUser.pk,
-      expiresAt: Date.now() + CHAT_SURFACE_LINK_TOKEN_TTL_MS,
-    });
-
-    return token;
-  }
-
-  private consumeLinkToken(surface: string, token: string) {
-    const payload = this.linkTokens.get(token);
-    this.linkTokens.delete(token);
-
-    if (!payload || payload.surface !== surface || payload.expiresAt <= Date.now()) {
-      return null;
-    }
-
-    return payload;
-  }
-
   private createEventEmitter(sink: ChatSurfaceEventSink): AgentEventEmitter {
     return async (event) => {
       if (event.type === "text-delta") {
@@ -138,55 +80,10 @@ export class ChatSurfaceService {
       return false;
     }
 
-    const externalUserIdField = this.options.chatExternalIdsField ?? DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-    const adminforth = this.getAdminforth();
-    const authResourceId = adminforth.config.auth!.usersResourceId!;
-    const authResource = adminforth.config.resources.find((resource) => resource.resourceId === authResourceId)!;
-    const primaryKeyField = authResource.columns.find((column) => column.primaryKey)!.name!;
-    const linkedAdminUserRecord = (
-      await adminforth.resource(authResourceId).list(Filters.IS_NOT_EMPTY(externalUserIdField))
-    ).find((user) => user[externalUserIdField]?.[incoming.surface] === incoming.externalUserId);
-
-    if (linkedAdminUserRecord) {
-      await sink.emit({
-        type: "done",
-        text: `${incoming.surface} account is already connected to AdminForth.`,
-      });
-      return true;
-    }
-
-    if (typeof incoming.metadata?.startPayload !== "string") {
-      await sink.emit({
-        type: "done",
-        text: `Open AdminForth and connect your ${incoming.surface} account from Chat Surfaces settings.`,
-      });
-      return true;
-    }
-
-    const payload = this.consumeLinkToken(incoming.surface, incoming.metadata.startPayload);
-    if (!payload) {
-      await sink.emit({
-        type: "error",
-        message: "This chat surface link is expired or invalid. Please start linking again from AdminForth.",
-      });
-      return true;
-    }
-
-    const adminUserRecord = await adminforth.resource(authResourceId).get([
-      Filters.EQ(primaryKeyField, payload.adminUserId),
-    ]);
-
-    await adminforth.resource(authResourceId).update(payload.adminUserId, {
-      [externalUserIdField]: {
-        ...(adminUserRecord[externalUserIdField] ?? {}),
-        [incoming.surface]: incoming.externalUserId,
-      },
-    });
     await sink.emit({
       type: "done",
-      text: `${incoming.surface} account connected to AdminForth.`,
+      text: `Open AdminForth and connect your ${incoming.surface} account from Connected Accounts settings.`,
     });
-
     return true;
   }
 
@@ -327,6 +224,54 @@ export class ChatSurfaceService {
     return agentResponse;
   }
 
+  private async getAdminUserRecordForChatSurface(
+    adapter: ChatSurfaceAdapter,
+    incoming: ChatSurfaceIncomingMessage,
+  ) {
+    const adminforth = this.getAdminforth();
+    const authResourceId = adminforth.config.auth!.usersResourceId!;
+    const externalIdentityResource = this.options.chatExternalIdentityResource;
+    if (!externalIdentityResource) {
+      return null;
+    }
+
+    const surfaceIdentityConfig = externalIdentityResource.surfaces[adapter.name];
+    if (!surfaceIdentityConfig) {
+      return null;
+    }
+
+    const providerField = externalIdentityResource.providerField ?? 'provider';
+    const subjectField = externalIdentityResource.subjectField ?? 'subject';
+    const adminUserIdField = externalIdentityResource.adminUserIdField ?? 'adminUserId';
+    const externalUserIdField = externalIdentityResource.externalUserIdField ?? 'externalUserId';
+    const identityFilters = [
+      Filters.EQ(providerField, surfaceIdentityConfig.provider),
+      Filters.EQ(externalUserIdField, incoming.externalUserId),
+    ];
+    const identities = await adminforth.resource(externalIdentityResource.resourceId).list(identityFilters);
+    const identity = identities.find((identity) => {
+      if (String(identity[externalUserIdField]) === incoming.externalUserId) {
+        return true;
+      }
+
+      if (String(identity[subjectField]) === incoming.externalUserId) {
+        return true;
+      }
+
+      return false;
+    });
+
+    if (!identity) {
+      return null;
+    }
+
+    const authResource = adminforth.config.resources.find((resource) => resource.resourceId === authResourceId)!;
+    const primaryKeyField = authResource.columns.find((column) => column.primaryKey)!.name!;
+    return adminforth.resource(authResourceId).get([
+      Filters.EQ(primaryKeyField, identity[adminUserIdField]),
+    ]);
+  }
+
   async handleMessage(
     adapter: ChatSurfaceAdapter,
     incoming: ChatSurfaceIncomingMessage,
@@ -340,10 +285,7 @@ export class ChatSurfaceService {
     const authResourceId = adminforth.config.auth!.usersResourceId!;
     const authResource = adminforth.config.resources.find((resource) => resource.resourceId === authResourceId)!;
     const primaryKeyField = authResource.columns.find((column) => column.primaryKey)!.name!;
-    const externalUserIdField = this.options.chatExternalIdsField ?? DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-    const adminUserRecord = (
-      await adminforth.resource(authResourceId).list(Filters.IS_NOT_EMPTY(externalUserIdField))
-    ).find((user) => user[externalUserIdField]?.[adapter.name] === incoming.externalUserId);
+    const adminUserRecord = await this.getAdminUserRecordForChatSurface(adapter, incoming);
 
     if (!adminUserRecord) {
       await sink.emit({

package/dist/chatSurfaceService.d.ts

@@ -1,32 +1,18 @@
-import type { AdminUser, ChatSurfaceAdapter, ChatSurfaceEventSink, ChatSurfaceIncomingMessage, IAdminForth } from "adminforth";
+import type { ChatSurfaceAdapter, ChatSurfaceEventSink, ChatSurfaceIncomingMessage, IAdminForth } from "adminforth";
 import type { HandleTurnInput, RunAndPersistAgentResponseInput, RunAndPersistAgentResponseResult } from "./agentTurnService.js";
-import type { PluginOptions } from "./types.js";
 import type { AgentSessionStore } from "./sessionStore.js";
-type ChatSurfaceConnectAction = {
-    type: "url";
-    label: string;
-    url: string;
-};
-export type ChatSurfaceAdapterWithConnectAction = ChatSurfaceAdapter & {
-    createConnectAction?(input: {
-        token: string;
-    }): ChatSurfaceConnectAction | Promise<ChatSurfaceConnectAction>;
-};
+import type { PluginOptions } from "./types.js";
 export declare class ChatSurfaceService {
     private getAdminforth;
     private options;
     private sessionStore;
     private handleTurn;
     private runAndPersistAgentResponse;
-    private linkTokens;
     constructor(getAdminforth: () => IAdminForth, options: PluginOptions, sessionStore: AgentSessionStore, handleTurn: (input: HandleTurnInput) => Promise<unknown>, runAndPersistAgentResponse: (input: RunAndPersistAgentResponseInput) => Promise<RunAndPersistAgentResponseResult>);
-    getConnectActionAdapters(): ChatSurfaceAdapterWithConnectAction[];
-    createLinkToken(surface: string, adminUser: AdminUser): `${string}-${string}-${string}-${string}-${string}`;
-    private consumeLinkToken;
     private createEventEmitter;
     private handleLink;
     private handleAudioMessage;
     private handleAgentSurfaceResponse;
+    private getAdminUserRecordForChatSurface;
     handleMessage(adapter: ChatSurfaceAdapter, incoming: ChatSurfaceIncomingMessage, sink: ChatSurfaceEventSink): Promise<void>;
 }
-export {};

package/dist/chatSurfaceService.js

@@ -8,11 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { Filters, logger } from "adminforth";
-import { randomUUID } from "crypto";
 import { getErrorMessage, isAbortError } from "./errors.js";
 import { sanitizeSpeechText } from "./sanitizeSpeechText.js";
-const DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD = "externalUserId";
-const CHAT_SURFACE_LINK_TOKEN_TTL_MS = 60 * 1000;
 export class ChatSurfaceService {
     constructor(getAdminforth, options, sessionStore, handleTurn, runAndPersistAgentResponse) {
         this.getAdminforth = getAdminforth;
@@ -20,35 +17,6 @@ export class ChatSurfaceService {
         this.sessionStore = sessionStore;
         this.handleTurn = handleTurn;
         this.runAndPersistAgentResponse = runAndPersistAgentResponse;
-        this.linkTokens = new Map();
-    }
-    getConnectActionAdapters() {
-        var _a;
-        return ((_a = this.options.chatSurfaceAdapters) !== null && _a !== void 0 ? _a : [])
-            .map((adapter) => adapter)
-            .filter((adapter) => adapter.createConnectAction);
-    }
-    createLinkToken(surface, adminUser) {
-        for (const [token, payload] of this.linkTokens) {
-            if (payload.expiresAt <= Date.now()) {
-                this.linkTokens.delete(token);
-            }
-        }
-        const token = randomUUID();
-        this.linkTokens.set(token, {
-            surface,
-            adminUserId: adminUser.pk,
-            expiresAt: Date.now() + CHAT_SURFACE_LINK_TOKEN_TTL_MS,
-        });
-        return token;
-    }
-    consumeLinkToken(surface, token) {
-        const payload = this.linkTokens.get(token);
-        this.linkTokens.delete(token);
-        if (!payload || payload.surface !== surface || payload.expiresAt <= Date.now()) {
-            return null;
-        }
-        return payload;
     }
     createEventEmitter(sink) {
         return (event) => __awaiter(this, void 0, void 0, function* () {
@@ -76,47 +44,13 @@ export class ChatSurfaceService {
     }
     handleLink(incoming, sink) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a;
             if (((_a = incoming.metadata) === null || _a === void 0 ? void 0 : _a.isStartCommand) !== true) {
                 return false;
             }
-            const externalUserIdField = (_b = this.options.chatExternalIdsField) !== null && _b !== void 0 ? _b : DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-            const adminforth = this.getAdminforth();
-            const authResourceId = adminforth.config.auth.usersResourceId;
-            const authResource = adminforth.config.resources.find((resource) => resource.resourceId === authResourceId);
-            const primaryKeyField = authResource.columns.find((column) => column.primaryKey).name;
-            const linkedAdminUserRecord = (yield adminforth.resource(authResourceId).list(Filters.IS_NOT_EMPTY(externalUserIdField))).find((user) => { var _a; return ((_a = user[externalUserIdField]) === null || _a === void 0 ? void 0 : _a[incoming.surface]) === incoming.externalUserId; });
-            if (linkedAdminUserRecord) {
-                yield sink.emit({
-                    type: "done",
-                    text: `${incoming.surface} account is already connected to AdminForth.`,
-                });
-                return true;
-            }
-            if (typeof ((_c = incoming.metadata) === null || _c === void 0 ? void 0 : _c.startPayload) !== "string") {
-                yield sink.emit({
-                    type: "done",
-                    text: `Open AdminForth and connect your ${incoming.surface} account from Chat Surfaces settings.`,
-                });
-                return true;
-            }
-            const payload = this.consumeLinkToken(incoming.surface, incoming.metadata.startPayload);
-            if (!payload) {
-                yield sink.emit({
-                    type: "error",
-                    message: "This chat surface link is expired or invalid. Please start linking again from AdminForth.",
-                });
-                return true;
-            }
-            const adminUserRecord = yield adminforth.resource(authResourceId).get([
-                Filters.EQ(primaryKeyField, payload.adminUserId),
-            ]);
-            yield adminforth.resource(authResourceId).update(payload.adminUserId, {
-                [externalUserIdField]: Object.assign(Object.assign({}, ((_d = adminUserRecord[externalUserIdField]) !== null && _d !== void 0 ? _d : {})), { [incoming.surface]: incoming.externalUserId }),
-            });
             yield sink.emit({
                 type: "done",
-                text: `${incoming.surface} account connected to AdminForth.`,
+                text: `Open AdminForth and connect your ${incoming.surface} account from Connected Accounts settings.`,
             });
             return true;
         });
@@ -230,9 +164,49 @@ export class ChatSurfaceService {
             return agentResponse;
         });
     }
+    getAdminUserRecordForChatSurface(adapter, incoming) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            const adminforth = this.getAdminforth();
+            const authResourceId = adminforth.config.auth.usersResourceId;
+            const externalIdentityResource = this.options.chatExternalIdentityResource;
+            if (!externalIdentityResource) {
+                return null;
+            }
+            const surfaceIdentityConfig = externalIdentityResource.surfaces[adapter.name];
+            if (!surfaceIdentityConfig) {
+                return null;
+            }
+            const providerField = (_a = externalIdentityResource.providerField) !== null && _a !== void 0 ? _a : 'provider';
+            const subjectField = (_b = externalIdentityResource.subjectField) !== null && _b !== void 0 ? _b : 'subject';
+            const adminUserIdField = (_c = externalIdentityResource.adminUserIdField) !== null && _c !== void 0 ? _c : 'adminUserId';
+            const externalUserIdField = (_d = externalIdentityResource.externalUserIdField) !== null && _d !== void 0 ? _d : 'externalUserId';
+            const identityFilters = [
+                Filters.EQ(providerField, surfaceIdentityConfig.provider),
+                Filters.EQ(externalUserIdField, incoming.externalUserId),
+            ];
+            const identities = yield adminforth.resource(externalIdentityResource.resourceId).list(identityFilters);
+            const identity = identities.find((identity) => {
+                if (String(identity[externalUserIdField]) === incoming.externalUserId) {
+                    return true;
+                }
+                if (String(identity[subjectField]) === incoming.externalUserId) {
+                    return true;
+                }
+                return false;
+            });
+            if (!identity) {
+                return null;
+            }
+            const authResource = adminforth.config.resources.find((resource) => resource.resourceId === authResourceId);
+            const primaryKeyField = authResource.columns.find((column) => column.primaryKey).name;
+            return adminforth.resource(authResourceId).get([
+                Filters.EQ(primaryKeyField, identity[adminUserIdField]),
+            ]);
+        });
+    }
     handleMessage(adapter, incoming, sink) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (yield this.handleLink(incoming, sink)) {
                 return;
             }
@@ -240,8 +214,7 @@ export class ChatSurfaceService {
             const authResourceId = adminforth.config.auth.usersResourceId;
             const authResource = adminforth.config.resources.find((resource) => resource.resourceId === authResourceId);
             const primaryKeyField = authResource.columns.find((column) => column.primaryKey).name;
-            const externalUserIdField = (_a = this.options.chatExternalIdsField) !== null && _a !== void 0 ? _a : DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-            const adminUserRecord = (yield adminforth.resource(authResourceId).list(Filters.IS_NOT_EMPTY(externalUserIdField))).find((user) => { var _a; return ((_a = user[externalUserIdField]) === null || _a === void 0 ? void 0 : _a[adapter.name]) === incoming.externalUserId; });
+            const adminUserRecord = yield this.getAdminUserRecordForChatSurface(adapter, incoming);
             if (!adminUserRecord) {
                 yield sink.emit({
                     type: "error",

package/dist/endpoints/chatSurfaces.js

@@ -7,60 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD = "externalUserId";
 export function setupChatSurfaceEndpoints(ctx, server) {
     var _a;
-    if (ctx.getChatSurfaceConnectActionAdapters().length) {
-        server.endpoint({
-            method: "POST",
-            path: "/agent/surfaces/connectable",
-            handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser }) {
-                var _b, _c;
-                const externalUserIdField = (_b = ctx.options.chatExternalIdsField) !== null && _b !== void 0 ? _b : DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-                const externalIds = (_c = adminUser.dbUser[externalUserIdField]) !== null && _c !== void 0 ? _c : {};
-                return {
-                    surfaces: ctx.getChatSurfaceConnectActionAdapters().map((adapter) => {
-                        var _a;
-                        return ({
-                            name: adapter.name,
-                            externalUserId: (_a = externalIds[adapter.name]) !== null && _a !== void 0 ? _a : null,
-                        });
-                    }),
-                };
-            }),
-        });
-    }
     for (const adapter of (_a = ctx.options.chatSurfaceAdapters) !== null && _a !== void 0 ? _a : []) {
-        const connectActionAdapter = adapter;
-        if (connectActionAdapter.createConnectAction) {
-            server.endpoint({
-                method: "POST",
-                path: `/agent/surface/${adapter.name}/connect-action`,
-                handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser }) {
-                    const token = ctx.createChatSurfaceLinkToken(adapter.name, adminUser);
-                    const action = yield connectActionAdapter.createConnectAction({ token });
-                    return {
-                        action,
-                    };
-                }),
-            });
-            server.endpoint({
-                method: "POST",
-                path: `/agent/surface/${adapter.name}/disconnect`,
-                handler: (_a) => __awaiter(this, [_a], void 0, function* ({ adminUser }) {
-                    var _b, _c;
-                    const externalUserIdField = (_b = ctx.options.chatExternalIdsField) !== null && _b !== void 0 ? _b : DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-                    const externalIds = Object.assign({}, ((_c = adminUser.dbUser[externalUserIdField]) !== null && _c !== void 0 ? _c : {}));
-                    delete externalIds[adapter.name];
-                    yield ctx.adminforth.resource(ctx.adminforth.config.auth.usersResourceId).update(adminUser.pk, {
-                        [externalUserIdField]: externalIds,
-                    });
-                    return {
-                        ok: true,
-                    };
-                }),
-            });
-        }
         server.endpoint({
             method: "POST",
             noAuth: true,

package/dist/endpoints/context.d.ts

@@ -1,9 +1,7 @@
-import type { AdminUser, ChatSurfaceAdapter, ChatSurfaceEventSink, ChatSurfaceIncomingMessage, IAdminForth } from "adminforth";
+import type { ChatSurfaceAdapter, ChatSurfaceEventSink, ChatSurfaceIncomingMessage, IAdminForth } from "adminforth";
 import type { ZodType } from "zod";
 import type { HandleSpeechTurnInput, HandleTurnInput, RunAndPersistAgentResponseInput, RunAndPersistAgentResponseResult } from "../agentTurnService.js";
-import type { ChatSurfaceAdapterWithConnectAction } from "../chatSurfaceService.js";
 import type { PluginOptions } from "../types.js";
-export type { ChatSurfaceAdapterWithConnectAction } from "../chatSurfaceService.js";
 export type EndpointResponse = {
     setStatus: (code: number, message: string) => void;
 };
@@ -21,10 +19,8 @@ export type AgentEndpointsContext = {
     getSessionTurns(sessionId: string): Promise<SessionTurn[]>;
     createNewTurn(sessionId: string, prompt: string, response?: string): Promise<string>;
     createSystemTurn(sessionId: string, systemMessage: string): Promise<string>;
-    getChatSurfaceConnectActionAdapters(): ChatSurfaceAdapterWithConnectAction[];
-    createChatSurfaceLinkToken(surface: string, adminUser: AdminUser): string;
     handleChatSurfaceMessage(adapter: ChatSurfaceAdapter, incoming: ChatSurfaceIncomingMessage, sink: ChatSurfaceEventSink): Promise<void>;
 };
 export type CoreEndpointsContext = Pick<AgentEndpointsContext, "options" | "parseBody" | "handleTurn" | "handleSpeechTurn">;
 export type SessionEndpointsContext = Pick<AgentEndpointsContext, "adminforth" | "options" | "parseBody" | "getSessionTurns" | "createNewTurn" | "createSystemTurn">;
-export type ChatSurfaceEndpointsContext = Pick<AgentEndpointsContext, "adminforth" | "options" | "getChatSurfaceConnectActionAdapters" | "createChatSurfaceLinkToken" | "handleChatSurfaceMessage">;
+export type ChatSurfaceEndpointsContext = Pick<AgentEndpointsContext, "adminforth" | "options" | "handleChatSurfaceMessage">;

package/dist/index.d.ts

@@ -9,7 +9,6 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
     private sessionStore;
     private agentTurnService;
     private chatSurfaceService;
-    private chatSurfaceSettingsPageRegistered;
     private parseBody;
     private getCheckpointer;
     private getInternalAgentResourceIds;

package/dist/index.js

@@ -45,7 +45,6 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
     constructor(options) {
         super(options, import.meta.url);
         this.checkpointer = null;
-        this.chatSurfaceSettingsPageRegistered = false;
         this.options = options;
         this.sessionStore = new AgentSessionStore(() => this.adminforth, this.options);
         this.agentTurnService = new AgentTurnService({
@@ -84,19 +83,6 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
                     hasAudioAdapter: Boolean(this.options.audioAdapter),
                 }
             });
-            if (this.chatSurfaceService.getConnectActionAdapters().length && !this.chatSurfaceSettingsPageRegistered) {
-                if (!this.adminforth.config.auth.userMenuSettingsPages) {
-                    this.adminforth.config.auth.userMenuSettingsPages = [];
-                }
-                this.adminforth.config.auth.userMenuSettingsPages.push({
-                    icon: "flowbite:link-outline",
-                    pageLabel: "Chat Surfaces",
-                    slug: "chat-surfaces",
-                    component: this.componentPath("ChatSurfaceSettings.vue"),
-                    isVisible: () => true,
-                });
-                this.chatSurfaceSettingsPageRegistered = true;
-            }
             if (!this.adminforth.config.customization.customHeadItems) {
                 this.adminforth.config.customization.customHeadItems = [];
             }
@@ -139,8 +125,6 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
             getSessionTurns: this.sessionStore.getSessionTurns.bind(this.sessionStore),
             createNewTurn: this.sessionStore.createNewTurn.bind(this.sessionStore),
             createSystemTurn: this.sessionStore.createSystemTurn.bind(this.sessionStore),
-            getChatSurfaceConnectActionAdapters: this.chatSurfaceService.getConnectActionAdapters.bind(this.chatSurfaceService),
-            createChatSurfaceLinkToken: this.chatSurfaceService.createLinkToken.bind(this.chatSurfaceService),
             handleChatSurfaceMessage: this.chatSurfaceService.handleMessage.bind(this.chatSurfaceService),
         };
         setupCoreEndpoints(endpointContext, server);

package/dist/types.d.ts

@@ -91,8 +91,17 @@ export interface PluginOptions extends PluginsCommonOptions {
      */
     checkpointResource?: ICheckpointResource;
     /**
-     * Optional field for storing external chat IDs.
+     * Optional resource configuration for resolving chat users through OAuth external identities.
      */
-    chatExternalIdsField?: string;
+    chatExternalIdentityResource?: {
+        resourceId: string;
+        adminUserIdField?: string;
+        providerField?: string;
+        subjectField?: string;
+        externalUserIdField?: string;
+        surfaces: Record<string, {
+            provider: string;
+        }>;
+    };
 }
 export {};

package/endpoints/chatSurfaces.ts

@@ -2,66 +2,10 @@ import type {
   IAdminForthEndpointHandlerInput,
   IHttpServer,
 } from "adminforth";
-import type { ChatSurfaceAdapterWithConnectAction, ChatSurfaceEndpointsContext } from "./context.js";
-
-const DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD = "externalUserId";
+import type { ChatSurfaceEndpointsContext } from "./context.js";
 
 export function setupChatSurfaceEndpoints(ctx: ChatSurfaceEndpointsContext, server: IHttpServer) {
-  if (ctx.getChatSurfaceConnectActionAdapters().length) {
-    server.endpoint({
-      method: "POST",
-      path: "/agent/surfaces/connectable",
-      handler: async ({ adminUser }) => {
-        const externalUserIdField = ctx.options.chatExternalIdsField ?? DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-        const externalIds = adminUser!.dbUser[externalUserIdField] ?? {};
-
-        return {
-          surfaces: ctx.getChatSurfaceConnectActionAdapters().map((adapter) => ({
-            name: adapter.name,
-            externalUserId: externalIds[adapter.name] ?? null,
-          })),
-        };
-      },
-    });
-  }
-
   for (const adapter of ctx.options.chatSurfaceAdapters ?? []) {
-    const connectActionAdapter = adapter as ChatSurfaceAdapterWithConnectAction;
-    if (connectActionAdapter.createConnectAction) {
-      server.endpoint({
-        method: "POST",
-        path: `/agent/surface/${adapter.name}/connect-action`,
-        handler: async ({ adminUser }) => {
-          const token = ctx.createChatSurfaceLinkToken(adapter.name, adminUser!);
-          const action = await connectActionAdapter.createConnectAction!({ token });
-
-          return {
-            action,
-          };
-        },
-      });
-      server.endpoint({
-        method: "POST",
-        path: `/agent/surface/${adapter.name}/disconnect`,
-        handler: async ({ adminUser }) => {
-          const externalUserIdField = ctx.options.chatExternalIdsField ?? DEFAULT_ADMIN_USER_EXTERNAL_USER_ID_FIELD;
-          const externalIds = {
-            ...(adminUser!.dbUser[externalUserIdField] ?? {}),
-          };
-
-          delete externalIds[adapter.name];
-
-          await ctx.adminforth.resource(ctx.adminforth.config.auth!.usersResourceId!).update(adminUser!.pk, {
-            [externalUserIdField]: externalIds,
-          });
-
-          return {
-            ok: true,
-          };
-        },
-      });
-    }
-
     server.endpoint({
       method: "POST",
       noAuth: true,
@@ -74,8 +18,8 @@ export function setupChatSurfaceEndpoints(ctx: ChatSurfaceEndpointsContext, serv
           rawRequest: endpointInput._raw_express_req,
           rawResponse: endpointInput._raw_express_res,
         };
-        const incoming = await adapter.parseIncomingMessage(surfaceContext);
 
+        const incoming = await adapter.parseIncomingMessage(surfaceContext);
         if (!incoming) return { ok: true };
 
         const sink = await adapter.createEventSink(surfaceContext, incoming);

package/endpoints/context.ts

@@ -1,5 +1,4 @@
 import type {
-  AdminUser,
   ChatSurfaceAdapter,
   ChatSurfaceEventSink,
   ChatSurfaceIncomingMessage,
@@ -12,11 +11,8 @@ import type {
   RunAndPersistAgentResponseInput,
   RunAndPersistAgentResponseResult,
 } from "../agentTurnService.js";
-import type { ChatSurfaceAdapterWithConnectAction } from "../chatSurfaceService.js";
 import type { PluginOptions } from "../types.js";
 
-export type { ChatSurfaceAdapterWithConnectAction } from "../chatSurfaceService.js";
-
 export type EndpointResponse = {
   setStatus: (code: number, message: string) => void;
 };
@@ -36,8 +32,6 @@ export type AgentEndpointsContext = {
   getSessionTurns(sessionId: string): Promise<SessionTurn[]>;
   createNewTurn(sessionId: string, prompt: string, response?: string): Promise<string>;
   createSystemTurn(sessionId: string, systemMessage: string): Promise<string>;
-  getChatSurfaceConnectActionAdapters(): ChatSurfaceAdapterWithConnectAction[];
-  createChatSurfaceLinkToken(surface: string, adminUser: AdminUser): string;
   handleChatSurfaceMessage(
     adapter: ChatSurfaceAdapter,
     incoming: ChatSurfaceIncomingMessage,
@@ -60,7 +54,5 @@ export type ChatSurfaceEndpointsContext = Pick<
   AgentEndpointsContext,
   | "adminforth"
   | "options"
-  | "getChatSurfaceConnectActionAdapters"
-  | "createChatSurfaceLinkToken"
   | "handleChatSurfaceMessage"
 >;

package/index.ts

@@ -28,7 +28,6 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
   private sessionStore: AgentSessionStore;
   private agentTurnService: AgentTurnService;
   private chatSurfaceService: ChatSurfaceService;
-  private chatSurfaceSettingsPageRegistered = false;
   private parseBody<T>(
     schema: z.ZodType<T>,
     body: unknown,
@@ -103,19 +102,6 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
         hasAudioAdapter: Boolean(this.options.audioAdapter),
       }
     });
-    if (this.chatSurfaceService.getConnectActionAdapters().length && !this.chatSurfaceSettingsPageRegistered) {
-      if (!this.adminforth.config.auth!.userMenuSettingsPages) {
-        this.adminforth.config.auth!.userMenuSettingsPages = [];
-      }
-      this.adminforth.config.auth!.userMenuSettingsPages.push({
-        icon: "flowbite:link-outline",
-        pageLabel: "Chat Surfaces",
-        slug: "chat-surfaces",
-        component: this.componentPath("ChatSurfaceSettings.vue"),
-        isVisible: () => true,
-      });
-      this.chatSurfaceSettingsPageRegistered = true;
-    }
     if (!this.adminforth.config.customization.customHeadItems) {
       this.adminforth.config.customization.customHeadItems = [];
     }
@@ -165,8 +151,6 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
       getSessionTurns: this.sessionStore.getSessionTurns.bind(this.sessionStore),
       createNewTurn: this.sessionStore.createNewTurn.bind(this.sessionStore),
       createSystemTurn: this.sessionStore.createSystemTurn.bind(this.sessionStore),
-      getChatSurfaceConnectActionAdapters: this.chatSurfaceService.getConnectActionAdapters.bind(this.chatSurfaceService),
-      createChatSurfaceLinkToken: this.chatSurfaceService.createLinkToken.bind(this.chatSurfaceService),
       handleChatSurfaceMessage: this.chatSurfaceService.handleMessage.bind(this.chatSurfaceService),
     } satisfies AgentEndpointsContext;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.46.0",
+  "version": "1.47.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/types.ts

@@ -112,7 +112,16 @@ export interface PluginOptions extends PluginsCommonOptions {
   checkpointResource?: ICheckpointResource;
 
   /**
-   * Optional field for storing external chat IDs.
+   * Optional resource configuration for resolving chat users through OAuth external identities.
    */
-  chatExternalIdsField?: string;
+  chatExternalIdentityResource?: {
+    resourceId: string;
+    adminUserIdField?: string;
+    providerField?: string;
+    subjectField?: string;
+    externalUserIdField?: string;
+    surfaces: Record<string, {
+      provider: string;
+    }>;
+  };
 }

package/custom/ChatSurfaceSettings.vue

@@ -1,125 +0,0 @@
-<template>
-  <div class="flex flex-col justify-center mr-6 md:mr-12">
-    <h2 class="flex items-start justify-start leading-none text-gray-800 dark:text-gray-50 text-3xl font-semibold">
-      {{ $t('Chat Surfaces') }}
-    </h2>
-    <p class="text-sm mt-3">
-      {{ $t('Connect external chat accounts to your AdminForth user') }}
-    </p>
-
-    <div class="mt-6 flex flex-wrap gap-4">
-      <div
-        v-for="surface in surfaces"
-        :key="surface.name"
-        class="flex flex-col w-full lg:w-72 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-4 shadow-sm"
-      >
-        <div class="flex items-center justify-between gap-3 mb-4">
-          <div class="min-w-0">
-            <p class="font-semibold text-gray-900 dark:text-white truncate">
-              {{ formatSurfaceName(surface.name) }}
-            </p>
-            <p class="text-xs text-gray-500 dark:text-gray-400">
-              {{ surface.externalUserId || $t('Not connected') }}
-            </p>
-          </div>
-          <span
-            class="shrink-0 inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium"
-            :class="surface.externalUserId
-              ? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200'
-              : 'bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300'"
-          >
-            {{ surface.externalUserId ? $t('Active') : $t('Inactive') }}
-          </span>
-        </div>
-
-        <div class="grid gap-2 mt-auto" :class="surface.externalUserId ? 'grid-cols-2' : 'grid-cols-1'">
-          <Button
-            class="w-full"
-            :disabled="isSurfaceBusy(surface.name)"
-            :loader="connectingSurfaceName === surface.name"
-            @click="connectSurface(surface.name)"
-          >
-            {{ surface.externalUserId ? $t('Reconnect') : $t('Connect') }}
-          </Button>
-          <Button
-            v-if="surface.externalUserId"
-            class="w-full"
-            :disabled="isSurfaceBusy(surface.name)"
-            :loader="disconnectingSurfaceName === surface.name"
-            @click="disconnectSurface(surface.name)"
-          >
-            {{ $t('Disconnect') }}
-          </Button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import { Button } from '@/afcl';
-import { callAdminForthApi } from '@/utils';
-
-type ChatSurface = {
-  name: string;
-  externalUserId: string | null;
-};
-
-const surfaces = ref<ChatSurface[]>([]);
-const connectingSurfaceName = ref<string | null>(null);
-const disconnectingSurfaceName = ref<string | null>(null);
-
-onMounted(loadSurfaces);
-
-async function loadSurfaces() {
-  const response = await callAdminForthApi({
-    method: 'POST',
-    path: '/agent/surfaces/connectable',
-    body: {},
-  });
-
-  surfaces.value = response.surfaces;
-}
-
-async function connectSurface(surfaceName: string) {
-  connectingSurfaceName.value = surfaceName;
-
-  try {
-    const response = await callAdminForthApi({
-      method: 'POST',
-      path: `/agent/surface/${surfaceName}/connect-action`,
-      body: {},
-    });
-
-    if (response.action.type === 'url') {
-      window.open(response.action.url, '_blank', 'noopener,noreferrer');
-    }
-  } finally {
-    connectingSurfaceName.value = null;
-  }
-}
-
-async function disconnectSurface(surfaceName: string) {
-  disconnectingSurfaceName.value = surfaceName;
-
-  try {
-    await callAdminForthApi({
-      method: 'POST',
-      path: `/agent/surface/${surfaceName}/disconnect`,
-      body: {},
-    });
-    await loadSurfaces();
-  } finally {
-    disconnectingSurfaceName.value = null;
-  }
-}
-
-function isSurfaceBusy(surfaceName: string) {
-  return connectingSurfaceName.value === surfaceName || disconnectingSurfaceName.value === surfaceName;
-}
-
-function formatSurfaceName(surfaceName: string) {
-  return surfaceName.charAt(0).toUpperCase() + surfaceName.slice(1);
-}
-</script>

package/dist/custom/ChatSurfaceSettings.vue

@@ -1,125 +0,0 @@
-<template>
-  <div class="flex flex-col justify-center mr-6 md:mr-12">
-    <h2 class="flex items-start justify-start leading-none text-gray-800 dark:text-gray-50 text-3xl font-semibold">
-      {{ $t('Chat Surfaces') }}
-    </h2>
-    <p class="text-sm mt-3">
-      {{ $t('Connect external chat accounts to your AdminForth user') }}
-    </p>
-
-    <div class="mt-6 flex flex-wrap gap-4">
-      <div
-        v-for="surface in surfaces"
-        :key="surface.name"
-        class="flex flex-col w-full lg:w-72 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-4 shadow-sm"
-      >
-        <div class="flex items-center justify-between gap-3 mb-4">
-          <div class="min-w-0">
-            <p class="font-semibold text-gray-900 dark:text-white truncate">
-              {{ formatSurfaceName(surface.name) }}
-            </p>
-            <p class="text-xs text-gray-500 dark:text-gray-400">
-              {{ surface.externalUserId || $t('Not connected') }}
-            </p>
-          </div>
-          <span
-            class="shrink-0 inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium"
-            :class="surface.externalUserId
-              ? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200'
-              : 'bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300'"
-          >
-            {{ surface.externalUserId ? $t('Active') : $t('Inactive') }}
-          </span>
-        </div>
-
-        <div class="grid gap-2 mt-auto" :class="surface.externalUserId ? 'grid-cols-2' : 'grid-cols-1'">
-          <Button
-            class="w-full"
-            :disabled="isSurfaceBusy(surface.name)"
-            :loader="connectingSurfaceName === surface.name"
-            @click="connectSurface(surface.name)"
-          >
-            {{ surface.externalUserId ? $t('Reconnect') : $t('Connect') }}
-          </Button>
-          <Button
-            v-if="surface.externalUserId"
-            class="w-full"
-            :disabled="isSurfaceBusy(surface.name)"
-            :loader="disconnectingSurfaceName === surface.name"
-            @click="disconnectSurface(surface.name)"
-          >
-            {{ $t('Disconnect') }}
-          </Button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import { Button } from '@/afcl';
-import { callAdminForthApi } from '@/utils';
-
-type ChatSurface = {
-  name: string;
-  externalUserId: string | null;
-};
-
-const surfaces = ref<ChatSurface[]>([]);
-const connectingSurfaceName = ref<string | null>(null);
-const disconnectingSurfaceName = ref<string | null>(null);
-
-onMounted(loadSurfaces);
-
-async function loadSurfaces() {
-  const response = await callAdminForthApi({
-    method: 'POST',
-    path: '/agent/surfaces/connectable',
-    body: {},
-  });
-
-  surfaces.value = response.surfaces;
-}
-
-async function connectSurface(surfaceName: string) {
-  connectingSurfaceName.value = surfaceName;
-
-  try {
-    const response = await callAdminForthApi({
-      method: 'POST',
-      path: `/agent/surface/${surfaceName}/connect-action`,
-      body: {},
-    });
-
-    if (response.action.type === 'url') {
-      window.open(response.action.url, '_blank', 'noopener,noreferrer');
-    }
-  } finally {
-    connectingSurfaceName.value = null;
-  }
-}
-
-async function disconnectSurface(surfaceName: string) {
-  disconnectingSurfaceName.value = surfaceName;
-
-  try {
-    await callAdminForthApi({
-      method: 'POST',
-      path: `/agent/surface/${surfaceName}/disconnect`,
-      body: {},
-    });
-    await loadSurfaces();
-  } finally {
-    disconnectingSurfaceName.value = null;
-  }
-}
-
-function isSurfaceBusy(surfaceName: string) {
-  return connectingSurfaceName.value === surfaceName || disconnectingSurfaceName.value === surfaceName;
-}
-
-function formatSurfaceName(surfaceName: string) {
-  return surfaceName.charAt(0).toUpperCase() + surfaceName.slice(1);
-}
-</script>