grassrootseconomics/cic-staff-client
7
0
Fork 0
Code Issues 26 Pull Requests Projects Releases Wiki Activity

login button was taking two clicks

Browse Source
This commit is contained in:
Blair Vanderlugt 2021-06-10 15:59:11 -07:00
parent 61bf336789
commit df395b7b61
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/app/_services/auth.service.ts
View File

@ -95,39 +95,39 @@ export class AuthService {
async login(): Promise<boolean> { async login(): Promise<boolean> {
if (AuthService.getSessionToken()) { if (AuthService.getSessionToken()) {
sessionStorage.removeItem(btoa('CICADA_SESSION_TOKEN')); sessionStorage.removeItem(btoa('CICADA_SESSION_TOKEN'));
} else { }
const o = await this.getChallenge(); const o = await this.getChallenge();
const r = await signChallenge( const r = await signChallenge(
o.challenge, o.challenge,
o.realm, o.realm,
environment.cicMetaUrl, environment.cicMetaUrl,
this.mutableKeyStore this.mutableKeyStore
); );
const tokenResponse = await this.sendSignedChallenge(r) const tokenResponse = await this.sendSignedChallenge(r)
.then(response => { .then(response => {
const token = response.headers.get('Token') const token = response.headers.get('Token')
if (token) { if (token) {
return token return token
} }
if (response.status === 401) { if (response.status === 401) {
let e = new HttpError("You are not authorized to use this system", response.status) let e = new HttpError("You are not authorized to use this system", response.status)
throw e throw e
} }
if (!response.ok) { if (!response.ok) {
let e = new HttpError("Unknown error from authentication server", response.status) let e = new HttpError("Unknown error from authentication server", response.status)
throw e throw e
} }
}) })
if (tokenResponse) { if (tokenResponse) {
this.setSessionToken(tokenResponse); this.setSessionToken(tokenResponse);
this.setState('Click button to log in'); this.setState('Click button to log in');
return true return true
}
return false
} }
return false
} }
loginView(): void { loginView(): void {