app/ayanova/src/utils/auth.js

@@ -64,23 +64,29 @@ export function processLogin(response) {
   //response.data.token
   //store token in central store
   //todo: put token into localstorage later once this validation is worked out
-  logger.log("auth::processLogin called");
 
   //is token present?
   if (!response || !response.data || !response.data.token) {
     logger.log("auth::processLogin -> token empty");
-    return Promise.resolve(false);
+    return Promise.reject();
+  }
+  const token = decode(response.data.token);
+
+  if (!token || !token.iss) {
+    logger.log("auth::processLogin -> token empty");
+    return Promise.reject();
   }
 
-  const token = decode(response.data.token);
-  if (!token || !token.iss || token.iss != "ayanova.com") {
-    logger.log("auth::processLogin -> token empty or invalid ");
-    return Promise.resolve(false);
+  if (token.iss != "ayanova.com") {
+    logger.log("auth::processLogin -> token invalid (iss)", token.iss);
+    return Promise.reject();
   }
-  //debugger;
+
   config.apiToken = response.data.token;
   config.userId = Number(token.id);
   config.roles = token["ayanova/roles"];
+
+  logger.log("User " + token.id + " logged in");
   return Promise.resolve(true);
 }
 
@@ -89,7 +95,7 @@ export function processLogin(response) {
 // });
 
 export function processLogout() {
-  logger.log("util\\auth.js->ProcessLogout called!");
+  logger.log("Logout");
   clearToken();
   //router.go('/');
 }