5 files changed, 76 insertions, 215 deletions

diff --git a/client/src/app/shared/auth/auth-http.service.ts b/client/src/app/shared/auth/auth-http.service.ts
index 2392898ca..602726570 100644
--- a/client/src/app/shared/auth/auth-http.service.ts
+++ b/client/src/app/shared/auth/auth-http.service.ts
@@ -7,11 +7,12 @@ import {
   RequestMethod,
   RequestOptions,
   RequestOptionsArgs,
-  Response
+  Response,
+  XHRBackend
 } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 
-import { AuthService } from './auth.service';
+import { AuthService } from '../../core';
 
 @Injectable()
 export class AuthHttp extends Http {
@@ -78,3 +79,13 @@ export class AuthHttp extends Http {
     headers.set('Authorization', this.authService.getRequestHeaderValue());
   }
 }
+
+export const AUTH_HTTP_PROVIDERS = [
+  {
+    provide: AuthHttp,
+    useFactory: (backend: XHRBackend, defaultOptions: RequestOptions, authService: AuthService) => {
+      return new AuthHttp(backend, defaultOptions, authService);
+    },
+    deps: [ XHRBackend, RequestOptions, AuthService ]
+  },
+];
diff --git a/client/src/app/shared/auth/auth.service.ts b/client/src/app/shared/auth/auth.service.ts
deleted file mode 100644
index b7e0a44a7..000000000
--- a/client/src/app/shared/auth/auth.service.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-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 { AuthStatus } from './auth-status.model';
-import { AuthUser } from './auth-user.model';
-import { RestExtractor } from '../rest';
-
-@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';
-
-  loginChangedSource: Observable<AuthStatus>;
-
-  private clientId: string;
-  private clientSecret: string;
-  private loginChanged: Subject<AuthStatus>;
-  private user: AuthUser = null;
-
-  constructor(
-    private http: Http,
-    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 => {
-          this.clientId = result.client_id;
-          this.clientSecret = result.client_secret;
-          console.log('Client credentials loaded.');
-        },
-        error => {
-          alert(
-            `Cannot retrieve OAuth Client credentials: ${error.text}. \n` +
-            'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.'
-          );
-        }
-      );
-
-    // Return null if there is nothing to load
-    this.user = AuthUser.load();
-  }
-
-  getRefreshToken() {
-    if (this.user === null) return null;
-
-    return this.user.getRefreshToken();
-  }
-
-  getRequestHeaderValue() {
-    return `${this.getTokenType()} ${this.getAccessToken()}`;
-  }
-
-  getAccessToken() {
-    if (this.user === null) return null;
-
-    return this.user.getAccessToken();
-  }
-
-  getTokenType() {
-    if (this.user === null) return null;
-
-    return this.user.getTokenType();
-  }
-
-  getUser(): AuthUser {
-    return this.user;
-  }
-
-  isAdmin() {
-    if (this.user === null) return false;
-
-    return this.user.isAdmin();
-  }
-
-  isLoggedIn() {
-    if (this.getAccessToken()) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  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.fetchUserInformations(res))
-                    .map(res => this.handleLogin(res))
-                    .catch((res) => this.restExtractor.handleError(res));
-  }
-
-  logout() {
-    // TODO: make an HTTP request to revoke the tokens
-    this.user = null;
-
-    AuthUser.flush();
-
-    this.setStatus(AuthStatus.LoggedOut);
-  }
-
-  refreshAccessToken() {
-    console.log('Refreshing token...');
-
-    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');
-
-    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 => this.handleRefreshToken(res))
-                    .catch((res: Response) => {
-                      // 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']);
-
-                        return Observable.throw({
-                          json: () => '',
-                          text: () => 'You need to reconnect.'
-                        });
-                      }
-
-                      return this.restExtractor.handleError(res);
-                    });
-  }
-
-  private fetchUserInformations (obj: any) {
-    // Do not call authHttp here to avoid circular dependencies headaches
-
-    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 => {
-               obj.id = res.id;
-               obj.role = res.role;
-               return obj;
-             }
-    );
-  }
-
-  private handleLogin (obj: any) {
-    const id = obj.id;
-    const username = obj.username;
-    const role = obj.role;
-    const hashTokens = {
-      access_token: obj.access_token,
-      token_type: obj.token_type,
-      refresh_token: obj.refresh_token
-    };
-
-    this.user = new AuthUser({ id, username, role }, hashTokens);
-    this.user.save();
-
-    this.setStatus(AuthStatus.LoggedIn);
-  }
-
-  private handleRefreshToken (obj: any) {
-    this.user.refreshTokens(obj.access_token, obj.refresh_token);
-    this.user.save();
-  }
-
-  private setStatus(status: AuthStatus) {
-    this.loginChanged.next(status);
-  }
-
-}
diff --git a/client/src/app/shared/auth/index.ts b/client/src/app/shared/auth/index.ts
index ebd9e14cd..ce0bd8adf 100644
--- a/client/src/app/shared/auth/index.ts
+++ b/client/src/app/shared/auth/index.ts
@@ -1,4 +1,3 @@
 export * from './auth-http.service';
 export * from './auth-status.model';
-export * from './auth.service';
 export * from './auth-user.model';
diff --git a/client/src/app/shared/index.ts b/client/src/app/shared/index.ts
index af34b4b64..52a647b83 100644
--- a/client/src/app/shared/index.ts
+++ b/client/src/app/shared/index.ts
@@ -3,3 +3,4 @@ export * from './forms';
 export * from './rest';
 export * from './search';
 export * from './users';
+export * from './shared.module';
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
new file mode 100644
index 000000000..141922322
--- /dev/null
+++ b/client/src/app/shared/shared.module.ts
@@ -0,0 +1,62 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpModule } from '@angular/http';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+
+import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
+import { DropdownModule } from 'ng2-bootstrap/components/dropdown';
+import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar';
+import { PaginationModule } from 'ng2-bootstrap/components/pagination';
+import { ModalModule } from 'ng2-bootstrap/components/modal';
+import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
+
+import { AUTH_HTTP_PROVIDERS } from './auth';
+import { RestExtractor, RestService } from './rest';
+import { SearchComponent, SearchService } from './search';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    HttpModule,
+    RouterModule,
+
+    DropdownModule,
+    FileUploadModule,
+    ModalModule,
+    PaginationModule,
+    ProgressbarModule
+  ],
+
+  declarations: [
+    BytesPipe,
+    SearchComponent
+  ],
+
+  exports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    HttpModule,
+    RouterModule,
+
+    DropdownModule,
+    FileUploadModule,
+    ModalModule,
+    PaginationModule,
+    ProgressbarModule,
+    BytesPipe,
+
+    SearchComponent
+  ],
+
+  providers: [
+    AUTH_HTTP_PROVIDERS,
+    RestExtractor,
+    RestService,
+    SearchService
+  ]
+})
+export class SharedModule { }