Skip to content

Commit f42d10b

Browse files
authored
Merge pull request #65 from Terraform-GUI/test
merge
2 parents 776df69 + 6a5e794 commit f42d10b

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

api/src/Security/UserChecker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function checkPreAuth(UserInterface $user): void
1515
return;
1616
}
1717

18-
if (null !== $user->getToken()) {
18+
if (null !== $user->getToken() && !$user->getViaGithub()) {
1919
throw new CustomUserMessageAccountStatusException('Please verify your email address');
2020
}
2121
}

web/src/api/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ function buildServices() {
3838
}
3939
}).catch(function (error) {
4040
console.log(error);
41-
window.location = '/home' as any;
4241
});
4342
}
4443
});

web/src/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ function isLogged() {
2525
const urlParams = new URLSearchParams(window.location.search);
2626
const accessToken = urlParams.get('token');
2727
const refreshToken = urlParams.get('refresh_token');
28-
if(accessToken && refreshToken){
28+
if(accessToken != null && refreshToken != null){
2929
localStorage.setItem('access_token', accessToken);
3030
localStorage.setItem('refresh_token', refreshToken);
3131
}
3232

33-
return !!localStorage.getItem('access_token');
33+
return !!localStorage.getItem('access_token') && localStorage.getItem('access_token') != null;
3434
}
3535

3636
root.render(

0 commit comments

Comments
 (0)