force cookie resetting, including backup cookie

kbase · Sep 18, 2024 · ef59114 · ef59114
1 parent 7367997
commit ef59114
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/kbase-extension/static/kbase/js/api/auth.js b/kbase-extension/static/kbase/js/api/auth.js
@@ -1,6 +1,4 @@
 define(['bluebird', 'jquery', 'narrativeConfig'], (Promise, $, Config) => {
-    'use strict';
-
     function factory(config) {
         const url = config.url;
         const secureCookies =
@@ -277,6 +275,16 @@ define(['bluebird', 'jquery', 'narrativeConfig'], (Promise, $, Config) => {
                 return [url, '/api/', version, callParams.operation].join('');
             })();
 
+            // const options = {
+            //     method: callParams.method,
+            //     headers: {
+            //         Authorization: token,
+            //         'Content-Type': 'application/json',
+            //     },
+
+            // }
+            // return fetch(callString, options);
+
             return Promise.resolve(
                 $.ajax({
                     url: callString,

diff --git a/kbase-extension/static/kbase/js/narrativeLogin.js b/kbase-extension/static/kbase/js/narrativeLogin.js
@@ -14,7 +14,6 @@ define([
     'userMenu',
     'util/bootstrapDialog',
 ], ($, Promise, kbapi, JupyterUtils, Config, Auth, UserMenu, BootstrapDialog) => {
-    'use strict';
     const baseUrl = JupyterUtils.get_body_data('baseUrl');
     const authClient = Auth.make({ url: Config.url('auth') });
     let sessionInfo = null;
@@ -98,10 +97,8 @@ define([
     function showNotLoggedInDialog() {
         const message = `
         <p>You are logged out (or your session has expired).</p>
-        <p>You will be redirected to the sign in page after closing this, or ${
-            AUTO_LOGOUT_DELAY / 1000
-        } seconds,
-           whichever comes first.</p>
+        <p>You will be redirected to the sign in page after closing this, or
+        ${AUTO_LOGOUT_DELAY / 1000} seconds, whichever comes first.</p>
         `;
         const dialog = new BootstrapDialog({
             title: 'Logged Out',
@@ -309,6 +306,7 @@ define([
             authClient.getUserProfile(sessionToken),
         ])
             .then(([tokenInfo, accountInfo]) => {
+                authClient.setAuthToken(sessionToken);
                 sessionInfo = tokenInfo;
                 this.sessionInfo = tokenInfo;
                 this.accountInfo = accountInfo;