From a4e25ed95b896f39aadec6123543dae1bc80e8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Sat, 21 Mar 2020 00:58:21 +0100 Subject: teachers.js, absences.js: uporabljajo gsec.js; gsec.js: spremembe apija --- js/login.js | 67 ++++++++++++++++++++----------------------------------------- 1 file changed, 22 insertions(+), 45 deletions(-) (limited to 'js/login.js') diff --git a/js/login.js b/js/login.js index d7c9579..281f7bc 100644 --- a/js/login.js +++ b/js/login.js @@ -1,4 +1,4 @@ -const API_ENDPOINT = "https://gimb.tk/test.php"; +// const API_ENDPOINT = "https://gimb.tk/test.php"; // deprecated document.addEventListener("DOMContentLoaded", () => { setupEventListeners(); }) @@ -21,48 +21,25 @@ function setupEventListeners() { // Handle login button click function login() { - // Get text input values - let username = $("#username").val(); - let password = $("#password").val(); - - // Make a request - $.ajax({ - url: API_ENDPOINT, - crossDomain: true, - - data: { - "u": username, - "p": password, - "m": "fetchprofil" - }, - dataType: "json", - - cache: false, - type: "GET", - - success: function (data) { - - // If ime is null, the password was incorrect - if (data["ime"] === null) { - UIAlert( S("loginFailed"), "login(): fetchprofil null name; bad login info." ); - $("#password").val(""); - } else { - - let promises_to_run = [ - localforage.setItem("logged_in", true), - localforage.setItem("username", username), - localforage.setItem("password", password) - ]; - Promise.all(promises_to_run).then(function () { - window.location.replace("/pages/timetable.html"); - }); - - } - }, - - error: function () { - UIAlert( S("noInternetConnection"), "login(): $.ajax error" ); - } - - }) + let username = $("#username").val(); + let password = $("#password").val(); + var gsecInstance = new gsec(); + gsecInstance.login(username, password).then( (value) => { + if(typeof value == "string") { + let promises_to_run = [ + localforage.setItem("logged_in", true), + localforage.setItem("username", username), + localforage.setItem("password", password) + ]; + Promise.all(promises_to_run).then(function () { + window.location.replace("/pages/timetable.html"); + }); + } else { + UIAlert("loginFailed"); + $("#password").val(""); + } + }).catch((err) => { + gsecErrorHandlerUI(err); + $("#password").val(""); + }); } -- cgit v1.2.3