feat(login): Display "loggin-in" popup when atempting to log via stor…

…ed API key

src/app/app.component.ts

@@ -1,15 +1,8 @@
 import { Component, ViewChild } from '@angular/core';
 import { Platform, Nav } from 'ionic-angular';
 import { StatusBar } from 'ionic-native';
-import { Storage } from '@ionic/storage';
 
 import { LogInPage } from '../pages/login/login';
-import { DashboardPage } from '../pages/dashboard/dashboard';
-
-import { 
-	TwAPIService,
-  User
-} from './../share/src/app/';
 
 @Component({
   template: `<ion-nav [root]="rootPage" #content swipeBackEnabled="false"></ion-nav>`
@@ -19,76 +12,13 @@ export class MyApp {
   rootPage: any = LogInPage;
 
   constructor(
-    private platform: Platform,
-    private twapi: TwAPIService,
-    private storage: Storage
+    private platform: Platform
   ) {
 
     platform.ready().then(() => {
-
-      this.initOnResume();
-
-      this.fetchUser()
-      .then(
-        user => {
-
-          this.nav.setRoot(DashboardPage, {
-            user:user
-          });
-        },
-        error => {
-          console.log("No valid key set");
-        }
-      );
-
-
       // Okay, so the platform is ready and our plugins are available.
       // Here you can do any higher level native things you might need.
       StatusBar.styleDefault();
     });
   }
-
-  private initOnResume(){
-    document.addEventListener('resume', () => {
-
-      this.fetchUser().then(
-        user => {
-          DashboardPage.userChanged.emit(user)
-        }
-      );
-
-      TwAPIService.resetTime();
-    });
-  }
-
-   private fetchUser():Promise<User>{
-
-    return this.fetchAPIKey().then(
-       key => {
-           return this.twapi.getUser(key).then(
-            user => user,
-            err => {
-              console.log("removing", key); 
-              this.storage.remove('tw-api')
-              throw err;
-            }
-          )
-       },
-       err => {
-          throw err;
-       }
-    )
-  }
-
-  private fetchAPIKey():Promise<string>{
-
-    return this.storage.get('tw-api').then((key) => {
-
-      if(key !== "cordova_not_available" && key != null){
-        return key;
-      }else{
-        throw new Error("awd");
-      }
-    });
-  }
 }

src/pages/login/login.ts

@@ -53,6 +53,17 @@ export class LogInPage extends LoginComponent{
 		this.loginAttempt.subscribe(
 			attempt =>  this.onLoggingAttempt(attempt)
 		);
+
+		this.initOnResume();
+
+       this.fetchUser().then(
+          user => {
+          	this.userLogged.emit(user);
+          },
+          error => {
+            console.log("No valid key set");
+          }
+       );
 	}
 
 	/**
@@ -146,4 +157,68 @@ export class LogInPage extends LoginComponent{
 		console.log("setting tw-api to", user.key);
 		this.storage.set('tw-api', user.key);
 	}
+
+	/**
+	 * Fetches and user given a stored API key
+	 * @return {Promise<User>} [description]
+	 */
+	private fetchUser():Promise<User>{
+
+	    return this.fetchAPIKey().then(
+	       key => {
+	           return this.twapi.getUser(key).then(
+	            user => user,
+	            err => {
+	              this.loginAttempt.emit(false);
+	              console.log("removing", key); 
+	              this.storage.remove('tw-api')
+	              throw err;
+	            }
+	          )
+	       },
+	       err => {
+	          throw err;
+	       }
+	    )
+  }
+
+  /**
+   * Add resume event to html body and fetches up to date
+   * user from the API
+   */
+  private initOnResume(){
+    document.addEventListener('resume', () => {
+
+      this.fetchUser().then(
+        user => {
+          DashboardPage.userChanged.emit(user)
+        },
+        error => {
+            console.log("API Key changed");
+            this.nav.setRoot(LogInPage);
+        }
+      );
+
+      TwAPIService.resetTime();
+    });
+  }
+
+  /**
+   * Fetches a stored api key
+   *
+   * @throws on no key found
+   * @return {Promise<string>} [description]
+   */
+  private fetchAPIKey():Promise<string>{
+
+    return this.storage.get('tw-api').then((key) => {
+
+      if(key !== "cordova_not_available" && key != null){
+      	this.loginAttempt.emit(true);
+        return key;
+      }else{
+        throw new Error("No valid key");
+      }
+    });
+  }
 }