Skip to content

C
check
Commit aceb8585 by Masaru Abe
Options

PSTC カスタムURI起動対応

parent 1d969a76
Showing with 86 additions and 46 deletions
abvw/common/js/avweb.js
......@@ -125,9 +125,9 @@ UserSetting.prototype.load = function () {
};
/* store user setting */
UserSetting.prototype.set = function(key, value) {
if(!this.userSetting) {
//if(!this.userSetting) {
this.userSetting = this.load();
}
//}
var values = this.userSetting;
if(!values) {
values = { key: value };
......@@ -143,9 +143,9 @@ UserSetting.prototype.set = function(key, value) {
};
/* grab user setting */
UserSetting.prototype.get = function(key) {
if(!this.userSetting) {
//if(!this.userSetting) {
this.userSetting = this.load();
}
//}
var values = this.userSetting;
if(values) {
return values[key];
......@@ -659,7 +659,7 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) {
if (error) {
error(xmlHttp, xmlHttp.status, xmlHttp.statusText);
} else {
console.log(xmlHttp.status + ' ' + xmlHttp.statusText);
//console.log(xmlHttp.status + ' ' + xmlHttp.statusText);
}
}
}
......@@ -803,7 +803,9 @@ AVWEB.showSystemError = function() {
if( !HEADER.webLogoutEvent() ){
//ログアウト出来なかった
SessionStorageUtils.clear();
//カスタムURI起動対応のため sidのバックアップは消さない
AVWEB.avwUserSetting().remove(COMMON.Keys.userInfo_sid);
//AVWEB.avwUserSetting().remove(COMMON.Keys.userInfo_sid_bak);
AVWEB.avwScreenMove(COMMON.ScreenIds.Login);
}
}
......
abvw/common/js/common.js
......@@ -183,7 +183,7 @@ COMMON.Keys = {
requirePasswordChange: 'requirePasswordChange',
/* -------------------------------------------------------------------------------- */
// Session:ユーザ情報(userInfo)_セッションID:String
// Session/local:ユーザ情報(userInfo)_セッションID:String
userInfo_sid: 'sid',
// Session :事業者オプション(serviceOpt)_初回ログイン時パスワード強制変更:Integer(0:なし, 1:催促, 2:強制)
serviceOpt_force_pw_change_on_login: 'force_pw_change_on_login',
......@@ -359,7 +359,11 @@ COMMON.Keys = {
storeUrl: 'storeUrl',
latitude: 'latitude',
longitude: 'longitude'
longitude: 'longitude',
// Local:セッションID:String
userInfo_sid_bak: 'sid_bak'
/* -------------------------------------------------------------------------------- */
};
......@@ -1148,7 +1152,7 @@ var ClientData = {
userInfo_sid: function (data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.userInfo_sid, data);
AVWEB.avwUserSetting().set(COMMON.Keys.userInfo_sid, data);
//AVWEB.avwUserSetting().set(COMMON.Keys.userInfo_sid, data);
} else {
//return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid);
if (AVWEB.avwUserSession()) {
......@@ -1693,8 +1697,18 @@ var ClientData = {
} else {
return SessionStorageUtils.get(COMMON.Keys.longitude);
}
},
// Local: セッションIDのバックアップ
userInfo_sid_local_bak: function (data) {
if (arguments.length > 0) {
AVWEB.avwUserSetting().set(COMMON.Keys.userInfo_sid_bak, data);
} else {
return AVWEB.avwUserSetting().get(COMMON.Keys.userInfo_sid_bak);
}
}
};
// -------------------------------------------------
......
abvw/js/contentview.js
......@@ -963,7 +963,7 @@ CONTENTVIEW.changePage = function(page_index) {
//console.log("CONTENTVIEW.changePage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: page_index + 1 },
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: page_index + 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
......@@ -1880,7 +1880,7 @@ CONTENTVIEW.changePageWithoutSlide = function(pageMove) {
//console.log("CONTENTVIEW.changePageWithoutSlide");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageMove + 1 },
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId(), pageNo: pageMove + 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
......@@ -2056,7 +2056,7 @@ CONTENTVIEW.displayOverlayForSpecifyContentType = function(){
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl ;
}
CONTENTVIEW.handleForContentTypeHTML(linkUrlTmp);
}
......@@ -2436,7 +2436,7 @@ CONTENTVIEW.originalScreenForNotPdfType = function(){
//Get resource Id of content
CONTENTVIEW.downloadResourceById = function(contentId){
var params = {
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
contentId: contentId,
getType: '2',
isStreaming: ClientData.isStreamingMode()
......@@ -5271,6 +5271,18 @@ CONTENTVIEW.handleDisplayMobileToolbar = function(){
};
CONTENTVIEW.getSessionId = function(){
if (ClientData.userInfo_sid_local()) {
return ClientData.userInfo_sid_local();
} else if (ClientData.userInfo_sid_local_bak()) {
return ClientData.userInfo_sid_local_bak();
} else {
return ClientData.userInfo_sid();
}
};
$("document").ready(function () {
//CONTENTVIEW.ready = function(){
......@@ -5334,7 +5346,7 @@ $("document").ready(function () {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 1,
isStreaming: ClientData.isStreamingMode()
};
......
abvw/js/contentview_Anket.js
......@@ -6,7 +6,7 @@ var CONTENTVIEW_ANKET = {};
CONTENTVIEW_ANKET.showAnket = function(url, fullscreen, objectId) {
var $container = $('#dialog');
//url = url + "?sid=" + ClientData.userInfo_sid();
//url = url + "?sid=" + CONTENTVIEW.getSessionId();
$container.html('');
$container.addClass('anket-dialog');
......
abvw/js/contentview_CallApi.js
......@@ -13,7 +13,7 @@ CONTENTVIEW_CALLAPI.getJsonContentInfo = function() {
//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.webGetContentData();
......@@ -37,14 +37,14 @@ CONTENTVIEW_CALLAPI.webGetPageImageContentSize = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
isStreaming: ClientData.isStreamingMode()
};
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
"webContentPageSize",
"GET",
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid() },
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: CONTENTVIEW.getSessionId() },
function (data) {
CONTENTVIEW_GENERAL.widthContentImage = data.width;
CONTENTVIEW_GENERAL.heightContentImage = data.height;
......@@ -57,7 +57,7 @@ CONTENTVIEW_CALLAPI.webGetContentPageSize = function(){
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 6,
isStreaming: ClientData.isStreamingMode()
};
......@@ -98,7 +98,7 @@ CONTENTVIEW_CALLAPI.webGetContentData = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 1,
isStreaming: ClientData.isStreamingMode()
};
......@@ -118,7 +118,7 @@ CONTENTVIEW_CALLAPI.getJsonDataPageTitle = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 3,
isStreaming: ClientData.isStreamingMode()
};
......@@ -147,7 +147,7 @@ CONTENTVIEW_CALLAPI.getJsonDataType4 = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 4,
isStreaming: ClientData.isStreamingMode()
};
......@@ -167,7 +167,7 @@ CONTENTVIEW_CALLAPI.getJsonDataType5 = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 5,
isStreaming: ClientData.isStreamingMode()
};
......@@ -187,7 +187,7 @@ CONTENTVIEW_CALLAPI.getDataJsonFile = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 2,
isStreaming: ClientData.isStreamingMode()
};
......@@ -267,7 +267,7 @@ CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
pageNos: lstPageNo[0],
thumbnailFlg: 1,
isStreaming: ClientData.isStreamingMode()
......@@ -330,7 +330,7 @@ CONTENTVIEW_CALLAPI.getSearchDataFromJson = function() {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
thumbnailFlg: 0,
isStreaming: ClientData.isStreamingMode()
};
......@@ -353,7 +353,7 @@ CONTENTVIEW_CALLAPI.loadDataSearch = function(lstPageNo) {
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
pageNos: lstPageNo[0],
thumbnailFlg: 1,
isStreaming: ClientData.isStreamingMode()
......
abvw/js/contentview_CreateObjects.js
......@@ -943,7 +943,7 @@ CONTENTVIEW_CREATEOBJECT.anket = function (mediaType, actionType, id, imageUrl,
/*stop audio on page */
CONTENTVIEW.stopAllAudio();
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + ClientData.userInfo_sid();
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
if(ClientData.isStreamingMode()){
//ストリーミング
url = url + "&isStreaming=true";
......@@ -1166,7 +1166,7 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
var params = {
contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(),
sid: CONTENTVIEW.getSessionId(),
getType: 1,
isStreaming: ClientData.isStreamingMode()
};
......@@ -1371,7 +1371,7 @@ CONTENTVIEW_CREATEOBJECT.createPwdRequiredTypeDialog = function(){
// start login
var params = {
previousSid: ClientData.userInfo_sid(),
previousSid: CONTENTVIEW.getSessionId(),
loginId: ClientData.userInfo_loginId_session(),
password: password,
urlpath: ClientData.userInfo_accountPath()
......@@ -1654,7 +1654,7 @@ CONTENTVIEW_CREATEOBJECT.linkURL = function (mediaType, actionType, id, imageUrl
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
var apiUrl = AVWEB.getApiUrl(ClientData.userInfo_accountPath());
linkUrlTmp = linkUrlTmp + "?sid=" + ClientData.userInfo_sid() + "&apiurl=" + apiUrl ;
linkUrlTmp = linkUrlTmp + "?sid=" + CONTENTVIEW.getSessionId() + "&apiurl=" + apiUrl ;
}
if( browserType == 0 ){
......
abvw/js/contentview_Events.js
......@@ -389,7 +389,7 @@ CONTENTVIEW_EVENTS.firstPage_click = function() {
//console.log("CONTENTVIEW_EVENTS.firstPage_click");
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;
......@@ -456,13 +456,13 @@ CONTENTVIEW_EVENTS.lastPage_click = function() {
// Clear canvas offscreen
CONTENTVIEW_GENERAL.clearCanvas(document.getElementById("offscreen"));
//CONTENTVIEW_GENERAL.pageImages = CONTENTVIEW_GETDATA.getURLPageImage("webContentPageImage") + "?contentId=" + CONTENTVIEW_GENERAL.contentID + "&sid=" + ClientData.userInfo_sid() + "&pageNo=" + (CONTENTVIEW_GENERAL.totalPage - 1);
//CONTENTVIEW_GENERAL.pageImages = CONTENTVIEW_GETDATA.getURLPageImage("webContentPageImage") + "?contentId=" + CONTENTVIEW_GENERAL.contentID + "&sid=" + CONTENTVIEW.getSessionId() + "&pageNo=" + (CONTENTVIEW_GENERAL.totalPage - 1);
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_EVENTS.lastPage_click");
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;
......@@ -680,11 +680,11 @@ CONTENTVIEW_EVENTS.update3DImagesArr = function(){
var tempX = object3d["x"];
var tempY = object3d["y"];
tempInitImage = AVWEB.getURL("webResourceDownload") + "&sid=" + ClientData.userInfo_sid() + "&resourceId=" + COMMON.getUrlParam('resourceId',tempInitImage);
tempInitImage = AVWEB.getURL("webResourceDownload") + "&sid=" + CONTENTVIEW.getSessionId() + "&resourceId=" + COMMON.getUrlParam('resourceId',tempInitImage);
for(var j = 0; j< temp3dview.length; j++){
var url = temp3dview[j];
var id = COMMON.getUrlParam('resourceId',url);
temp3dview[j] = AVWEB.getURL("webResourceDownload") + "&sid=" + ClientData.userInfo_sid() + "&resourceId=" + id;
temp3dview[j] = AVWEB.getURL("webResourceDownload") + "&sid=" + CONTENTVIEW.getSessionId() + "&resourceId=" + id;
}
var arr3D = [];
......
abvw/js/header.js
......@@ -435,6 +435,7 @@ HEADER.webLogoutEvent = function(){
isExisted = true;
SessionStorageUtils.clear();
AVWEB.avwUserSetting().remove(COMMON.Keys.userInfo_sid);
AVWEB.avwUserSetting().remove(COMMON.Keys.userInfo_sid_bak);
// Move to login screen
//window.location = COMMON.ScreenIds.Login;
AVWEB.avwScreenMove(COMMON.ScreenIds.Login);
......
abvw/js/login.js
......@@ -68,6 +68,9 @@ LOGIN.saveLoginInfo = function() {
ClientData.userInfo_lastLoginTime(date.jpDateTimeString());
ClientData.userInfo_sid_local(LOGIN.userinfo_sid);
//バックアップにも保持
ClientData.userInfo_sid_local_bak(LOGIN.userinfo_sid);
LOGIN.saveServiceUserOption();
//ページジャンプ設定をクリア
......@@ -156,20 +159,27 @@ LOGIN.processLogin = function() {
previousSid: '',
loginId: loginId,
password: password,
urlpath: accountPath
urlpath: accountPath,
};
// Set sid for login, this will be checked authoring 2 sessions
if (ClientData.userInfo_sid_local()) {
params.previousSid = ClientData.userInfo_sid_local();
}
//引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
// Set sid for login, this will be checked authoring 2 sessions
if (ClientData.userInfo_sid_local()) {
params.previousSid = ClientData.userInfo_sid_local();
} else {
//OpenUrlでコンテンツ開く場合
if( paramContentID != '' ){
if (ClientData.userInfo_sid_local_bak()) {
params.previousSid = ClientData.userInfo_sid_local_bak();
}
}
}
// Get url to login
var apiLoginUrl = ClientData.conf_apiLoginUrl(); //sysSettings.apiLoginUrl;
//引数パラメータがあれば取得
var paramContentID = COMMON.getUrlParam('cid', '');
AVWEB.avwCmsApiWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, function (data) {
LOGIN.userinfo_sid = data.sid;
LOGIN.userInfo_userName = data.userName;
......@@ -643,7 +653,7 @@ LOGIN.initLoginAnonymousUser = function() {
// init login for getits user
LOGIN.initLoginGetitsUser = function() {
console.log("LOGIN.initLoginGetitsUser");
//console.log("LOGIN.initLoginGetitsUser");
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
......@@ -898,3 +908,4 @@ LOGIN.ready = function(){
};
//});
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