This commit is contained in:
2022-03-02 23:15:44 +00:00
parent 734975562f
commit c26d3add09
3 changed files with 7 additions and 16 deletions

View File

@@ -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 now 10% of future wo have no scheduled users set to show off unscheduled widget
- seeder no CSR generated in future - 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 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

View File

@@ -121,20 +121,10 @@ export default {
return Promise.resolve(response); return Promise.resolve(response);
} }
}, },
statusEx(response, isLogin = false) { statusEx(response) {
//Handle expected api errors //Handle expected api errors
if (response.status == 401) { if (response.status == 401) {
if (!isLogin) { throw new Error("LT:ErrorUserNotAuthenticated");
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) { if (response.status == 403) {
@@ -465,7 +455,7 @@ export default {
} }
let r = await fetch(that.APIUrl(route), fetchOptions); let r = await fetch(that.APIUrl(route), fetchOptions);
that.statusEx(r, isLogin); that.statusEx(r);
r = await that.extractBodyEx(r); r = await that.extractBodyEx(r);
return r; return r;
} catch (error) { } catch (error) {
@@ -473,6 +463,7 @@ export default {
handleError("UPSERT", error, route); handleError("UPSERT", error, route);
} else { } else {
//specifically this is for the login page //specifically this is for the login page
console.log("upser error is: ", error);
throw new Error(window.$gz.errorHandler.errorToString(error)); throw new Error(window.$gz.errorHandler.errorToString(error));
} }
} }

View File

@@ -531,7 +531,6 @@ export default {
true true
); );
if (res.error) { if (res.error) {
//don't expect this to ever get called but just in case
throw new Error(window.$gz.errorHandler.errorToString(res, vm)); 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 //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); await this.step2(res);
} catch (error) { } catch (error) {
console.trace("The error is:", error);
if ( if (
error.message && error.message &&
error.message.includes("License agreement consent required") error.message.includes("License agreement consent required")