From bceaf23d2e85ab76e2a87690a840006fd63a3301 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 11 Sep 2013 13:55:36 +0200
Subject: [PATCH] js: switch to ubus rpc login instead of luci-login

---
 luci2/htdocs/luci2/luci2.js | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/luci2/htdocs/luci2/luci2.js b/luci2/htdocs/luci2/luci2.js
index a012e5f..e3e7b0c 100644
--- a/luci2/htdocs/luci2/luci2.js
+++ b/luci2/htdocs/luci2/luci2.js
@@ -433,7 +433,8 @@ function LuCI2()
 	};
 
 	this.globals = {
-		resource: '/luci2'
+		resource: '/luci2',
+		sid:      '00000000000000000000000000000000'
 	};
 
 	this.rpc = {
@@ -1760,24 +1761,24 @@ function LuCI2()
 						.text(_luci2.tr('Enter your username and password above, then click "%s" to proceed.').format(_luci2.tr('Ok'))))
 			);
 
-			var response = _luci2._login_response_cb || (
-				_luci2._login_response_cb = function(data) {
-					if (typeof(data) == 'object' && typeof(data.sessionid) == 'string')
+			var response_cb = _luci2._login_response_cb || (
+				_luci2._login_response_cb = function(response) {
+					if (!response.sid)
 					{
-						_luci2.globals.sid = data.sessionid;
+						_luci2.ui.login(true);
+					}
+					else
+					{
+						_luci2.globals.sid = response.sid;
 						_luci2.setHash('id', _luci2.globals.sid);
 
 						_luci2.ui.dialog(false);
 						_luci2._login_deferred.resolve();
 					}
-					else
-					{
-						_luci2.ui.login(true);
-					}
 				}
 			);
 
-			var confirm = _luci2._login_confirm_cb || (
+			var confirm_cb = _luci2._login_confirm_cb || (
 				_luci2._login_confirm_cb = function() {
 					var d = _luci2._login;
 					var u = d.find('[name=username]').val();
@@ -1798,14 +1799,7 @@ function LuCI2()
 						], { style: 'wait' }
 					);
 
-					$.ajax('/cgi-bin/luci-login', {
-						type:        'POST',
-						cache:       false,
-						data:        { username: u, password: p },
-						dataType:    'json',
-						success:     response,
-						error:       response
-					});
+					rcall('session', 'login', { username: u, password: p }, undefined, { }, response_cb);
 				}
 			);
 
@@ -1816,7 +1810,7 @@ function LuCI2()
 
 			_luci2.ui.dialog(_luci2.tr('Authorization Required'), form, {
 				style: 'confirm',
-				confirm: confirm
+				confirm: confirm_cb
 			});
 
 			return _luci2._login_deferred;
-- 
2.11.0