sigit/sigit.io
7
2
Fork 0
Code Issues 51 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

issue-47 #59

Merged
y merged 2 commits from issue-47 into main 2024-05-17 13:39:01 +00:00
Conversation 0 Commits 2 Files Changed 2 +5 -10
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1f16c33b2 - Show all commits

13
src/App.tsx
View File

@ -35,7 +35,9 @@ const App = () => {
const handleRootRedirect = () => { const handleRootRedirect = () => {
if (authState.loggedIn) return appPrivateRoutes.homePage if (authState.loggedIn) return appPrivateRoutes.homePage
const callbackPathEncoded = btoa(window.location.href.split(`${window.location.origin}/#`)[1]) const callbackPathEncoded = btoa(
window.location.href.split(`${window.location.origin}/#`)[1]
)
return `${appPublicRoutes.login}?callbackPath=${callbackPathEncoded}` return `${appPublicRoutes.login}?callbackPath=${callbackPathEncoded}`
} }
@ -72,14 +74,7 @@ const App = () => {
} }
})} })}
<Route <Route path="*" element={<Navigate to={handleRootRedirect()} />} />
path="*"
element={
<Navigate
to={handleRootRedirect()}
/>
}
/>
</Route> </Route>
</Routes> </Routes>
) )

2
src/pages/login/index.tsx
View File

@ -57,7 +57,7 @@ export const Login = () => {
const navigateAfterLogin = (path: string) => { const navigateAfterLogin = (path: string) => {
const callbackPath = searchParams.get('callbackPath') const callbackPath = searchParams.get('callbackPath')
if (callbackPath) { if (callbackPath) {
// base64 decoded path // base64 decoded path
const path = atob(callbackPath) const path = atob(callbackPath)