username.login implementation

monitoringartist · May 7, 2024 · 9fbc251 · 9fbc251
1 parent c79ec29
commit 9fbc251
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/js/jsonrpc.js b/js/jsonrpc.js
@@ -17,13 +17,22 @@ var jsonRpc = (function($) {
 			if (typeof params.xdebugsid !== 'undefined') {
 				hostname += '?XDEBUG_SESSION_START=' + params.xdebugsid;
 			}
-
-			this.call('user.login', {user: user, password: pass}, function(result) {
-				sessionid = result;
-				$('#connections').modal('hide');
-				$("#connInfo").text('Connected to ' + config.host.replace('https://', '').replace('http://',''));
-        jsonRpc.versioning();
-			});
+			try {
+				this.call('username.login', {user: user, password: pass}, function(result) {
+					sessionid = result;
+					$('#connections').modal('hide');
+					$("#connInfo").text('Connected to ' + config.host.replace('https://', '').replace('http://',''));
+					jsonRpc.versioning();
+				});
+			}
+			catch (e) {
+				this.call('user.login', {user: user, password: pass}, function(result) {
+					sessionid = result;
+					$('#connections').modal('hide');
+					$("#connInfo").text('Connected to ' + config.host.replace('https://', '').replace('http://',''));
+					jsonRpc.versioning();
+				});
+			}
 		},
 
 		versioning: function() {