diff --git a/com.twin.app.shoptime/src/actions/commonActions.js b/com.twin.app.shoptime/src/actions/commonActions.js index 7e3f485d..1c9f45aa 100644 --- a/com.twin.app.shoptime/src/actions/commonActions.js +++ b/com.twin.app.shoptime/src/actions/commonActions.js @@ -223,20 +223,45 @@ export const getTermsAgreeYn = () => (dispatch, getState) => { export const launchMembershipApp = () => (dispatch, getState) => { const webOSVersion = getState().common.appStatus.webOSVersion; - if (Number(webOSVersion) >= 8) { - lunaSend.launchMembershipAppNew(webOSVersion, { + if (Number(webOSVersion) >= 9) { + lunaSend.launchMembershipAppOver9(webOSVersion, { onSuccess: (res) => { console.log(res); }, - onFailure: (err) => { console.log(err); + lunaSend.launchMembershipAppOver8(webOSVersion, { + onSuccess: (res) => { + console.log(res); + }, + onFailure: (err) => { + console.log(err); + lunaSend.launchMembershipApp(webOSVersion, { + onSuccess: (res) => { + console.log(res); + }, + onFailure: (err) => { + console.log(err); + }, + }); + }, + }); + }, + }); + return; + } + if (Number(webOSVersion) >= 8) { + lunaSend.launchMembershipAppOver8(webOSVersion, { + onSuccess: (res) => { + console.log(res); + }, + onFailure: (err) => { + console.log(err); lunaSend.launchMembershipApp(webOSVersion, { onSuccess: (res) => { console.log(res); }, - onFailure: (err) => { console.log(err); }, @@ -244,17 +269,16 @@ export const launchMembershipApp = () => (dispatch, getState) => { }, }); return; - } else { - lunaSend.launchMembershipApp(webOSVersion, { - onSuccess: (res) => { - console.log(res); - }, - - onFailure: (err) => { - console.log(err); - }, - }); } + + lunaSend.launchMembershipApp(webOSVersion, { + onSuccess: (res) => { + console.log(res); + }, + onFailure: (err) => { + console.log(err); + }, + }); }; let rafId = null; diff --git a/com.twin.app.shoptime/src/lunaSend/account.js b/com.twin.app.shoptime/src/lunaSend/account.js index 5fe1dc3e..3ff0d7ef 100644 --- a/com.twin.app.shoptime/src/lunaSend/account.js +++ b/com.twin.app.shoptime/src/lunaSend/account.js @@ -112,7 +112,35 @@ export const getLoginUserData = ( } }; -export const launchMembershipAppNew = ( +export const launchMembershipAppOver9 = ( + webOSVersion, + { onSuccess, onFailure, onComplete } +) => { + if ( + typeof window === "object" && + window.PalmSystem && + process.env.REACT_APP_MODE !== "DEBUG" + ) { + return new LS2Request().send({ + service: "luna://com.webos.applicationManager", + method: "launchDefaultApp", + subscribe: false, + parameters: { + category: "MembershipApp", + params: { + query: "login", + id: window.PalmSystem.identifier ?? appinfo.id, + reLaunch: "Y", + }, + }, + onSuccess, + onFailure, + onComplete, + }); + } +}; + +export const launchMembershipAppOver8 = ( webOSVersion, { onSuccess, onFailure, onComplete } ) => { diff --git a/com.twin.app.shoptime/src/lunaSend/common.js b/com.twin.app.shoptime/src/lunaSend/common.js index f1a4ef65..3cecacb7 100644 --- a/com.twin.app.shoptime/src/lunaSend/common.js +++ b/com.twin.app.shoptime/src/lunaSend/common.js @@ -45,20 +45,24 @@ export const getHttpHeaderForServiceRequest = ({ onFailure, onComplete, }) => { - if (typeof window === "object" && window.PalmSystem && process.env.REACT_APP_MODE !== "DEBUG") { - if (httpHeaderHandler) { - httpHeaderHandler.cancel(); - } - httpHeaderHandler = new LS2Request().send({ - service: "luna://com.webos.service.sdx", - method: "getHttpHeaderForServiceRequest", - subscribe: true, - parameters: {}, - onSuccess, - onFailure, - onComplete, - }); - return httpHeaderHandler; + if ( + typeof window === "object" && + window.PalmSystem && + process.env.REACT_APP_MODE !== "DEBUG" + ) { + if (httpHeaderHandler) { + httpHeaderHandler.cancel(); + } + httpHeaderHandler = new LS2Request().send({ + service: "luna://com.webos.service.sdx", + method: "getHttpHeaderForServiceRequest", + subscribe: true, + parameters: {}, + onSuccess, + onFailure, + onComplete, + }); + return httpHeaderHandler; } else { onSuccess({ HOST: "US.nextlgsdp.com", @@ -87,16 +91,20 @@ export const getSystemSettings = ( parameters, { onSuccess, onFailure, onComplete } ) => { - if (typeof window === "object" && window.PalmSystem && process.env.REACT_APP_MODE !== "DEBUG") { - return new LS2Request().send({ - service: "luna://com.webos.settingsservice", - method: "getSystemSettings", - subscribe: true, - parameters: parameters, - onSuccess, - onFailure, - onComplete, - }); + if ( + typeof window === "object" && + window.PalmSystem && + process.env.REACT_APP_MODE !== "DEBUG" + ) { + return new LS2Request().send({ + service: "luna://com.webos.settingsservice", + method: "getSystemSettings", + subscribe: true, + parameters: parameters, + onSuccess, + onFailure, + onComplete, + }); } else if (typeof window === "object") { const language = typeof window.navigator === "object"