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 { 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 { AuthStatus } from './auth-status.model'
import { AuthUser } from './auth-user.model'
-import { ClientLocal } from '../../../../../shared'
+import {
+ OAuthClientLocal,
+ UserRole,
+ UserRefreshToken,
+ VideoChannel,
+ User as UserServerModel
+} from '../../../../../shared'
// Do not use the barrel (dependency loop)
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_URL + '/api/v1/clients/local'
+ 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_INFORMATIONS_URL = API_URL + '/api/v1/users/me'
+ private static BASE_USER_INFORMATION_URL = API_URL + '/api/v1/users/me'
loginChangedSource: Observable<AuthStatus>
+ userInformationLoaded = new ReplaySubject<boolean>(1)
private clientId: string
private clientSecret: string
private user: AuthUser = null
constructor (
- private http: Http,
+ private http: HttpClient,
private notificationsService: NotificationsService,
private restExtractor: RestExtractor,
private router: Router
this.loginChanged = new Subject<AuthStatus>()
this.loginChangedSource = this.loginChanged.asObservable()
- // 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: ClientLocal) => {
- 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()
}
+ loadClientCredentials () {
+ // Fetch the client_id/client_secret
+ // FIXME: save in local storage?
+ 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
}
getRequestHeaderValue () {
- return `${this.getTokenType()} ${this.getAccessToken()}`
+ const accessToken = this.getAccessToken()
+
+ if (accessToken === null) return null
+
+ return `${this.getTokenType()} ${accessToken}`
}
getAccessToken () {
return this.user
}
- isAdmin () {
- if (this.user === null) return false
-
- return this.user.isAdmin()
- }
-
isLoggedIn () {
- if (this.getAccessToken()) {
- return true
- } else {
- return false
- }
+ return !!this.getAccessToken()
}
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
- }
-
- 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.mergeUserInformations(res))
+ // 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 () {
const refreshToken = this.getRefreshToken()
- 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')
+ // 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 headers = new Headers()
- headers.append('Content-Type', 'application/x-www-form-urlencoded')
-
- 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') {
+ 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.'
})
}
})
}
- refreshUserInformations () {
+ refreshUserInformation () {
const obj = {
- access_token: this.user.getAccessToken()
+ access_token: this.user.getAccessToken(),
+ refresh_token: null,
+ token_type: this.user.getTokenType(),
+ username: this.user.username
}
- this.mergeUserInformations (obj)
- .subscribe(
- res => {
- this.user.displayNSFW = res.displayNSFW
- this.user.role = res.role
+ 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()
- }
- )
+ this.user.save()
+ }
+ )
}
- private mergeUserInformations (obj: { access_token: string }) {
- // 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(AuthService.BASE_USER_INFORMATIONS_URL, { headers })
- .map(res => res.json())
- .map(res => {
- const newProperties = {
- id: res.id,
- role: res.role,
- displayNSFW: res.displayNSFW
- }
+ 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 Object.assign(obj, newProperties)
- }
+ return Object.assign(obj, newProperties)
+ }
)
}
- private handleLogin (obj: any) {
- const id = obj.id
- const username = obj.username
- const role = obj.role
- const email = obj.email
- const displayNSFW = obj.displayNSFW
+ 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 = {
accessToken: obj.access_token,
tokenType: obj.token_type,
refreshToken: obj.refresh_token
}
- this.user = new AuthUser({ id, username, role, displayNSFW, email }, hashTokens)
+ this.user = new AuthUser(hashUser, hashTokens)
this.user.save()
this.setStatus(AuthStatus.LoggedIn)
+ this.userInformationLoaded.next(true)
}
- private handleRefreshToken (obj: any) {
+ private handleRefreshToken (obj: UserRefreshToken) {
this.user.refreshTokens(obj.access_token, obj.refresh_token)
this.user.save()
}
private setStatus (status: AuthStatus) {
this.loginChanged.next(status)
}
-
}
projects / oweals / peertube.git / blobdiff