Api mapping for Toolwatchapp/tw-mobile#36

Toolwatchapp · Jul 26, 2016 · 328abe4 · 328abe4
1 parent 3af2bb0
commit 328abe4
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 7 deletions.
diff --git a/dist/app/directives/login/login.component.d.ts b/dist/app/directives/login/login.component.d.ts
@@ -4,7 +4,7 @@ import { FormBuilder, Control, ControlGroup } from '@angular/common';
 import { TwAPIService } from './../../services/twapi.service';
 export declare class LoginComponent implements OnInit {
     private translate;
-    private twapi;
+    protected twapi: TwAPIService;
     private builder;
     loginForm: ControlGroup;
     email: Control;

diff --git a/dist/app/directives/login/login.component.js.map b/dist/app/directives/login/login.component.js.map
diff --git a/dist/app/services/twapi.service.d.ts b/dist/app/services/twapi.service.d.ts
@@ -136,6 +136,12 @@ export declare class TwAPIService {
      * @return {Promise<User>}
      */
     login(email: string, password: string): Promise<User>;
+    /**
+     * Get an user using his API key
+     * @param  {string}        key [description]
+     * @return {Promise<User>}     [description]
+     */
+    getUser(key: string): Promise<User>;
     /**
      * Registers a new user
      * @param  {string}        email

diff --git a/dist/app/services/twapi.service.js b/dist/app/services/twapi.service.js
diff --git a/dist/app/services/twapi.service.js.map b/dist/app/services/twapi.service.js.map
diff --git a/src/app/directives/login/login.component.ts b/src/app/directives/login/login.component.ts
@@ -39,7 +39,7 @@ export class LoginComponent implements OnInit {
    * @param {FormBuilder}      private builder   [description]
    */
   constructor(private translate: TranslateService, 
-    private twapi: TwAPIService, private builder: FormBuilder) { 
+    protected twapi: TwAPIService, private builder: FormBuilder) { 
 
     //Lang definition
 	  translate.setDefaultLang('en');

diff --git a/src/app/services/twapi.service.ts b/src/app/services/twapi.service.ts
@@ -194,8 +194,6 @@ export class TwAPIService {
 		.map((res) => { return ModelFactory.buildUser(res.json()); })
 		.toPromise().then(
 			res => {
-                console.log("works");
-
                 GAService.event('API', 'LOGIN');
 				TwAPIService.apikey = res.key;
 				TwAPIService.headers.delete('X-API-KEY');
@@ -207,6 +205,37 @@ export class TwAPIService {
 		)
 	}  
 
+
+    /**
+     * Get an user using his API key
+     * @param  {string}        key [description]
+     * @return {Promise<User>}     [description]
+     */
+    getUser(key:string):Promise<User> {
+
+
+        TwAPIService.apikey = key;
+        TwAPIService.headers.delete('X-API-KEY');
+        TwAPIService.headers.append('X-API-KEY', TwAPIService.apikey);
+
+
+        return this.http.get(
+            this.baseUrl + "users", 
+            TwAPIService.options
+        )
+        .map((res) => { return ModelFactory.buildUser(res.json()); })
+        .toPromise().then(
+            res => {
+
+                GAService.event('API', 'AUTOLOGIN');
+                TwAPIService.user = res;
+                return res;
+            },
+            err => this.handleError(err)
+        )
+
+    }
+
 	/**
 	 * Registers a new user
 	 * @param  {string}        email