-import { Injectable } from '@angular/core';
-import { Headers, Http, Response, URLSearchParams } from '@angular/http';
-import { Router } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/mergeMap';
-import 'rxjs/add/observable/throw';
-
-import { NotificationsService } from 'angular2-notifications';
-
+import { Injectable } from '@angular/core'
+import { Router } from '@angular/router'
+import { Observable } from 'rxjs/Observable'
+import { Subject } from 'rxjs/Subject'
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
+import { ReplaySubject } from 'rxjs/ReplaySubject'
+import 'rxjs/add/operator/do'
+import 'rxjs/add/operator/map'
+import 'rxjs/add/operator/mergeMap'
+import 'rxjs/add/observable/throw'
+
+import { NotificationsService } from 'angular2-notifications'
+
+import { AuthStatus } from './auth-status.model'
+import { AuthUser } from './auth-user.model'
+import {
+ OAuthClientLocal,
+ UserRole,
+ UserRefreshToken,
+ VideoChannel,
+ User as UserServerModel
+} from '../../../../../shared'
// Do not use the barrel (dependency loop)
-import { AuthStatus } from '../../shared/auth/auth-status.model';
-import { AuthUser } from '../../shared/auth/auth-user.model';
-import { RestExtractor } from '../../shared/rest';
+import { RestExtractor } from '../../shared/rest'
+import { UserLogin } from '../../../../../shared/models/users/user-login.model'
+import { UserConstructorHash } from '../../shared/users/user.model'
+
+interface UserLoginWithUsername extends UserLogin {
+ access_token: string
+ refresh_token: string
+ token_type: string
+ username: string
+}
+
+interface UserLoginWithUserInformation extends UserLogin {
+ access_token: string
+ refresh_token: string
+ token_type: string
+ username: string
+ id: number
+ role: UserRole
+ displayNSFW: boolean
+ email: string
+ videoQuota: number
+ account: {
+ id: number
+ uuid: string
+ }
+ videoChannels: VideoChannel[]
+}
@Injectable()
export class AuthService {
- private static BASE_CLIENT_URL = '/api/v1/clients/local';
- private static BASE_TOKEN_URL = '/api/v1/users/token';
- private static BASE_USER_INFORMATIONS_URL = '/api/v1/users/me';
+ private static BASE_CLIENT_URL = API_URL + '/api/v1/oauth-clients/local'
+ private static BASE_TOKEN_URL = API_URL + '/api/v1/users/token'
+ private static BASE_USER_INFORMATION_URL = API_URL + '/api/v1/users/me'
- loginChangedSource: Observable<AuthStatus>;
+ loginChangedSource: Observable<AuthStatus>
+ userInformationLoaded = new ReplaySubject<boolean>(1)
- private clientId: string;
- private clientSecret: string;
- private loginChanged: Subject<AuthStatus>;
- private user: AuthUser = null;
+ private clientId: string
+ private clientSecret: string
+ private loginChanged: Subject<AuthStatus>
+ private user: AuthUser = null
- constructor(
- private http: Http,
+ constructor (
+ private http: HttpClient,
private notificationsService: NotificationsService,
private restExtractor: RestExtractor,
private router: Router
) {
- this.loginChanged = new Subject<AuthStatus>();
- this.loginChangedSource = this.loginChanged.asObservable();
+ this.loginChanged = new Subject<AuthStatus>()
+ this.loginChangedSource = this.loginChanged.asObservable()
+
+ // Return null if there is nothing to load
+ this.user = AuthUser.load()
+ }
+ loadClientCredentials () {
// Fetch the client_id/client_secret
// FIXME: save in local storage?
- this.http.get(AuthService.BASE_CLIENT_URL)
- .map(this.restExtractor.extractDataGet)
- .catch((res) => this.restExtractor.handleError(res))
- .subscribe(
- result => {
- this.clientId = result.client_id;
- this.clientSecret = result.client_secret;
- console.log('Client credentials loaded.');
- },
-
- error => {
- let errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n`;
- errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.';
-
- // We put a bigger timeout
- // This is an important message
- this.notificationsService.error('Error', errorMessage, { timeOut: 7000 });
- }
- );
-
- // Return null if there is nothing to load
- this.user = AuthUser.load();
+ this.http.get<OAuthClientLocal>(AuthService.BASE_CLIENT_URL)
+ .catch(res => this.restExtractor.handleError(res))
+ .subscribe(
+ res => {
+ this.clientId = res.client_id
+ this.clientSecret = res.client_secret
+ console.log('Client credentials loaded.')
+ },
+
+ error => {
+ let errorMessage = `Cannot retrieve OAuth Client credentials: ${error.text}. \n`
+ errorMessage += 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.'
+
+ // We put a bigger timeout
+ // This is an important message
+ this.notificationsService.error('Error', errorMessage, { timeOut: 7000 })
+ }
+ )
}
- getRefreshToken() {
- if (this.user === null) return null;
+ getRefreshToken () {
+ if (this.user === null) return null
- return this.user.getRefreshToken();
+ return this.user.getRefreshToken()
}
- getRequestHeaderValue() {
- return `${this.getTokenType()} ${this.getAccessToken()}`;
- }
+ getRequestHeaderValue () {
+ const accessToken = this.getAccessToken()
- getAccessToken() {
- if (this.user === null) return null;
+ if (accessToken === null) return null
- return this.user.getAccessToken();
+ return `${this.getTokenType()} ${accessToken}`
}
- getTokenType() {
- if (this.user === null) return null;
+ getAccessToken () {
+ if (this.user === null) return null
- return this.user.getTokenType();
+ return this.user.getAccessToken()
}
- getUser(): AuthUser {
- return this.user;
- }
-
- isAdmin() {
- if (this.user === null) return false;
+ getTokenType () {
+ if (this.user === null) return null
- return this.user.isAdmin();
+ return this.user.getTokenType()
}
- isLoggedIn() {
- if (this.getAccessToken()) {
- return true;
- } else {
- return false;
- }
+ getUser () {
+ return this.user
}
- login(username: string, password: string) {
- let body = new URLSearchParams();
- body.set('client_id', this.clientId);
- body.set('client_secret', this.clientSecret);
- body.set('response_type', 'code');
- body.set('grant_type', 'password');
- body.set('scope', 'upload');
- body.set('username', username);
- body.set('password', password);
-
- let headers = new Headers();
- headers.append('Content-Type', 'application/x-www-form-urlencoded');
-
- let options = {
- headers: headers
- };
+ isLoggedIn () {
+ return !!this.getAccessToken()
+ }
- return this.http.post(AuthService.BASE_TOKEN_URL, body.toString(), options)
- .map(this.restExtractor.extractDataGet)
- .map(res => {
- res.username = username;
- return res;
- })
- .flatMap(res => this.fetchUserInformations(res))
+ login (username: string, password: string) {
+ // Form url encoded
+ const body = new HttpParams().set('client_id', this.clientId)
+ .set('client_secret', this.clientSecret)
+ .set('response_type', 'code')
+ .set('grant_type', 'password')
+ .set('scope', 'upload')
+ .set('username', username)
+ .set('password', password)
+
+ const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
+
+ return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, body, { headers })
+ .map(res => Object.assign(res, { username }))
+ .flatMap(res => this.mergeUserInformation(res))
.map(res => this.handleLogin(res))
- .catch((res) => this.restExtractor.handleError(res));
+ .catch(res => this.restExtractor.handleError(res))
}
- logout() {
+ logout () {
// TODO: make an HTTP request to revoke the tokens
- this.user = null;
+ this.user = null
- AuthUser.flush();
+ AuthUser.flush()
- this.setStatus(AuthStatus.LoggedOut);
+ this.setStatus(AuthStatus.LoggedOut)
}
- refreshAccessToken() {
- console.log('Refreshing token...');
-
- const refreshToken = this.getRefreshToken();
+ refreshAccessToken () {
+ console.log('Refreshing token...')
- let body = new URLSearchParams();
- body.set('refresh_token', refreshToken);
- body.set('client_id', this.clientId);
- body.set('client_secret', this.clientSecret);
- body.set('response_type', 'code');
- body.set('grant_type', 'refresh_token');
+ const refreshToken = this.getRefreshToken()
- let headers = new Headers();
- headers.append('Content-Type', 'application/x-www-form-urlencoded');
+ // Form url encoded
+ const body = new HttpParams().set('refresh_token', refreshToken)
+ .set('client_id', this.clientId)
+ .set('client_secret', this.clientSecret)
+ .set('response_type', 'code')
+ .set('grant_type', 'refresh_token')
- let options = {
- headers: headers
- };
+ const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
- return this.http.post(AuthService.BASE_TOKEN_URL, body.toString(), options)
- .map(this.restExtractor.extractDataGet)
+ return this.http.post<UserRefreshToken>(AuthService.BASE_TOKEN_URL, body, { headers })
.map(res => this.handleRefreshToken(res))
- .catch((res: Response) => {
+ .catch(res => {
// The refresh token is invalid?
- if (res.status === 400 && res.json() && res.json().error === 'invalid_grant') {
- console.error('Cannot refresh token -> logout...');
- this.logout();
- this.router.navigate(['/login']);
+ if (res.status === 400 && res.error.error === 'invalid_grant') {
+ console.error('Cannot refresh token -> logout...')
+ this.logout()
+ this.router.navigate(['/login'])
return Observable.throw({
- json: () => '',
- text: () => 'You need to reconnect.'
- });
+ error: 'You need to reconnect.'
+ })
}
- return this.restExtractor.handleError(res);
- });
+ return this.restExtractor.handleError(res)
+ })
+ }
+
+ refreshUserInformation () {
+ const obj = {
+ access_token: this.user.getAccessToken(),
+ refresh_token: null,
+ token_type: this.user.getTokenType(),
+ username: this.user.username
+ }
+
+ this.mergeUserInformation(obj)
+ .do(() => this.userInformationLoaded.next(true))
+ .subscribe(
+ res => {
+ this.user.displayNSFW = res.displayNSFW
+ this.user.role = res.role
+ this.user.videoChannels = res.videoChannels
+ this.user.account = res.account
+
+ this.user.save()
+ }
+ )
}
- private fetchUserInformations (obj: any) {
- // Do not call authHttp here to avoid circular dependencies headaches
+ private mergeUserInformation (obj: UserLoginWithUsername): Observable<UserLoginWithUserInformation> {
+ // User is not loaded yet, set manually auth header
+ const headers = new HttpHeaders().set('Authorization', `${obj.token_type} ${obj.access_token}`)
- const headers = new Headers();
- headers.set('Authorization', `Bearer ${obj.access_token}`);
+ return this.http.get<UserServerModel>(AuthService.BASE_USER_INFORMATION_URL, { headers })
+ .map(res => {
+ const newProperties = {
+ id: res.id,
+ role: res.role,
+ displayNSFW: res.displayNSFW,
+ email: res.email,
+ videoQuota: res.videoQuota,
+ account: res.account,
+ videoChannels: res.videoChannels
+ }
- return this.http.get(AuthService.BASE_USER_INFORMATIONS_URL, { headers })
- .map(res => res.json())
- .map(res => {
- obj.id = res.id;
- obj.role = res.role;
- return obj;
- }
- );
+ return Object.assign(obj, newProperties)
+ }
+ )
}
- private handleLogin (obj: any) {
- const id = obj.id;
- const username = obj.username;
- const role = obj.role;
+ private handleLogin (obj: UserLoginWithUserInformation) {
+ const hashUser: UserConstructorHash = {
+ id: obj.id,
+ username: obj.username,
+ role: obj.role,
+ email: obj.email,
+ displayNSFW: obj.displayNSFW,
+ videoQuota: obj.videoQuota,
+ videoChannels: obj.videoChannels,
+ account: obj.account
+ }
const hashTokens = {
- access_token: obj.access_token,
- token_type: obj.token_type,
- refresh_token: obj.refresh_token
- };
+ accessToken: obj.access_token,
+ tokenType: obj.token_type,
+ refreshToken: obj.refresh_token
+ }
- this.user = new AuthUser({ id, username, role }, hashTokens);
- this.user.save();
+ this.user = new AuthUser(hashUser, hashTokens)
+ this.user.save()
- this.setStatus(AuthStatus.LoggedIn);
+ this.setStatus(AuthStatus.LoggedIn)
}
- private handleRefreshToken (obj: any) {
- this.user.refreshTokens(obj.access_token, obj.refresh_token);
- this.user.save();
+ private handleRefreshToken (obj: UserRefreshToken) {
+ this.user.refreshTokens(obj.access_token, obj.refresh_token)
+ this.user.save()
}
- private setStatus(status: AuthStatus) {
- this.loginChanged.next(status);
+ private setStatus (status: AuthStatus) {
+ this.loginChanged.next(status)
}
-
}
projects / github / Chocobozzz / PeerTube.git / blobdiff