Parcourir la source

fix verbage on login failed

causefx il y a 7 ans
Parent
commit
5643f23dab
3 fichiers modifiés avec 6 ajouts et 4 suppressions
  1. 3 3
      api/functions/sso-functions.php
  2. 3 1
      js/custom.js
  3. 0 0
      js/custom.min.js

+ 3 - 3
api/functions/sso-functions.php

@@ -22,11 +22,11 @@ function ssoCheck($username, $password, $token = null)
 	return true;
 	return true;
 }
 }
 
 
-function getOmbiToken($username, $password, $token = null)
+function getOmbiToken($username, $password, $oAuthToken = null)
 {
 {
+	$token = null;
 	try {
 	try {
 		$url = $GLOBALS['ombiURL'] . '/api/v1/Token';
 		$url = $GLOBALS['ombiURL'] . '/api/v1/Token';
-		$token = null;
 		$headers = array(
 		$headers = array(
 			"Accept" => "application/json",
 			"Accept" => "application/json",
 			"Content-Type" => "application/json"
 			"Content-Type" => "application/json"
@@ -42,10 +42,10 @@ function getOmbiToken($username, $password, $token = null)
 			$token = json_decode($response->body, true)['access_token'];
 			$token = json_decode($response->body, true)['access_token'];
 			writeLog('success', 'Ombi Token Function - Grabbed token.', $username);
 			writeLog('success', 'Ombi Token Function - Grabbed token.', $username);
 		}
 		}
-		return ($token) ? $token : false;
 	} catch (Requests_Exception $e) {
 	} catch (Requests_Exception $e) {
 		writeLog('success', 'Ombi Token Function - Error: ' . $e->getMessage(), $username);
 		writeLog('success', 'Ombi Token Function - Error: ' . $e->getMessage(), $username);
 	};
 	};
+	return ($token) ? $token : false;
 }
 }
 
 
 function getTautulliToken($username, $password, $plexToken = null)
 function getTautulliToken($username, $password, $plexToken = null)

+ 3 - 1
js/custom.js

@@ -356,7 +356,9 @@ $(document).on("click", ".login-button", function(e) {
             console.error('Organizr Function: Login failed');
             console.error('Organizr Function: Login failed');
         }
         }
     }).fail(function(xhr) {
     }).fail(function(xhr) {
-        console.error("Organizr Function: Login Failed");
+        $('div.login-box').unblock({});
+        message('Login Error','API Connection Failed',activeInfo.settings.notifications.position,'#FFF','warning','10000');
+        console.error("Organizr Function: API Connection Failed");
     });
     });
 });
 });
 $(document).on("click", ".unlockButton", function(e) {
 $(document).on("click", ".unlockButton", function(e) {

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
js/custom.min.js


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff