refactor: remove externalSource references from various components for consistency
This commit is contained in:
@@ -828,7 +828,6 @@ function WechatMPAccessGuide({ channelId }: { channelId: string }) {
|
||||
}
|
||||
const url = new URL("/kefu/chat/", origin)
|
||||
url.searchParams.set("channelId", channelId)
|
||||
url.searchParams.set("externalSource", "wechat_mp")
|
||||
return url.toString()
|
||||
}, [channelId, origin])
|
||||
|
||||
|
||||
+1
-7
@@ -104,7 +104,6 @@ export type ImAsset = {
|
||||
export type ImWidgetConfig = {
|
||||
channelId?: string
|
||||
channelType?: string
|
||||
externalSource?: string
|
||||
userToken?: string
|
||||
title?: string
|
||||
subtitle?: string
|
||||
@@ -118,8 +117,6 @@ const API_BASE_URL =
|
||||
process.env.NEXT_PUBLIC_API_BASE_URL?.trim() || ""
|
||||
const OPEN_IM_CHANNEL_ID =
|
||||
process.env.NEXT_PUBLIC_OPEN_IM_CHANNEL_ID?.trim() || ""
|
||||
const OPEN_IM_EXTERNAL_SOURCE =
|
||||
process.env.NEXT_PUBLIC_OPEN_IM_EXTERNAL_SOURCE?.trim() || "web_chat"
|
||||
|
||||
function buildGuestId() {
|
||||
return `guest_${generateUUID()}`
|
||||
@@ -146,8 +143,6 @@ function getRuntimeImConfig() {
|
||||
return {
|
||||
baseUrl,
|
||||
channelId: widgetConfig.channelId || OPEN_IM_CHANNEL_ID,
|
||||
externalSource:
|
||||
(widgetConfig.externalSource || OPEN_IM_EXTERNAL_SOURCE).trim() || "web_chat",
|
||||
externalId: (widgetConfig.externalId || "").trim(),
|
||||
externalName: (widgetConfig.externalName || "").trim(),
|
||||
userToken: (widgetConfig.userToken || "").trim(),
|
||||
@@ -162,7 +157,6 @@ function createImHeaders() {
|
||||
if (config.userToken) {
|
||||
headers.Authorization = `Bearer ${config.userToken}`
|
||||
} else {
|
||||
headers["X-External-Source"] = config.externalSource
|
||||
headers["X-External-Id"] = config.externalId || getGuestId()
|
||||
if (config.externalName) {
|
||||
headers["X-External-Name"] = encodeURIComponent(config.externalName)
|
||||
@@ -218,7 +212,7 @@ export function fetchImMessages(
|
||||
)
|
||||
}
|
||||
|
||||
/** 外部身份仅通过 createImHeaders()(Authorization 或 X-External-*)传递,无 JSON body */
|
||||
/** 外部身份仅通过 createImHeaders()(Authorization 或 X-External-Id/Name)传递,无 JSON body */
|
||||
export function createOrMatchImConversation() {
|
||||
return request<ImConversation>("/api/conversation/create_or_match", {
|
||||
...createRequestOptions({ method: "POST" }),
|
||||
|
||||
@@ -22,9 +22,6 @@ export function createImRealtimeConnection() {
|
||||
const resolvedExternalId = encodeURIComponent(
|
||||
(config.externalId ?? "").trim() || getGuestId()
|
||||
)
|
||||
const externalSource = encodeURIComponent(
|
||||
(config.externalSource ?? "web_chat").trim() || "web_chat"
|
||||
)
|
||||
const channelId = encodeURIComponent(config.channelId || "")
|
||||
const userToken = (config.userToken ?? "").trim()
|
||||
if (userToken) {
|
||||
@@ -38,6 +35,6 @@ export function createImRealtimeConnection() {
|
||||
? `&externalName=${encodeURIComponent(externalName)}`
|
||||
: ""
|
||||
return new WebSocket(
|
||||
`${baseUrl}/api/ws/open?externalId=${resolvedExternalId}&externalSource=${externalSource}&channelId=${channelId}${nameQuery}`
|
||||
`${baseUrl}/api/ws/open?externalId=${resolvedExternalId}&channelId=${channelId}${nameQuery}`
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2,8 +2,6 @@ export type KefuWidgetHostConfig = {
|
||||
channelId: string
|
||||
baseUrl: string
|
||||
apiBaseUrl?: string
|
||||
/** 与后端 enums.ExternalSource 一致,默认 web_chat */
|
||||
externalSource?: string
|
||||
/** 外部访客稳定标识;未传时使用浏览器本地访客 ID */
|
||||
externalId?: string
|
||||
/** 访客展示名,随请求以 X-External-Name / WS query externalName 传给后端 */
|
||||
@@ -48,10 +46,6 @@ export function readKefuWidgetConfig(): KefuWidgetHostConfig {
|
||||
query.get("apiBaseUrl") ??
|
||||
process.env.NEXT_PUBLIC_API_BASE_URL?.trim() ??
|
||||
undefined,
|
||||
externalSource:
|
||||
query.get("externalSource") ??
|
||||
process.env.NEXT_PUBLIC_OPEN_IM_EXTERNAL_SOURCE?.trim() ??
|
||||
undefined,
|
||||
externalId: query.get("externalId") ?? undefined,
|
||||
externalName: query.get("externalName") ?? undefined,
|
||||
userToken: query.get("userToken") ?? undefined,
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
position: "right",
|
||||
themeColor: "#0f6cbd",
|
||||
width: "380px",
|
||||
externalSource: "web_chat",
|
||||
};
|
||||
|
||||
var state = window.__CS_AGENT_WIDGET_STATE__;
|
||||
@@ -47,7 +46,6 @@
|
||||
delete merged.apiBaseUrl;
|
||||
}
|
||||
merged.channelId = String(merged.channelId || "");
|
||||
merged.externalSource = String(merged.externalSource || "web_chat");
|
||||
if (merged.userToken) {
|
||||
merged.userToken = String(merged.userToken);
|
||||
}
|
||||
@@ -68,7 +66,6 @@
|
||||
frameUrl.searchParams.set("channelId", config.channelId);
|
||||
frameUrl.searchParams.set("baseUrl", config.baseUrl);
|
||||
if (config.apiBaseUrl) frameUrl.searchParams.set("apiBaseUrl", config.apiBaseUrl);
|
||||
if (config.externalSource) frameUrl.searchParams.set("externalSource", config.externalSource);
|
||||
if (config.externalName) frameUrl.searchParams.set("externalName", config.externalName);
|
||||
if (config.userToken) frameUrl.searchParams.set("userToken", config.userToken);
|
||||
return frameUrl;
|
||||
|
||||
@@ -268,12 +268,10 @@ export const useKefuChatStore = create<KefuChatStore>((set, get) => {
|
||||
return
|
||||
}
|
||||
|
||||
if (widgetConfig.channelId || widgetConfig.externalSource) {
|
||||
if (widgetConfig.channelId) {
|
||||
setKefuWidgetConfig({
|
||||
...readKefuWidgetConfig(),
|
||||
channelId: widgetConfig.channelId || readKefuWidgetConfig().channelId,
|
||||
externalSource:
|
||||
widgetConfig.externalSource || readKefuWidgetConfig().externalSource,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
position: "right",
|
||||
themeColor: "#0f6cbd",
|
||||
width: "380px",
|
||||
externalSource: "web_chat",
|
||||
};
|
||||
|
||||
var state = window.__CS_AGENT_WIDGET_STATE__;
|
||||
@@ -42,7 +41,6 @@
|
||||
merged.baseUrl = String(merged.baseUrl || window.location.origin).replace(/\/$/, "");
|
||||
merged.apiBaseUrl = String(merged.apiBaseUrl || merged.baseUrl).replace(/\/$/, "");
|
||||
merged.channelId = String(merged.channelId || "");
|
||||
merged.externalSource = String(merged.externalSource || "web_chat");
|
||||
if (merged.userToken) {
|
||||
merged.userToken = String(merged.userToken);
|
||||
}
|
||||
@@ -63,7 +61,6 @@
|
||||
frameUrl.searchParams.set("channelId", config.channelId);
|
||||
frameUrl.searchParams.set("baseUrl", config.baseUrl);
|
||||
if (config.apiBaseUrl) frameUrl.searchParams.set("apiBaseUrl", config.apiBaseUrl);
|
||||
if (config.externalSource) frameUrl.searchParams.set("externalSource", config.externalSource);
|
||||
if (config.title) frameUrl.searchParams.set("title", config.title);
|
||||
if (config.subtitle) frameUrl.searchParams.set("subtitle", config.subtitle);
|
||||
if (config.position) frameUrl.searchParams.set("position", config.position);
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user