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

relay-management-fixed #83

Closed
y wants to merge 4 commits from relay-management-fixed into staging
pull from: relay-management-fixed
merge into: sigit:staging
Conversation 0 Commits 4 Files Changed 5 +14 -8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3b704d2500 - Show all commits

5
src/controllers/AuthController.ts
View File

@ -86,6 +86,10 @@ export class AuthController {
store.dispatch(setRelayMapAction(relayMap.map)) store.dispatch(setRelayMapAction(relayMap.map))
} }
const currentLocation = window.location.hash.replace('#', '')
if (!Object.values(appPrivateRoutes).includes(currentLocation)) {
// User did change the location to one of the private routes
const visitedLink = getVisitedLink() const visitedLink = getVisitedLink()
if (visitedLink) { if (visitedLink) {
@ -97,6 +101,7 @@ export class AuthController {
return Promise.resolve(appPrivateRoutes.homePage) return Promise.resolve(appPrivateRoutes.homePage)
} }
} }
}
checkSession() { checkSession() {
const savedAuthToken = getAuthToken() const savedAuthToken = getAuthToken()

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

@ -82,7 +82,8 @@ export const Login = () => {
const redirectPath = const redirectPath =
await authController.authAndGetMetadataAndRelaysMap(pubkey) await authController.authAndGetMetadataAndRelaysMap(pubkey)
navigateAfterLogin(redirectPath) if (redirectPath) navigateAfterLogin(redirectPath)
}) })
.catch((err) => { .catch((err) => {
toast.error('Error capturing public key from nostr extension: ' + err) toast.error('Error capturing public key from nostr extension: ' + err)