Commit 9b3fa578 by Kang Donghun

ログインする時、トークンチェック処理修正

parent 3b875d1f
...@@ -93,6 +93,7 @@ ...@@ -93,6 +93,7 @@
<label for="confirm" class="lang" lang="txtPwdNewRe">新しいパスワード(確認)</label> <label for="confirm" class="lang" lang="txtPwdNewRe">新しいパスワード(確認)</label>
<input type="password" class="form-control" id="txtConfirmNew" aria-describedby="confirm" maxlength="16"> <input type="password" class="form-control" id="txtConfirmNew" aria-describedby="confirm" maxlength="16">
</div> </div>
<input type="hidden" id="getToken">
</form> </form>
<span id="dialog-error-message" class="alertTxtDialog lang"></span> <span id="dialog-error-message" class="alertTxtDialog lang"></span>
</div> </div>
......
...@@ -216,6 +216,7 @@ LOGIN.processLogin = function () { ...@@ -216,6 +216,7 @@ LOGIN.processLogin = function () {
// move to home.html page // move to home.html page
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
} else if (data.requirePasswordChange == 1) { } else if (data.requirePasswordChange == 1) {
$('#getToken').val(data.token);
if (LOGIN.force_pw_change_on_login == 2) { if (LOGIN.force_pw_change_on_login == 2) {
// force to change // force to change
// password // password
...@@ -257,6 +258,7 @@ LOGIN.processLogin = function () { ...@@ -257,6 +258,7 @@ LOGIN.processLogin = function () {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
} }
} else if (data.requirePasswordChange == 2) { } else if (data.requirePasswordChange == 2) {
$('#getToken').val(data.token);
if (LOGIN.force_pw_change_periodically == 1) { if (LOGIN.force_pw_change_periodically == 1) {
// recommend to // recommend to
// change // change
...@@ -325,6 +327,7 @@ LOGIN.changePasswordProcess = function () { ...@@ -325,6 +327,7 @@ LOGIN.changePasswordProcess = function () {
var loginId = $('#txtAccId').val(); var loginId = $('#txtAccId').val();
var password = $('#txtCurrentPass').val(); var password = $('#txtCurrentPass').val();
var confirmPass = $('#txtConfirmNew').val(); var confirmPass = $('#txtConfirmNew').val();
var tokenVal = $('#getToken').val();
var params = { var params = {
sid: sid, sid: sid,
...@@ -332,6 +335,7 @@ LOGIN.changePasswordProcess = function () { ...@@ -332,6 +335,7 @@ LOGIN.changePasswordProcess = function () {
password: password, password: password,
newPassword: confirmPass, newPassword: confirmPass,
appId: 4, appId: 4,
token: tokenVal,
}; };
if (I18N.getCurrentLanguage()) { if (I18N.getCurrentLanguage()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment