luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

format errors from auth-jwt plugin similarly to other authentication errors (#6553)

This commit is contained in:
Matthew Irish 2019-04-09 12:42:51 -05:00 committed by GitHub
parent 22587672ec
commit ee39025cf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/app/components/auth-form.js
View File

@ -173,7 +173,7 @@ export default Component.extend(DEFAULTS, {
showLoading: or('isLoading', 'authenticate.isRunning', 'fetchMethods.isRunning', 'unwrapToken.isRunning'),
handleError(e) {
handleError(e, prefixMessage = true) {
this.set('loading', false);
if (!e.errors) {
return e;
@ -184,7 +184,8 @@ export default Component.extend(DEFAULTS, {
}
return error;
});
this.set('error', `Authentication failed: ${errors.join('.')}`);
let message = prefixMessage ? 'Authentication failed: ' : '';
this.set('error', `${message}${errors.join('.')}`);
},
authenticate: task(function*(backendType, data) {
@ -239,5 +240,12 @@ export default Component.extend(DEFAULTS, {
}
return this.authenticate.unlinked().perform(backend.type, data);
},
handleError(e) {
if (e) {
this.handleError(e, false);
} else {
this.set('error', null);
}
},
},
});

2
ui/app/templates/components/auth-form.hbs
View File

@ -56,7 +56,7 @@
{{/if}}
{{#if (or (eq this.selectedAuthBackend.type "jwt") (eq this.selectedAuthBackend.type "oidc"))}}
<AuthJwt
@onError={{action (mut this.error)}}
@onError={{action "handleError"}}
@onLoading={{action (mut this.isLoading)}}
@onToken={{action (mut this.token)}}
@namespace={{this.namespace}}