Skip to content

fix(auth): namespace storage key to prevent cross-instance collision #1110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepak0x wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(auth): namespace storage key to prevent cross-instance collision #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 17 additions & 23 deletions packages/react/src/lib/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
async function saveTokenLocalStorage(token) {
if (typeof localStorage !== 'undefined') {
localStorage.setItem('ec_token', token);
}
}

async function getTokenLocalStorage() {
if (typeof localStorage !== 'undefined') {
return localStorage.getItem('ec_token');
}
return null;
}

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

async function saveTokenSecure(token) {
this.handleSecureLogin('save', token);
}
Expand All @@ -30,7 +11,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 +20,21 @@ export function getTokenStorage(secure = false) {
};
}
return {
saveToken: saveTokenLocalStorage,
getToken: getTokenLocalStorage,
deleteToken: deleteTokenLocalStorage,
saveToken: (token) => {
if (typeof localStorage !== 'undefined') {
localStorage.setItem(key, token);
}
},
getToken: () => {
if (typeof localStorage !== 'undefined') {
return localStorage.getItem(key);
}
return null;
},
deleteToken: () => {
if (typeof localStorage !== 'undefined') {
localStorage.removeItem(key);
}
},
};
}
9 changes: 8 additions & 1 deletion packages/react/src/views/EmbeddedChat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,14 @@ 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(
() => `ec_token_${host}_${roomId}`,
[host, roomId]
);
const { getToken, saveToken, deleteToken } = useMemo(
() => getTokenStorage(secure, storageKey),
[secure, storageKey]
);
const {
setIsUserAuthenticated,
setUsername: setAuthenticatedUsername,
Expand Down