Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev'

#50939　「初回ログイン時パスワード強制変更」が「催促」と設定されている場合、パスワード変更画面での動作がアプリと異なる

See merge request !109

abweb/common/js/common.js

@@ -458,24 +458,6 @@ var ClientData = {
         }
         }
     },
     },
 
 
-    // Session :Business Option (serviceOpt)_ABookCheck:Char(Y:Enable, N:Disable)
-    serviceOpt_abook_check: function (data) {
-        if (arguments.length > 0) {
-            SessionStorageUtils.set(CONSTANT.KEYS.serviceOpt_abook_check, data);
-        } else {
-            return SessionStorageUtils.get(CONSTANT.KEYS.serviceOpt_abook_check);
-        }
-    },
-
-    // Session : Tenant Service_Option(serviceOpt)_ChatFunction:Char(Y：Use, N：Unused)
-    serviceOpt_chat_function: function (data) {
-        if (arguments.length > 0) {
-            SessionStorageUtils.set(CONSTANT.KEYS.serviceOpt_abook_check, data);
-        } else {
-            return SessionStorageUtils.get(CONSTANT.KEYS.serviceOpt_abook_check);
-        }
-    },
-
     // Session :Business Option(serviceOpt)_Forced password change at first login:Integer(0:None, 1:Prompt, 2:Forced)
     // Session :Business Option(serviceOpt)_Forced password change at first login:Integer(0:None, 1:Prompt, 2:Forced)
     serviceOpt_force_pw_change_on_login: function (data) {
     serviceOpt_force_pw_change_on_login: function (data) {
         if (arguments.length > 0) {
         if (arguments.length > 0) {

abweb/js/login/login.js

@@ -358,13 +358,8 @@ LOGIN.changePasswordProcess = function () {
                 $('#dialog-error-message').css('display', 'none');
                 $('#dialog-error-message').css('display', 'none');
                 ClientData.userInfo_sid(ClientData.userInfo_sid_local());
                 ClientData.userInfo_sid(ClientData.userInfo_sid_local());
 
 
-                if (ClientData.serviceOpt_abook_check() == 'Y') {
-                    // move to home.html page
-                    COMMON.avwScreenMove('index.html');
-                } else {
-                    $('#dialog-error-message').html(I18N.i18nText('msgPwdChangeNG'));
-                    $('#dialog-error-message').show();
-                }
+                // move to home.html page
+                COMMON.avwScreenMove('index.html');
             } else if (result.httpStatus == '401') {
             } else if (result.httpStatus == '401') {
                 COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
                 COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
             } else if (result.httpStatus == '403') {
             } else if (result.httpStatus == '403') {
@@ -420,13 +415,8 @@ LOGIN.skipPassFunction = function () {
     ClientData.userInfo_pwdSkipDt(date);
     ClientData.userInfo_pwdSkipDt(date);
     ClientData.userInfo_sid(ClientData.userInfo_sid_local());
     ClientData.userInfo_sid(ClientData.userInfo_sid_local());
 
 
-    if (ClientData.serviceOpt_abook_check() == 'Y') {
-        // move to home.html page
-        COMMON.avwScreenMove('index.html');
-    } else {
-        $('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
-        $('#main-error-message').show();
-    }
+    // move to home.html page
+    COMMON.avwScreenMove('index.html');
 };
 };
 
 
 // Open Change Password Dialog
 // Open Change Password Dialog
@@ -451,10 +441,6 @@ LOGIN.saveServiceUserOption = function () {
             ClientData.serviceOpt_force_pw_change_on_login(option.value);
             ClientData.serviceOpt_force_pw_change_on_login(option.value);
         } else if (option.serviceOptionId == 49) {
         } else if (option.serviceOptionId == 49) {
             ClientData.serviceOpt_usable_push_message(option.value);
             ClientData.serviceOpt_usable_push_message(option.value);
-        } else if (option.serviceOptionId == 161) {
-            ClientData.serviceOpt_abook_check(option.value);
-        } else if (option.serviceOptionId == 183) {
-            ClientData.serviceOpt_chat_function(option.value);
         }
         }
     });
     });
 };
 };