Can login now without auth
This commit is contained in:
@@ -85,6 +85,7 @@
|
||||
<script>
|
||||
/* xeslint-disable */
|
||||
import auth from "../api/auth";
|
||||
import { processLogin, processLogout } from "../api/authutil";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@@ -269,84 +270,149 @@ export default {
|
||||
//move focus to password
|
||||
document.getElementsByName("password")[0].focus();
|
||||
},
|
||||
login() {
|
||||
async login() {
|
||||
let vm = this;
|
||||
if (vm.input.username != "" && vm.input.password != "") {
|
||||
vm.errorBadCreds = false;
|
||||
auth
|
||||
.authenticate(vm.input.username, vm.input.password)
|
||||
.then(() => {
|
||||
/*public enum LicenseStatus
|
||||
{
|
||||
NONE = 0,//fast track
|
||||
ActiveTrial = 1,//slow track
|
||||
ExpiredTrial = 2,//fast track
|
||||
ActivePurchased = 3,//slow track
|
||||
ExpiredPurchased = 4,//fast track
|
||||
Revoked = 5//slow track
|
||||
} */
|
||||
//check if support and updates has expired and is paid for license and show warning if so
|
||||
if (
|
||||
vm.$store.state.globalSettings.maintenanceExpired &&
|
||||
(vm.$store.state.globalSettings.licenseStatus == 3 ||
|
||||
vm.$store.state.globalSettings.licenseStatus == 4)
|
||||
) {
|
||||
(async function() {
|
||||
await window.$gz.dialog.displayLTModalNotificationMessage(
|
||||
"MaintenanceExpiredNote",
|
||||
"MaintenanceExpired",
|
||||
"error",
|
||||
"https://www.ayanova.com/subscriptionexpired.htm"
|
||||
);
|
||||
})();
|
||||
}
|
||||
if (vm.$store.state.openObject != null) {
|
||||
window.$gz.eventBus.$emit("openobject", null);
|
||||
} else {
|
||||
vm.$router.push(vm.$store.state.homePage);
|
||||
}
|
||||
})
|
||||
.catch(function handleCaughtLoginError(error) {
|
||||
//bad creds?
|
||||
if (
|
||||
error.message &&
|
||||
error.message.includes("ErrorUserNotAuthenticated")
|
||||
) {
|
||||
vm.errorBadCreds = true;
|
||||
return;
|
||||
}
|
||||
//server closed by server state setting?
|
||||
if (error.code == 2000 || error.code == 2001) {
|
||||
vm.formState.errorBoxMessage = error.message;
|
||||
return;
|
||||
}
|
||||
//probably here because server unresponsive.
|
||||
if (error.message) {
|
||||
let msg = error.message;
|
||||
if (
|
||||
msg.includes("NetworkError") ||
|
||||
msg.includes("Failed to fetch")
|
||||
) {
|
||||
msg =
|
||||
"Could not connect to AyaNova server at " +
|
||||
window.$gz.api.APIUrl("") +
|
||||
"\r\nError: " +
|
||||
error.message;
|
||||
}
|
||||
vm.formState.errorBoxMessage = msg;
|
||||
return;
|
||||
}
|
||||
/* xeslint-disable-next-line */
|
||||
|
||||
/*
|
||||
server down errors:
|
||||
firefox: NetworkError when attempting to fetch resource."
|
||||
brave: Error in login.vue catch: TypeError: Failed to fetch
|
||||
chrome: Error in auth.js catch: TypeError: Failed to fetch
|
||||
*/
|
||||
//auth directly bypass auth here
|
||||
//==========================
|
||||
let loggedInWithKnownPassword =
|
||||
vm.input.username == "superuser" && vm.input.password == "l3tm3in";
|
||||
|
||||
//-----
|
||||
try {
|
||||
let res = await window.$gz.api.upsertEx("auth", {
|
||||
login: vm.input.username,
|
||||
password: vm.input.password
|
||||
});
|
||||
|
||||
if (res.error) {
|
||||
//todo, this is shitty if it's just a bad login creds so handle that here instead of in cacth block
|
||||
debugger;
|
||||
throw res.error;
|
||||
}
|
||||
await processLogin(res.data, loggedInWithKnownPassword);
|
||||
|
||||
//check if support and updates has expired and is paid for license and show warning if so
|
||||
if (
|
||||
vm.$store.state.globalSettings.maintenanceExpired &&
|
||||
(vm.$store.state.globalSettings.licenseStatus == 3 ||
|
||||
vm.$store.state.globalSettings.licenseStatus == 4)
|
||||
) {
|
||||
(async function() {
|
||||
await window.$gz.dialog.displayLTModalNotificationMessage(
|
||||
"MaintenanceExpiredNote",
|
||||
"MaintenanceExpired",
|
||||
"error",
|
||||
"https://www.ayanova.com/subscriptionexpired.htm"
|
||||
);
|
||||
})();
|
||||
}
|
||||
if (vm.$store.state.openObject != null) {
|
||||
window.$gz.eventBus.$emit("openobject", null);
|
||||
} else {
|
||||
vm.$router.push(vm.$store.state.homePage);
|
||||
}
|
||||
} catch (error) {
|
||||
//bad creds?
|
||||
if (
|
||||
error.message &&
|
||||
error.message.includes("ErrorUserNotAuthenticated")
|
||||
) {
|
||||
vm.errorBadCreds = true;
|
||||
return;
|
||||
}
|
||||
//server closed by server state setting?
|
||||
if (error.code == 2000 || error.code == 2001) {
|
||||
vm.formState.errorBoxMessage = error.message;
|
||||
return;
|
||||
}
|
||||
//probably here because server unresponsive.
|
||||
if (error.message) {
|
||||
let msg = error.message;
|
||||
if (
|
||||
msg.includes("NetworkError") ||
|
||||
msg.includes("Failed to fetch")
|
||||
) {
|
||||
msg =
|
||||
"Could not connect to AyaNova server at " +
|
||||
window.$gz.api.APIUrl("") +
|
||||
"\r\nError: " +
|
||||
error.message;
|
||||
}
|
||||
vm.formState.errorBoxMessage = msg;
|
||||
return;
|
||||
}
|
||||
}
|
||||
//==========================
|
||||
|
||||
//############## OLD AUTH ########################
|
||||
// auth
|
||||
// .authenticate(vm.input.username, vm.input.password)
|
||||
// .then(() => {
|
||||
// /*public enum LicenseStatus
|
||||
// {
|
||||
// NONE = 0,//fast track
|
||||
// ActiveTrial = 1,//slow track
|
||||
// ExpiredTrial = 2,//fast track
|
||||
// ActivePurchased = 3,//slow track
|
||||
// ExpiredPurchased = 4,//fast track
|
||||
// Revoked = 5//slow track
|
||||
// } */
|
||||
// //check if support and updates has expired and is paid for license and show warning if so
|
||||
// if (
|
||||
// vm.$store.state.globalSettings.maintenanceExpired &&
|
||||
// (vm.$store.state.globalSettings.licenseStatus == 3 ||
|
||||
// vm.$store.state.globalSettings.licenseStatus == 4)
|
||||
// ) {
|
||||
// (async function() {
|
||||
// await window.$gz.dialog.displayLTModalNotificationMessage(
|
||||
// "MaintenanceExpiredNote",
|
||||
// "MaintenanceExpired",
|
||||
// "error",
|
||||
// "https://www.ayanova.com/subscriptionexpired.htm"
|
||||
// );
|
||||
// })();
|
||||
// }
|
||||
// if (vm.$store.state.openObject != null) {
|
||||
// window.$gz.eventBus.$emit("openobject", null);
|
||||
// } else {
|
||||
// vm.$router.push(vm.$store.state.homePage);
|
||||
// }
|
||||
// })
|
||||
// .catch(function handleCaughtLoginError(error) {
|
||||
// //bad creds?
|
||||
// if (
|
||||
// error.message &&
|
||||
// error.message.includes("ErrorUserNotAuthenticated")
|
||||
// ) {
|
||||
// vm.errorBadCreds = true;
|
||||
// return;
|
||||
// }
|
||||
// //server closed by server state setting?
|
||||
// if (error.code == 2000 || error.code == 2001) {
|
||||
// vm.formState.errorBoxMessage = error.message;
|
||||
// return;
|
||||
// }
|
||||
// //probably here because server unresponsive.
|
||||
// if (error.message) {
|
||||
// let msg = error.message;
|
||||
// if (
|
||||
// msg.includes("NetworkError") ||
|
||||
// msg.includes("Failed to fetch")
|
||||
// ) {
|
||||
// msg =
|
||||
// "Could not connect to AyaNova server at " +
|
||||
// window.$gz.api.APIUrl("") +
|
||||
// "\r\nError: " +
|
||||
// error.message;
|
||||
// }
|
||||
// vm.formState.errorBoxMessage = msg;
|
||||
// return;
|
||||
// }
|
||||
// });
|
||||
|
||||
//#################################################
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -354,7 +420,8 @@ export default {
|
||||
//very important as this in conjunction with the menu options means
|
||||
//navigation guards work properly by just sending people here
|
||||
next(() => {
|
||||
auth.logout();
|
||||
// auth.logout();
|
||||
processLogout();
|
||||
next();
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user