From 734975562f32e9dff362e61ce1e8726a87c4821b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 2 Mar 2022 23:02:40 +0000 Subject: [PATCH] --- ayanova/src/api/gzapi.js | 16 +++++++++++++--- ayanova/src/views/login.vue | 8 +++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ayanova/src/api/gzapi.js b/ayanova/src/api/gzapi.js index de6d36c3..128a1765 100644 --- a/ayanova/src/api/gzapi.js +++ b/ayanova/src/api/gzapi.js @@ -121,10 +121,20 @@ export default { return Promise.resolve(response); } }, - statusEx(response) { + statusEx(response, isLogin = false) { //Handle expected api errors if (response.status == 401) { - throw new Error("LT:ErrorUserNotAuthenticated"); + 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 + } + } } if (response.status == 403) { @@ -455,7 +465,7 @@ export default { } let r = await fetch(that.APIUrl(route), fetchOptions); - that.statusEx(r); + that.statusEx(r, isLogin); r = await that.extractBodyEx(r); return r; } catch (error) { diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue index bc939d26..5eddf900 100644 --- a/ayanova/src/views/login.vue +++ b/ayanova/src/views/login.vue @@ -531,7 +531,6 @@ export default { true ); if (res.error) { - console.log(res.error); //don't expect this to ever get called but just in case throw new Error(window.$gz.errorHandler.errorToString(res, vm)); } @@ -551,6 +550,12 @@ export default { await this.step2(res); } catch (error) { + if ( + error.message && + error.message.includes("License agreement consent required") + ) { + window.location.reload(); + } //bad creds? if ( error.message && @@ -567,6 +572,7 @@ export default { //probably here because server unresponsive. if (error.message) { let msg = error.message; + if ( msg.includes("NetworkError") || msg.includes("Failed to fetch")