#15771 【Chrome42】CMS でオーサリングのプレビューを行うと、Web Viewer で多重ログインの問題が発生する

ff02a188 · vietdo · 3debc584 · ff02a188 · ff02a188 · ff02a188
Commit ff02a188 authored Dec 04, 2015 by vietdo
9 changed files
--- a/abvw/common/js/avweb.js
+++ b/abvw/common/js/avweb.js
@@ -635,7 +635,6 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) {
    // API実行準備
    var sysSettings = AVWEB.avwSysSetting();
    var apiName = 'webContentPageImage';	// API名
    //url 構築
    var apiUrl;
    apiUrl = ClientData.conf_apiUrl(); //sysSettings.apiUrl;

--- a/abvw/common/js/common.js
+++ b/abvw/common/js/common.js
@@ -186,6 +186,7 @@ COMMON.Keys = {
    /* -------------------------------------------------------------------------------- */
    // Session/local:ユーザ情報(userInfo)_セッションID:String
    userInfo_sid : 'sid',
+    userInfo_sid_preview : 'sidPreview',
    // Session :事業者オプション(serviceOpt)_初回ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制)
    serviceOpt_force_pw_change_on_login : 'force_pw_change_on_login',
    // Session :事業者オプション(serviceOpt)_定期ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制)
@@ -632,6 +633,13 @@ var ClientData = {
            return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid);
        }
    },
+    userInfo_sid_local_preview : function(data) {
+        if (arguments.length > 0) {
+            AVWEB.avwUserSetting().set(COMMON.Keys.userInfo_sid_preview, data);
+        } else {
+            return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid_preview);
+        }
+    },
    // Local :ユーザ情報(userInfo)_ログインID:String
    userInfo_loginId : function(data) {
        if (arguments.length > 0) {
@@ -1123,7 +1131,18 @@ var ClientData = {
            return null;
        }
    },
+    userInfo_sid_preview : function(data) {
+        if (arguments.length > 0) {
+            SessionStorageUtils.set(COMMON.Keys.userInfo_sid_preview, data);
+            // AVWEB.avwUserSetting().set(COMMON.Keys.userInfo_sid, data);
+        } else {
+            // return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid);
+            if (AVWEB.avwUserSession()) {
+                return SessionStorageUtils.get(COMMON.Keys.userInfo_sid_preview);
+            }
+            return null;
+        }
+    },
    // Session :事業者オプション(serviceOpt)_初回ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制)
    serviceOpt_force_pw_change_on_login : function(data) {
        if (arguments.length > 0) {

--- a/abvw/js/contentpreview.js
+++ b/abvw/js/contentpreview.js
@@ -12,8 +12,8 @@ CONTENTPREVIEW.ready = function(){
    var sid = COMMON.getUrlParam('sid','');
    var contentId = COMMON.getUrlParam('contentId','');
    var urlPath = COMMON.getUrlParam('urlpath','');
-	ClientData.userInfo_sid(sid);
+    ClientData.userInfo_sid_preview(sid);
-	ClientData.userInfo_sid_local(sid);
+    ClientData.userInfo_sid_local_preview(sid);
    ClientData.userInfo_accountPath(urlPath);
    ClientData.contentInfo_contentId(contentId);

--- a/abvw/js/contentview.js
+++ b/abvw/js/contentview.js
@@ -1011,9 +1011,7 @@ CONTENTVIEW.changePage = function(page_index) {
            // Clear canvas offscreen
            CONTENTVIEW_GENERAL.clearCanvas(document.getElementById("offscreen"));
            if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
                //console.log("CONTENTVIEW.changePage");
                AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
                     { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: page_index + 1 },
@@ -5745,7 +5743,6 @@ CONTENTVIEW.ready = function(initContentId){
        //START TRB00048 - EDITOR : Long - Date : 09/18/2013 - Summary : Fix Jumpcontent
        CONTENTVIEW_GETDATA.getContentID();
    }
    var params = {
            contentId: CONTENTVIEW_GENERAL.contentID,
            sid: CONTENTVIEW.getSessionId(),
@@ -5931,6 +5928,13 @@ CONTENTVIEW.handleDisplayMobileToolbar = function(){
 CONTENTVIEW.getSessionId = function(){
+    if(COMMON.isAuthoringPreview()){
+        if(ClientData.userInfo_sid_local_preview()){
+            return ClientData.userInfo_sid_local_preview();
+        }else{
+            return ClientData.userInfo_sid_preview();
+        }
+    }else{
        if (ClientData.userInfo_sid_local()) {
            return ClientData.userInfo_sid_local();
        } else if (ClientData.userInfo_sid_local_bak()) {
@@ -5938,7 +5942,7 @@ CONTENTVIEW.getSessionId = function(){
        } else {
            return ClientData.userInfo_sid();
        }
+    }
 };
 CONTENTVIEW.resvCustomLog = function(param1,param2,param3,param4,param5){

--- a/abvw/js/contentview_CallApi.js
+++ b/abvw/js/contentview_CallApi.js
@@ -12,7 +12,7 @@ CONTENTVIEW_CALLAPI.getJsonContentInfo = function( doneFunc ) {
    //console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo");
    AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
-	     { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
+         { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: 1 },
         function (data) {
            CONTENTVIEW_GENERAL.pageImages = data;
            CONTENTVIEW_CALLAPI.getJsonContentInfoDone(doneFunc);

--- a/abvw/js/contentview_Events.js
+++ b/abvw/js/contentview_Events.js
@@ -365,7 +365,7 @@ CONTENTVIEW_EVENTS.firstPage_click = function() {
            if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
                    AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
-                    	 { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
+                         { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: 1 },
                         function (data) {
                            CONTENTVIEW_GENERAL.pageImages = data;
@@ -435,7 +435,7 @@ CONTENTVIEW_EVENTS.lastPage_click = function() {
                    AVWEB.avwGrabContentPageImage(
                        ClientData.userInfo_accountPath(),
-                    	{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: CONTENTVIEW_GENERAL.totalPage },
+                        { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: CONTENTVIEW_GENERAL.totalPage },
                        function (data) {
                            CONTENTVIEW_GENERAL.pageImages = data;
                            /* get page Objects */

--- a/abvw/js/contentview_GetData.js
+++ b/abvw/js/contentview_GetData.js
@@ -1373,7 +1373,7 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){
            //console.log("CONTENTVIEW_GETDATA.renderNextPage");
            AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
-            	{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
+                { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: pageNo },
                function (data) {
                    CONTENTVIEW_GENERAL.nextPageImage = data;
@@ -1410,7 +1410,7 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){
            //console.log("CONTENTVIEW_GETDATA.renderPrevPage");
            AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
-        		{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
+                { contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: pageNo },
                function (data) {
                    CONTENTVIEW_GENERAL.prevPageImage = data;
                    CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)

--- a/abvw/js/home.js
+++ b/abvw/js/home.js
--- a/login.html
+++ b/login.html