From 96d077fd6611d3afa68c73d1a2d50666ee42d3b5 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Fri, 6 Oct 2023 14:36:38 -0700 Subject: [PATCH] switching to / for token separator --- app/mobile/src/access/login/useLogin.hook.js | 4 ++-- app/mobile/src/context/useAppContext.hook.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/mobile/src/access/login/useLogin.hook.js b/app/mobile/src/access/login/useLogin.hook.js index 6a938bb6..9f93d14a 100644 --- a/app/mobile/src/access/login/useLogin.hook.js +++ b/app/mobile/src/access/login/useLogin.hook.js @@ -31,10 +31,10 @@ export function useLogin() { }, [app.state.session]); useEffect(() => { - if (state.password && state.login && !state.enabled && state.login.includes('@')) { + if (state.password && state.login && !state.enabled && (state.login.includes('@') || state.login.includes('/'))) { updateState({ enabled: true }); } - if ((!state.password || !state.login || !state.login.includes('@')) && state.enabled) { + if ((!state.password || !state.login || (!state.login.includes('@') && !state.login.includes('/'))) && state.enabled) { updateState({ enabled: false }); } }, [state.login, state.password]); diff --git a/app/mobile/src/context/useAppContext.hook.js b/app/mobile/src/context/useAppContext.hook.js index b32ac7c5..b63fd4f0 100644 --- a/app/mobile/src/context/useAppContext.hook.js +++ b/app/mobile/src/context/useAppContext.hook.js @@ -139,7 +139,7 @@ export function useAppContext() { throw new Error('invalid session state'); } updateState({ loggedOut: false }); - const acc = username.split('@'); + const acc = username.includes('/') ? username.split('/') : username.split('@'); const session = await setLogin(acc[0], acc[1], password, getApplicationName(), getVersion(), getDeviceId(), deviceToken.current, pushType.current, notifications) access.current = { loginTimestamp: session.created, server: acc[1], token: session.appToken, guid: session.guid }; await store.actions.setSession(access.current);