+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'
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 { NotificationsService } from 'angular2-notifications'
+import 'rxjs/add/observable/throw'
+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 { Observable } from 'rxjs/Observable'
+import { ReplaySubject } from 'rxjs/ReplaySubject'
+import { Subject } from 'rxjs/Subject'
+import { OAuthClientLocal, User as UserServerModel, UserRefreshToken } from '../../../../../shared'
+import { User } from '../../../../../shared/models/users'
+import { UserLogin } from '../../../../../shared/models/users/user-login.model'
+import { environment } from '../../../environments/environment'
+import { RestExtractor } from '../../shared/rest'
import { AuthStatus } from './auth-status.model'
import { AuthUser } from './auth-user.model'
-import { OAuthClientLocal, UserRole, UserRefreshToken } from '../../../../../shared'
-// Do not use the barrel (dependency loop)
-import { RestExtractor } from '../../shared/rest'
-import { UserLogin } from '../../../../../shared/models/users/user-login.model'
-import { User } from '../../shared/users/user.model'
interface UserLoginWithUsername extends UserLogin {
access_token: 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
-}
+type UserLoginWithUserInformation = UserLoginWithUsername & User
@Injectable()
export class AuthService {
- 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'
+ private static BASE_CLIENT_URL = environment.apiUrl + '/api/v1/oauth-clients/local'
+ private static BASE_TOKEN_URL = environment.apiUrl + '/api/v1/users/token'
+ private static BASE_USER_INFORMATION_URL = environment.apiUrl + '/api/v1/users/me'
loginChangedSource: Observable<AuthStatus>
+ userInformationLoaded = new ReplaySubject<boolean>(1)
private clientId: string
private clientSecret: string
return this.user
}
- isAdmin () {
- if (this.user === null) return false
-
- return this.user.isAdmin()
- }
-
isLoggedIn () {
return !!this.getAccessToken()
}
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 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)
const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
-
- return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, body, { headers })
+ return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, body.toString(), { headers })
.map(res => Object.assign(res, { username }))
.flatMap(res => this.mergeUserInformation(res))
.map(res => this.handleLogin(res))
return this.http.post<UserRefreshToken>(AuthService.BASE_TOKEN_URL, body, { headers })
.map(res => this.handleRefreshToken(res))
- .catch(res => {
- // The refresh token is invalid?
- if (res.status === 400 && res.error === 'invalid_grant') {
- console.error('Cannot refresh token -> logout...')
- this.logout()
- this.router.navigate(['/login'])
-
- return Observable.throw({
- error: 'You need to reconnect.'
- })
- }
-
- return this.restExtractor.handleError(res)
+ .catch(err => {
+ console.error(err)
+ console.log('Cannot refresh token -> logout...')
+ this.logout()
+ this.router.navigate(['/login'])
+
+ return Observable.throw({
+ error: 'You need to reconnect.'
+ })
})
}
}
this.mergeUserInformation(obj)
- .subscribe(
- res => {
- this.user.displayNSFW = res.displayNSFW
- this.user.role = res.role
+ .subscribe(
+ res => {
+ this.user.patch(res)
+ this.user.save()
- this.user.save()
- }
- )
+ this.userInformationLoaded.next(true)
+ }
+ )
}
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}`)
- return this.http.get<User>(AuthService.BASE_USER_INFORMATION_URL, { headers })
- .map(res => {
- const newProperties = {
- id: res.id as number,
- role: res.role as UserRole,
- displayNSFW: res.displayNSFW as boolean,
- email: res.email as string
- }
-
- return Object.assign(obj, newProperties)
- }
- )
+ return this.http.get<UserServerModel>(AuthService.BASE_USER_INFORMATION_URL, { headers })
+ .map(res => Object.assign(obj, res))
}
private handleLogin (obj: UserLoginWithUserInformation) {
- const id = obj.id
- const username = obj.username
- const role = obj.role
- const email = obj.email
- const displayNSFW = obj.displayNSFW
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(obj, hashTokens)
this.user.save()
this.setStatus(AuthStatus.LoggedIn)
+ this.userInformationLoaded.next(true)
}
private handleRefreshToken (obj: UserRefreshToken) {
projects / github / Chocobozzz / PeerTube.git / blobdiff