beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix routing on redirect to creds page

Browse source
This commit is contained in:
Neeraj Gupta 2023-03-20 11:00:33 +05:30
parent 7c8739a57b
commit e8d8ffacc9
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/pages/authenticator/index.tsx
View file

@ -3,8 +3,11 @@ import OTPDisplay from 'components/Authenicator/OTPDisplay';
import { getAuthCodes } from 'services/authenticator/authenticatorService'; import { getAuthCodes } from 'services/authenticator/authenticatorService';
import { Button } from '@mui/material'; import { Button } from '@mui/material';
import { CustomError } from 'utils/error'; import { CustomError } from 'utils/error';
import { PAGES } from 'constants/pages';
import { useRouter } from 'next/router';
const OTPPage = () => { const OTPPage = () => {
const router = useRouter();
const [codes, setCodes] = useState([]); const [codes, setCodes] = useState([]);
const [searchTerm, setSearchTerm] = useState(''); const [searchTerm, setSearchTerm] = useState('');
@ -17,10 +20,12 @@ const OTPPage = () => {
}) })
.catch((err) => { .catch((err) => {
if (err.message === CustomError.KEY_MISSING) { if (err.message === CustomError.KEY_MISSING) {
window.location.href = '/'; router.push({
pathname: PAGES.CREDENTIALS,
query: { redirectPage: PAGES.AUTHENICATOR },
});
return; return;
} }
console.error('something wrong here', err); console.error('something wrong here', err);
}); });
} catch (error) { } catch (error) {

4
src/pages/credentials/index.tsx
View file

@ -30,6 +30,8 @@ import VerifyMasterPasswordForm, {
export default function Credentials() { export default function Credentials() {
const router = useRouter(); const router = useRouter();
const routeReidrectPage =
router.query.redirectPage?.toString() ?? PAGES.GALLERY;
const [keyAttributes, setKeyAttributes] = useState<KeyAttributes>(); const [keyAttributes, setKeyAttributes] = useState<KeyAttributes>();
const appContext = useContext(AppContext); const appContext = useContext(AppContext);
const [user, setUser] = useState<User>(); const [user, setUser] = useState<User>();
@ -85,7 +87,7 @@ export default function Credentials() {
await decryptAndStoreToken(key); await decryptAndStoreToken(key);
const redirectURL = appContext.redirectURL; const redirectURL = appContext.redirectURL;
appContext.setRedirectURL(null); appContext.setRedirectURL(null);
router.push(redirectURL ?? PAGES.GALLERY); router.push(redirectURL ?? routeReidrectPage ?? PAGES.GALLERY);
} catch (e) { } catch (e) {
logError(e, 'useMasterPassword failed'); logError(e, 'useMasterPassword failed');
} }