refactor scoped token service

[github/Chocobozzz/PeerTube.git] / client / src / app / core / auth / auth.service.ts

diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index 224f35f82008711b846a23d5b7c5a58a0648b32f..fd6062d3fbdb864aecbc0398f12c5803235f65a6 100644 (file)
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -11,7 +11,6 @@ import { environment } from '../../../environments/environment'
 import { RestExtractor } from '../rest/rest-extractor.service'
 import { AuthStatus } from './auth-status.model'
 import { AuthUser } from './auth-user.model'
-import { ScopedTokenType, ScopedToken } from '@shared/models/users/user-scoped-token'
 
 interface UserLoginWithUsername extends UserLogin {
   access_token: string
@@ -27,7 +26,6 @@ export class AuthService {
   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_REVOKE_TOKEN_URL = environment.apiUrl + '/api/v1/users/revoke-token'
-  private static BASE_SCOPED_TOKENS_URL = environment.apiUrl + '/api/v1/users/scoped-tokens'
   private static BASE_USER_INFORMATION_URL = environment.apiUrl + '/api/v1/users/me'
   private static LOCAL_STORAGE_OAUTH_CLIENT_KEYS = {
     CLIENT_ID: 'client_id',
@@ -43,7 +41,6 @@ export class AuthService {
   private loginChanged: Subject<AuthStatus>
   private user: AuthUser = null
   private refreshingTokenObservable: Observable<any>
-  private scopedTokens: ScopedToken
 
   constructor (
     private http: HttpClient,
@@ -247,48 +244,6 @@ Ensure you have correctly configured PeerTube (config/ directory), in particular
         )
   }
 
-  getScopedTokens (): Promise<ScopedToken> {
-    return new Promise((res, rej) => {
-      if (this.scopedTokens) return res(this.scopedTokens)
-
-      const authHeaderValue = this.getRequestHeaderValue()
-      const headers = new HttpHeaders().set('Authorization', authHeaderValue)
-
-      this.http.get<ScopedToken>(AuthService.BASE_SCOPED_TOKENS_URL, { headers })
-              .subscribe(
-                scopedTokens => {
-                  this.scopedTokens = scopedTokens
-                  res(this.scopedTokens)
-                },
-
-                err => {
-                  console.error(err)
-                  rej(err)
-                }
-              )
-    })
-  }
-
-  renewScopedTokens (): Promise<ScopedToken> {
-    return new Promise((res, rej) => {
-      const authHeaderValue = this.getRequestHeaderValue()
-      const headers = new HttpHeaders().set('Authorization', authHeaderValue)
-
-      this.http.post<ScopedToken>(AuthService.BASE_SCOPED_TOKENS_URL, {}, { headers })
-              .subscribe(
-                scopedTokens => {
-                  this.scopedTokens = scopedTokens
-                  res(this.scopedTokens)
-                },
-
-                err => {
-                  console.error(err)
-                  rej(err)
-                }
-              )
-    })
-  }
-
   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}`)