#15838 暗号化されたログインIDとパスワードの受け取りと自動ログイン

abvw/js/login.js

@@ -11,6 +11,7 @@ LOGIN.force_pw_change_on_login;
 LOGIN.force_pw_change_periodically;
 LOGIN.force_pw_change_periodically;
 LOGIN.user_data_backup;
 LOGIN.user_data_backup;
 LOGIN.marking;
 LOGIN.marking;
+LOGIN.login_error_flag = false;
 LOGIN.force_login_periodically;
 LOGIN.force_login_periodically;
 LOGIN.login_errorMessage = "";
 LOGIN.login_errorMessage = "";
 LOGIN.avwUserEnvObj = new UserEnvironment();
 LOGIN.avwUserEnvObj = new UserEnvironment();
@@ -87,12 +88,12 @@ LOGIN.saveLoginInfo = function(paramLid, paramP, accountPath) {
 
 
 //Check validation
 //Check validation
 LOGIN.checkValidation = function() {
 LOGIN.checkValidation = function() {
-	
+
 	//暗号化モードならチェック無し
 	//暗号化モードならチェック無し
 	if(ClientData.serviceOpt_encryption() == 'Y') {
 	if(ClientData.serviceOpt_encryption() == 'Y') {
 		return true;
 		return true;
 	}
 	}
-	
+
     var accountPath = $('#txtAccPath').val();
     var accountPath = $('#txtAccPath').val();
     var loginId = $('#txtAccId').val();
     var loginId = $('#txtAccId').val();
     var password = $('#txtPassword').val();
     var password = $('#txtPassword').val();
@@ -161,7 +162,6 @@ LOGIN.checkDialogValidation = function() {
 
 
 //Login Process
 //Login Process
 LOGIN.processLogin = function(paramLid, paramP) {
 LOGIN.processLogin = function(paramLid, paramP) {
-
 	var accountPath = "";
 	var accountPath = "";
 	var loginId = "";
 	var loginId = "";
 	var password = "";
 	var password = "";
@@ -352,6 +352,7 @@ LOGIN.processLogin = function(paramLid, paramP) {
         }
         }
 
 
     }, function (xhr, statusText, errorThrown) {
     }, function (xhr, statusText, errorThrown) {
+    	LOGIN.login_error_flag = true;
         if (xhr.responseText && xhr.status != 0) {
         if (xhr.responseText && xhr.status != 0) {
             LOGIN.login_errorMessage = JSON.parse(xhr.responseText).errorMessage;
             LOGIN.login_errorMessage = JSON.parse(xhr.responseText).errorMessage;
 
 
@@ -360,6 +361,7 @@ LOGIN.processLogin = function(paramLid, paramP) {
             $('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
             $('#main-error-message').html(AVWEB.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
         }
         }
         $('#main-error-message').show();
         $('#main-error-message').show();
+        $('#formlogin').show();
     });
     });
 };
 };
 
 
@@ -970,30 +972,35 @@ LOGIN.ready = function(){
     	//doutor
     	//doutor
     	var paramLid = COMMON.getUrlParam('lid', '');
     	var paramLid = COMMON.getUrlParam('lid', '');
     	var paramP = COMMON.getUrlParam('p', '');
     	var paramP = COMMON.getUrlParam('p', '');
-    	
+
     	//引数でアカウントパスを受け取ったらセットする
     	//引数でアカウントパスを受け取ったらセットする
     	var urlPath = COMMON.getUrlParam('urlPath', '');
     	var urlPath = COMMON.getUrlParam('urlPath', '');
     	if( urlPath != '' ){
     	if( urlPath != '' ){
     		$('#txtAccPath').val(urlPath);
     		$('#txtAccPath').val(urlPath);
     	}
     	}
-    	
+
         $('#normalUser').show();
         $('#normalUser').show();
         $('#formlogin').hide();
         $('#formlogin').hide();
         $('#logologin').animate({ "margin-top": 0 }, LOGIN.timeWaitSplashScreen,
         $('#logologin').animate({ "margin-top": 0 }, LOGIN.timeWaitSplashScreen,
             function () {
             function () {
-        		$('#formlogin').show();
+        		console.log("fsdfsd");
+        		if(( paramLid == '' && paramP == '') || ( paramLid != '' && paramP != '' && LOGIN.login_error_flag == true)){
+        			$('#formlogin').show();
+        		}
         		$('#menu-language').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
         		$('#menu-language').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
-        		$('#formlogin').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
+        		if( paramLid != '' && paramP != '' && LOGIN.login_error_flag == false){
+        			$('#formlogin').css("opacity","0");
+        		} else {
+        			$('#formlogin').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
+        		}
         		$('.cnt_footer').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
         		$('.cnt_footer').animate({ opacity: 1 }, LOGIN.timeWaitSplashScreen);
             }
             }
         );
         );
-
     	if( paramLid != '' && paramP != '' ){
     	if( paramLid != '' && paramP != '' ){
     		LOGIN.processLogin(paramLid, paramP);
     		LOGIN.processLogin(paramLid, paramP);
     	} else {
     	} else {
-            LOGIN.initLoginNormalUser();
+            $('#formlogin').show();
     	}
     	}
-
     }
     }
 };
 };
 //});
 //});

login.html

@@ -72,14 +72,15 @@
 			<ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="./abvw/img/common/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="./abvw/img/common/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="./abvw/img/common/flg_kor.png" width="29" height="20"></a></li></ul>
 			<ul class="floatR" id="menu-language"><li class="language"><a id="language-ja"><img src="./abvw/img/common/flg_jpn.png" width="29" height="20"></a></li><li class="language"><a id="language-en"><img src="./abvw/img/common/flg_usa.png" width="29" height="20"></a></li><li class="language"><a id="language-ko"><img src="./abvw/img/common/flg_kor.png" width="29" height="20"></a></li></ul>
 			<article>
 			<article>
 			<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
 			<img src="./abvw/img/login/logo_login.png" width="200" class="clearboth" id="logologin">
-			<section id="formlogin">
+			<section id="formlogin" style="display:none;">
 
 
-				<table width="440" border="0" cellspacing="0">
+				<table id="msgdotoru" width="440" border="0" cellspacing="0" >
 				<tr>
 				<tr>
 					<th width="100%" >ポータルサイトからログインしてください</th>
 					<th width="100%" >ポータルサイトからログインしてください</th>
 				</tr>
 				</tr>
 				</table>
 				</table>
-				<input type="hidden" id="txtAccPath" value="vietdh" />
+
+				<input type="hidden" id="txtAccPath" value="" />
 
 
 				<!--
 				<!--
 				<table width="440" border="0" cellspacing="0">
 				<table width="440" border="0" cellspacing="0">