From c26d3add098a5128984cbfdbb362095b8c559d16 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 2 Mar 2022 23:15:44 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt    |  4 ++--
 ayanova/src/api/gzapi.js    | 17 ++++-------------
 ayanova/src/views/login.vue |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 2e5834c6..6aed099d 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -55,7 +55,7 @@ https://www.calculator.net/percent-calculator.html
 			criteria: 
 				timespan and INTERVAL
 				tags wo
-				
+
 		BAR % wo completed status vs not completed by completed date within interval
 			query is 
 				all wo not completed that should be by now within the interval vs all that were completed within the interval, count up each, count up the total and present as a pct for that interval
@@ -886,7 +886,7 @@ BUILD 8.0.0-beta.1-rc3 CHANGES OF NOTE
 - seeder now 10% of future wo have no scheduled users set to show off unscheduled widget
 - seeder no CSR generated in future
 - Fixed bug in data table filter control when changing existing filter AND OR conditions radio buttons was not flagging as dirty so it could be saved
-
+- fixed bug in login when license agreement required but already displaying login screen (from prior use) would just fail to login without explanation, now shows license agreement properly
 
 
 
diff --git a/ayanova/src/api/gzapi.js b/ayanova/src/api/gzapi.js
index 128a1765..ef3d6b37 100644
--- a/ayanova/src/api/gzapi.js
+++ b/ayanova/src/api/gzapi.js
@@ -121,20 +121,10 @@ export default {
       return Promise.resolve(response);
     }
   },
-  statusEx(response, isLogin = false) {
+  statusEx(response) {
     //Handle expected api errors
     if (response.status == 401) {
-      if (!isLogin) {
-        throw new Error("LT:ErrorUserNotAuthenticated");
-      } else {
-        if (
-          response.statusText.includes("License agreement consent required")
-        ) {
-          throw new Error(response.statusText);
-        } else {
-          throw new Error("LT:ErrorUserNotAuthenticated"); //bad login or password
-        }
-      }
+      throw new Error("LT:ErrorUserNotAuthenticated");
     }
 
     if (response.status == 403) {
@@ -465,7 +455,7 @@ export default {
       }
 
       let r = await fetch(that.APIUrl(route), fetchOptions);
-      that.statusEx(r, isLogin);
+      that.statusEx(r);
       r = await that.extractBodyEx(r);
       return r;
     } catch (error) {
@@ -473,6 +463,7 @@ export default {
         handleError("UPSERT", error, route);
       } else {
         //specifically this is for the login page
+        console.log("upser error is: ", error);
         throw new Error(window.$gz.errorHandler.errorToString(error));
       }
     }
diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue
index 5eddf900..51a8eaf2 100644
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -531,7 +531,6 @@ export default {
             true
           );
           if (res.error) {
-            //don't expect this to ever get called but just in case
             throw new Error(window.$gz.errorHandler.errorToString(res, vm));
           }
           //check for 2fa enabled, if so then need to do one more step before process login can be called
@@ -550,6 +549,7 @@ export default {
 
           await this.step2(res);
         } catch (error) {
+          console.trace("The error is:", error);
           if (
             error.message &&
             error.message.includes("License agreement consent required")