From 11a06d124e91b6b9aea4cce3f99f2d51b6ad96ce Mon Sep 17 00:00:00 2001 From: kiswa Date: Fri, 22 Jul 2016 20:16:12 +0000 Subject: [PATCH] Include UserOptions in AuthService --- src/app/shared/auth/auth.service.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/shared/auth/auth.service.ts b/src/app/shared/auth/auth.service.ts index 02794c1..7a55643 100644 --- a/src/app/shared/auth/auth.service.ts +++ b/src/app/shared/auth/auth.service.ts @@ -7,28 +7,33 @@ import { Observable } from 'rxjs/Observable'; import 'rxjs/add/observable/of'; import 'rxjs/add/operator/catch'; -import { User, ApiResponse } from '../index'; +import { User, UserOptions, ApiResponse } from '../index'; import { Constants } from '../constants'; @Injectable() export class AuthService { private activeUser = new BehaviorSubject(null); + public userOptions: UserOptions = null; public userChanged = this.activeUser.asObservable(); constructor(constants: Constants, private http: Http, private router: Router) { } - updateUser(user: User): void { + updateUser(user: User, userOpts?: UserOptions): void { this.activeUser.next(user); + + if (userOpts) { + this.userOptions = userOpts; + } } authenticate(): Observable { return this.http.post('api/authenticate', null) .map(res => { let response: ApiResponse = res.json(); - this.updateUser(response.data[1]); + this.updateUser(response.data[1], response.data[2]); return this.activeUser !== null; }) @@ -48,13 +53,13 @@ export class AuthService { return this.http.post('api/login', json) .map(res => { let response: ApiResponse = res.json(); - this.updateUser(response.data[1]); + this.updateUser(response.data[1], response.data[2]); return response; }) .catch((res, caught) => { let response: ApiResponse = res.json(); - this.updateUser(null); + this.updateUser(null, null); return Observable.of(response); });