MycroftAI
/
selene-backend
mirror of https://github.com/MycroftAI/selene-backend.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

some refactoring

pull/4/head
Chris Veilleux 2018-09-17 14:28:55 -05:00
parent dafa0c0f78
commit 299545b1d9
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
login/frontend/v1/login-ui/src/app/auth/auth-antisocial/auth-antisocial.component.html
View File

@ -24,6 +24,6 @@
>
<mat-hint>Forgot password?</mat-hint>
</mat-form-field>
<button mat-button type="submit" class="login-button">LOGIN</button>
<button mat-button type="submit" class="login-button">LOG IN</button>
</form>
<div class="mat-body-2" *ngIf="authorizationFailed">Invalid username/password combination; try again</div>
<div class="mat-body-2" *ngIf="authFailed">Invalid username/password combination; try again</div>

29
login/frontend/v1/login-ui/src/app/auth/auth-antisocial/auth-antisocial.component.ts
View File

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { faUser, faLock } from "@fortawesome/free-solid-svg-icons";
import { AuthService } from "../../core/auth.service";
import { AuthService, AuthResponse } from "../auth.service";
@Component({
selector: 'login-auth-antisocial',
@ -10,42 +10,39 @@ import { AuthService } from "../../core/auth.service";
styleUrls: ['./auth-antisocial.component.scss']
})
export class AuthAntisocialComponent implements OnInit {
public authorizationFailed = false;
public authFailed = false;
public password: string;
public passwordIcon = faLock;
public username: string;
public usernameIcon = faUser;
public user: Object;
constructor(private authService: AuthService) { }
ngOnInit() {
}
ngOnInit() { }
authorizeUser(): void {
this.authService.authorizeUser(this.username, this.password).subscribe(
(response) => {this.onAuthorizationSuccess(response)},
(response) => {this.onAuthorizationFailure(response)}
this.authService.authorizeAntisocial(this.username, this.password).subscribe(
(response) => {this.onAuthSuccess(response)},
(response) => {this.onAuthFailure(response)}
);
}
onAuthorizationSuccess(authorizeUserResponse) {
this.user = authorizeUserResponse;
this.authorizationFailed = false;
let expirationDate = new Date(authorizeUserResponse.expiration * 1000);
onAuthSuccess(authResponse: AuthResponse) {
this.authFailed = false;
let expirationDate = new Date(authResponse.expiration * 1000);
let domain = document.domain.replace('login.', '');
document.cookie = 'seleneToken=' + authorizeUserResponse.seleneToken +
document.cookie = 'seleneToken=' + authResponse.seleneToken +
'; expires=' + expirationDate.toUTCString() +
'; domain=' + domain;
document.cookie = 'tartarusToken=' + authorizeUserResponse.tartarusToken +
document.cookie = 'tartarusToken=' + authResponse.tartarusToken +
'; expires=' + expirationDate.toUTCString() +
'; domain=' + domain;
window.parent.postMessage('loggedIn', '*')
}
onAuthorizationFailure(authorizeUserResponse) {
onAuthFailure(authorizeUserResponse) {
if (authorizeUserResponse.status === 401) {
this.authorizationFailed = true;
this.authFailed = true;
}
}
}