Fix race condition in login

src/app/providers/api-service.ts

@@ -55,21 +55,23 @@ export class ApiService {
   }
 
   public login(data) {
-    const login_event = this.http.post(
+    return this.http
+      .post(
         this.apiUrl + '/login',
         data
-    ).map( response => response.json() );
-    login_event.subscribe(
+      )
+      .map(
         result => {
-      this.setSessionKey(result.session_key);
+          const json = result.json();
+          this.setSessionKey(json.session_key);
           this.setUserInfo(
-        result.email,
-        result.display_name || result.name
+          json.email,
+          json.display_name || json.name
         );
-      this.setUserType(result.user_type);
+        this.setUserType(json.user_type);
+        return json;
         }
       );
-    return login_event;
   }
 
   public logout() {