Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 24 additions & 10 deletions packages/react/src/lib/auth.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
async function saveTokenLocalStorage(token) {
async function saveTokenLocalStorage(token, key = 'ec_token') {
if (typeof localStorage !== 'undefined') {
localStorage.setItem('ec_token', token);
localStorage.setItem(key, token);
}
}

async function getTokenLocalStorage() {
async function getTokenLocalStorage(key = 'ec_token') {
if (typeof localStorage !== 'undefined') {
return localStorage.getItem('ec_token');
const token = localStorage.getItem(key);
if (token) {
return token;
}
// Backward compatibility: fallback and migrate legacy 'ec_token' if namespaced key is empty
if (key !== 'ec_token') {
const legacyToken = localStorage.getItem('ec_token');
if (legacyToken) {
localStorage.setItem(key, legacyToken);
return legacyToken;
}
}
}
return null;
}

async function deleteTokenLocalStorage() {
async function deleteTokenLocalStorage(key = 'ec_token') {
if (typeof localStorage !== 'undefined') {
localStorage.removeItem('ec_token');
localStorage.removeItem(key);
if (key !== 'ec_token') {
localStorage.removeItem('ec_token');
}
}
}

Expand All @@ -30,7 +44,7 @@ async function deleteTokenSecure() {
this.handleSecureLogin('delete');
}

export function getTokenStorage(secure = false) {
export function getTokenStorage(secure = false, key = 'ec_token') {
if (secure) {
return {
saveToken: saveTokenSecure,
Expand All @@ -39,8 +53,8 @@ export function getTokenStorage(secure = false) {
};
}
return {
saveToken: saveTokenLocalStorage,
getToken: getTokenLocalStorage,
deleteToken: deleteTokenLocalStorage,
saveToken: (token) => saveTokenLocalStorage(token, key),
getToken: () => getTokenLocalStorage(key),
deleteToken: () => deleteTokenLocalStorage(key),
};
}
18 changes: 17 additions & 1 deletion packages/react/src/views/EmbeddedChat.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const EmbeddedChat = (props) => {
dark = false,
remoteOpt = false,
layoutMode = 'bubble',
tokenStorageKey = null,
} = config;

const auth = useMemo(
Expand All @@ -79,7 +80,21 @@ const EmbeddedChat = (props) => {
const { classNames, styleOverrides } = useComponentOverrides('EmbeddedChat');
const [fullScreen, setFullScreen] = useState(false);
const [isSynced, setIsSynced] = useState(!remoteOpt);
const { getToken, saveToken, deleteToken } = getTokenStorage(secure);
const storageKey = useMemo(() => {
if (tokenStorageKey) {
return tokenStorageKey;
}
if (host) {
const normalizedHost = host.trim().replace(/\/+$/, '');
return `ec_token_${normalizedHost}`;
}
return 'ec_token';
}, [tokenStorageKey, host]);

const { getToken, saveToken, deleteToken } = useMemo(
() => getTokenStorage(secure, storageKey),
[secure, storageKey]
);
const {
setIsUserAuthenticated,
setUsername: setAuthenticatedUsername,
Expand Down Expand Up @@ -356,6 +371,7 @@ EmbeddedChat.propTypes = {
style: PropTypes.object,
hideHeader: PropTypes.bool,
dark: PropTypes.bool,
tokenStorageKey: PropTypes.string,
aiAdapter: PropTypes.shape({
name: PropTypes.string,
sendPrompt: PropTypes.func.isRequired,
Expand Down