From 86653ece217808e704f5ddeb6a678c255af1d4e6 Mon Sep 17 00:00:00 2001 From: Wai Phyo Date: Tue, 28 Jan 2025 08:55:31 -0800 Subject: [PATCH 1/2] feat: check 2 cookie values --- src/StacBrowser.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/StacBrowser.vue b/src/StacBrowser.vue index 0629b467a..dab1902d9 100644 --- a/src/StacBrowser.vue +++ b/src/StacBrowser.vue @@ -278,8 +278,15 @@ export default { } console.log(`MAIN_SETTING: ${JSON.stringify(MAIN_SETTING)}`) this.$store.dispatch('setCatalogUrl', MAIN_SETTING['catalogUrl']) + let unity_token = undefined if (cookies['unity_token'] !== undefined) { - this.$store.dispatch('setAuth', cookies['unity_token']); + unity_token = cookies['unity_token'] + } + if (cookies['oidc_access_token'] !== undefined && unity_token === undefined) { + unity_token = cookies['oidc_access_token'] + } + if (unity_token !== undefined) { + this.$store.dispatch('setAuth', unity_token); } }, created() { From 6a7a420d7df55f6f05ec0c8b3e0e38ae1d1a2096 Mon Sep 17 00:00:00 2001 From: Wai Phyo Date: Tue, 28 Jan 2025 16:55:41 -0800 Subject: [PATCH 2/2] fix: remove print statements --- src/StacBrowser.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/StacBrowser.vue b/src/StacBrowser.vue index dab1902d9..77fc01f9f 100644 --- a/src/StacBrowser.vue +++ b/src/StacBrowser.vue @@ -266,7 +266,6 @@ export default { beforeCreate() { const cookies = cookie.parse(document.cookie); let MAIN_SETTING = 'SETTING_PLACEHOLDER' - console.log(`MAIN_SETTING: ${JSON.stringify(MAIN_SETTING)}`) if (typeof MAIN_SETTING === 'object' && MAIN_SETTING.constructor === Object) { if (MAIN_SETTING['catalogUrl'] === undefined) { MAIN_SETTING['catalogUrl'] = null