add BUPT-portal using condition

creaink · creaink · commit 546a300cd494 · 2017-09-30T19:40:17.000+08:00
diff --git a/css/popup.css b/css/popup.css
@@ -112,6 +112,11 @@ h1 {
   text-align: center;
 }
 
-.error-template {padding: 40px 15px;text-align: center;}
-.error-actions {margin-top:15px;margin-bottom:15px;}
-.error-actions .btn { margin-right:10px; }
+.error-template {
+  padding: 40px 15px;
+  text-align: center;
+}
+
+.error-template button{
+  margin: 20px auto 10px auto;
+}
diff --git a/html/popup.html b/html/popup.html
@@ -35,7 +35,7 @@ <h1>北邮校园网登录</h1>
 				<div id="opt" class="col-xs-8 col-xs-offset-2">
 					<div class="form-inline">
 						<div class="btn-group">
-							<button type="button" id="btn-login" class="btn btn-primary ladda-button" data-style="zoom-out">登录</button>
+							<button type="button" id="btn-login" class="btn btn-primary" data-style="zoom-out">登录</button>
 							<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
 								<span class="caret"></span>
 							</button>
@@ -290,9 +290,16 @@ <h3 class="panel-title">Navigation</h3>
 					<h1>Oops!</h1>
 					<h2>404 Not Found</h2>
 					<hr>
-					<div class="error-details">
+					<div id="out-error">
 						您当前尚未接入北邮校园网环境
 					</div>
+					<div id="in-error">
+						您当前接入的为BUPT-portal，并且未登录<br> 点击下面的按钮使用首选账户接入校园网并登陆
+						<button type="button" id="btn-inlogin" class="btn btn-primary">接入校园网并登陆</button>					
+					</div>
+					<div class="alert alert-danger" style="display:none" id="inlogin-fail">
+						首选账号为空，请自行接入校园网
+					</div>					
 				</div>
 			</div>
 		<!-- end of 404 -->
diff --git a/js/background.js b/js/background.js
@@ -20,6 +20,10 @@ bkpage.isOverDay = false;
 
 bkpage.setting = {};
 
+/**
+ * 创建并弹出一个notifications
+ * @param str 显示字符串的内容
+ */
 bkpage.MakeNotice = function (str) {
   chrome.notifications.create({
 	"iconUrl": buptbase.paths.icon_on,
@@ -53,6 +57,49 @@ bkpage.subInt = function(mstr, start, end){
 	return parseInt(mstr);
 }
 
+/**
+ * 获取首选账号，与popup.js重复
+ */
+bkpage.GetSuperUser = function(){
+	var super_user = localStorage.getItem('su');
+	var result = {};
+
+	if (super_user !== null) {
+		super_user = JSON.parse(super_user);
+		var key;
+		for (key in super_user)
+			result.username = key;
+		result.password = super_user[key];
+	}
+
+	return result;
+}
+
+/**
+ * 尝试登录接入校园网(BUPT=poral)
+ */
+bkpage.TryPortal = function(){
+	var su = bkpage.GetSuperUser();
+	if (su.username){
+		$.ajax({
+			type: "POST",
+			dataType: "html",
+			url: buptbase.urls.portal_serverin,
+			data: {'user':su.username,'pass':su.password},
+			success : function (result) {
+				buptbase.log("bk: in portal");
+				// 再一次尝试自动登录
+				bkpage.GetNetStatus(true, undefined);
+			},
+			error : function (data) {
+				buptbase.log("bk: out portal");
+			}
+		});
+	} else {
+		buptbase.log("bk: out portal");
+	}
+}
+
 /**
  * buptnet.CheckNetStatus简化版，在打开浏览器的时候检查网络
  * @param isLoad 未登录时是否根据设置自动登录
@@ -66,9 +113,7 @@ bkpage.GetNetStatus = function (isLoad, hfunc){
 		success : function (result, status) {
 			// 获取页面标题判断账户状态
 			var retstr = result;
-			recc = retstr
-			result = $(result);
-			var title = result.filter('title').get(0).innerText;
+			var title = buptbase.GetInner(retstr, '<title>');
 			if (title == "上网注销窗"){
 				chrome.browserAction.setIcon({path: buptbase.paths.icon_on});
 				bkpage.state = 1;
@@ -85,6 +130,14 @@ bkpage.GetNetStatus = function (isLoad, hfunc){
 						bkpage.Login();
 					}
 				}
+			} else if (title == "北京邮电大学无线网准入认证\n") {
+				// portal时候的重定向
+				chrome.browserAction.setIcon({path: buptbase.paths.icon_off});				
+				bkpage.state = 0;
+				if(noTry == undefined && true == bkpage.setting['auto']){
+					bkpage.TryPortal();
+					buptbase.log("try")
+				}
 			}
 			// 在登录的情况下定时回调 hfunc
 			if (hfunc != undefined && bkpage.state == 1){
@@ -101,27 +154,18 @@ bkpage.GetNetStatus = function (isLoad, hfunc){
  * 登录首选账号
  */
 bkpage.Login = function (){
-	var info = {};
+	var info = bkpage.GetSuperUser();
+
+	buptbase.log(info.username);
 
-	var su = JSON.parse(localStorage.getItem('su'));
-	if (su != null){
-		for (var key in su){
-			info.username = key;
-			info.passwd = su[key];
-			buptbase.log(key);
-		}
-	}
 	$.ajax({
 		type: "POST",
 		dataType: "html",
 		url: buptbase.urls.server + buptbase.urls.login,
 		//0MKKey也得提交
-		data: {'DDDDD':info.username,'upass':info.passwd, 'savePWD':'0','0MKKey':''},
+		data: {'DDDDD':info.username,'upass':info.password, 'savePWD':'0','0MKKey':''},
 		success : function (result) {
-
-			result = $(result);
-			var title = result.filter('title').get(0).innerText;
-
+			var title = buptbase.GetInner(result, '<title>');			
 			if (title == "登录成功窗"){
 				bkpage.MakeNotice('自动登录成功\n登录账号:'+info.username);
 				localStorage.setItem('cuser', info.username);
diff --git a/js/base.js b/js/base.js
@@ -30,6 +30,10 @@ buptbase.urls.logsuccess = '/3.htm'
 buptbase.urls.logoff = '/F.htm'
 //外网ip查询api
 buptbase.urls.testip = 'http://pv.sohu.com/cityjson?ie=utf-8'
+//接入BUPT-portal时候的校园网网关，登录后即接入校园网
+//但还需经过buptbase.urls.server才能访问外网
+buptbase.urls.portal_server = 'http://10.3.8.214'
+buptbase.urls.portal_serverin = 'http://10.3.8.214/login'
 
 // debug console输出开关
 buptbase.debug = true;
@@ -109,7 +113,10 @@ buptbase.SaveData = function(data, filename){
     return br;
 }
 
-// 计算十进制下的显示版本
+/**
+ * 计算十进制下的显示版本
+ * @param flow 原始数据十进制下的存储版本
+ */
 buptbase.ConvertFlow = function(flow){
 	if (flow != null){
 		var flow0, flow1, flow3;
@@ -160,3 +167,23 @@ buptbase.getMyTime = function() {
 	}
 	return t;
 }
+
+/**
+ * 处理截取返回字符串str中start和end中的内容，如果为标签则传入start即可
+ * @param str 需要处理的字符串
+ * @param start 开头字符串，可以与end重复
+ * @param end 结束字符串，未传参默认当做<>补充/
+ * @return 截取的中间字符串
+ */
+buptbase.GetInner = function(str, start, end){
+	var pos = 0;
+	if (end == undefined){
+		var end = start.replace('<', '</');
+	}
+	if (end == start){
+		pos = str.indexOf(start);
+		return str.substring(pos, str.indexOf(end, pos + 1)).replace(start,'');
+	}else{
+		return str.substring(str.indexOf(start), str.indexOf(end)).replace(start,'');
+	}
+}
diff --git a/js/popup.js b/js/popup.js
@@ -11,16 +11,6 @@ String.prototype.replaceAll = function(s1,s2){
 　　return this.replace(new RegExp(s1,"gm"),s2);
 };
 
-
-// 生成默认用户数据
-function GenDeUserdata() {
-	var userdata = {};
-	userdata.username = "";
-	userdata.passwd = "";
-	userdata.flow = [];
-	return userdata;
-}
-
 buptnet = {};
 
 // 0:未登录，1:已登录
@@ -43,7 +33,7 @@ buptnet.env = {};
 buptnet.Script2Json = function (scriptStr){
 	var retStr = [];
 
-	scriptStr= scriptStr.replaceAll(';','\n').replaceAll('\'','\"');
+	scriptStr = scriptStr.replaceAll(';','\n').replaceAll('\'','\"');
 	scriptStr = scriptStr.match(/.+/g);
 	scriptStr.forEach(function(element) {
 		retStr.push(element.replace(/([\w_]+)=(.*)/,"\"$1\":$2"));
@@ -53,17 +43,19 @@ buptnet.Script2Json = function (scriptStr){
 	return JSON.parse(retStr);
 }
 
-
-
-// 充值的流量，返回单位 MB
+/**
+ * 充值的流量，返回单位 MB
+ */
 buptnet.GetExFlow = function (){
 	var exFlow = buptnet.state_data['fee'];
 	// exFlow/10000=元，一元一GB
 	exFlow = parseInt(exFlow/10000*1024*1024);
 	return buptbase.ConvertFlow(exFlow);
 }
 
-// 已用流量，返回单位 MB
+/**
+ * 已用流量，返回单位 MB
+ */
 buptnet.GetFlow = function (){
 	var flow = buptnet.state_data['flow'];
 	return buptbase.ConvertFlow(flow);
@@ -80,9 +72,10 @@ buptnet.btnwait.start = function(){
 	buptnet.btnwait.btn.text('ing...');
 	buptnet.btnwait.btn.attr('disabled','disabled');
 }
-// buptnet.btnwait = Ladda.create(document.querySelector( '#btn-login'));
 
-// 无动画的切换登录和登陆后的页面
+/**
+ * 无动画的切换登录和登陆后的页面
+ */
 buptnet.ChangePage = function(){
 	if (buptnet.state_last != buptnet.state){
 
@@ -99,7 +92,10 @@ buptnet.ChangePage = function(){
 	buptbase.log('change');
 }
 
-// 获取一般情况下页面内嵌入的JavaScript变量
+/**
+ * 获取一般情况下页面内嵌入的JavaScript变量
+ * @param jqObj 返回的页面的化后的jQuery对象
+ */
 buptnet.GetScriptData = function(jqObj){
 	// 获取页面内script参数
 	var data = jqObj.filter('script').get(0).innerText;
@@ -108,10 +104,63 @@ buptnet.GetScriptData = function(jqObj){
 	return buptnet.Script2Json(data);
 }
 
+/**
+ * 检查是否为BUPT-portal环境
+ */
+buptnet.BUPT_portal_Check  = function(){
+	$.ajax({
+		type: "GET",
+		dataType: "html",
+		url: buptbase.urls.portal_server,
+		async : false,			
+		success : function (result) {
+			buptbase.log("in portal")
+			$('#out-error').hide();
+			$('#in-error').show();
+		},
+		error : function (data) {
+			buptbase.log("out portal")			
+			$('#in-error').hide();
+			$('#out-error').show();
+		}
+	});
+
+}
+
+/**
+ * BUPT-portal环境且未接入校园网时候自动登录首选账号
+ */
+buptnet.BUPT_portal_login = function(){
+	var su = buptnet.GetSuperUser();
+	if (su.username){
+		$.ajax({
+			type: "POST",
+			dataType: "html",
+			url: buptbase.urls.portal_serverin,
+			data: {'user':su.username,'pass':su.password},
+			success : function (result) {
+				buptbase.log("in portal");
+				// 装载首选用户并登陆
+				buptnet.LoadLoginInfo();
+				buptnet.Login();
+				// 切换面板
+				$('#error').hide();
+				$('#fun-panel').show();
+			},
+			error : function (data) {
+				buptbase.log("out portal");		
+			}
+		});
+	} else {
+		$('#inlogin-fail').show();
+	}
+}
+
 // 连接不上
 buptnet.Ajaxfaild = function(){
 	$('#login-panel').hide();
 	$('#fun-panel').hide();
+	buptnet.BUPT_portal_Check();
 	$('#error').fadeIn();
 }
 
@@ -472,7 +521,7 @@ buptnet.LoadUserList = function(){
 /**
  * 绑定一些回调函数
  */
-buptnet.BindButton = function (params) {
+buptnet.BindButton = function () {
 	$('#btn-login').click(buptnet.Login);
 	$('#btn-logoff').click(buptnet.Logoff);
 
@@ -514,6 +563,8 @@ buptnet.BindButton = function (params) {
 	 });
 	// 绑定，模态对话框
 	$('#myModal').on('shown.bs.modal', function () {});
+	//绑定portal下的一键登录
+	$('#btn-inlogin').click(buptnet.BUPT_portal_login);
 }
 
 /**
diff --git a/manifest.json b/manifest.json
@@ -7,6 +7,7 @@
   "permissions":[
     "tabs",
     "http://10.3.8.211/",
+    "http://10.3.8.214/",
     "http://pv.sohu.com/",
     "storage",
     "notifications",
