Merge branch 'v1.1.1.0' into v1.1.2.0

src/app/app-routing.module.ts

@@ -17,7 +17,7 @@ const routes: Routes = [
     loadChildren: './pages/offres/offre-details/offre-details.module#OffreDetailsPageModule',
     canActivate: [AuthGuardService]
   },
-  { path: 'login-help', loadChildren: './modals/compte/login-help/login-help.module#LoginHelpPageModule' },
+  { path: 'login-help', loadChildren: './modals/login-help/login-help.module#LoginHelpPageModule' },
 
 ];
 

src/app/services/auth.service.ts

@@ -99,8 +99,9 @@ export class AuthService {
       if (this.platform.is('cordova')) {
         this.httpAdv.post(Config.WORDPRESS_URL + 'wp-json/jwt-auth/v1/token', authData, {}).then(
           res => {
-            console.log(res);
-            this.setUser(JSON.parse(res.data));
+            const data = JSON.parse(res.data);
+            this.setUser(data);
+            this.setUserInfo(data.token);
             this.authState.next(true);
             resolve(res);
           },
@@ -109,8 +110,42 @@ export class AuthService {
       } else {
         this.http.post(Config.WORDPRESS_URL + 'wp-json/jwt-auth/v1/token', authData).subscribe(
           res => {
-            this.setUser(res);
+            const data: any = res;
+            this.setUser(data);
+            this.setUserInfo(data.token);
             this.authState.next(true);
+            resolve(data);
+          },
+          err => reject(err)
+        );
+      }
+    });
+  }
+
+  setUserInfo(token) {
+    return new Promise<any>((resolve, reject) => {
+      if (this.platform.is('cordova')) {
+        let header: Headers = new Headers();
+        header.append('Authorization', 'Bearer ' + token);
+        this.httpAdv.get(
+          Config.WORDPRESS_URL + 'wp-json/wp/v2/users/me',
+          {},
+          { headers: header }
+        ).then(
+          res => {
+            console.log(res);
+            resolve(res);
+          },
+          err => reject(err)
+        );
+      } else {
+        this.http.get(
+          // Config.WORDPRESS_URL + 'wp-json/wp/v2/users/me',
+          Config.WORDPRESS_URL + 'wp-json/atapi/loggedinuser',
+          { headers: { Authorization: 'Bearer ' + token } }
+        ).subscribe(
+          res => {
+            console.log(res);
             resolve(res);
           },
           err => reject(err)