Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Login fix #199

Merged
merged 3 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dive-dsa",
"version": "1.10.21",
"version": "1.10.22",
"author": {
"name": "Kitware, Inc.",
"email": "[email protected]"
Expand Down
7 changes: 5 additions & 2 deletions client/platform/web-girder/plugins/girder.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import Vue from 'vue';
import Girder, { RestClient } from '@girder/components/src';
//import cookies from 'js-cookie';
import cookies from 'js-cookie';

Vue.use(Girder);
//const token = cookies.get('girderToken');
// Attempt to get the token from the cookies or from the localStorage
const token = cookies.get('girderToken');
const localToken = window.localStorage.getItem('girderToken');
const girderRest = new RestClient({ apiRoot: 'api/v1' });
girderRest.token = token || localToken || null;
export function useGirderRest() {
return girderRest;
}
Expand Down
8 changes: 3 additions & 5 deletions client/platform/web-girder/views/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
import { GirderAuthentication } from '@girder/components/src';
import { useStore } from 'platform/web-girder/store/types';
import { useRouter } from 'vue-router/composables';
//import cookies from 'js-cookie';

import { useGirderRest } from 'platform/web-girder/plugins/girder';

Expand All @@ -24,10 +23,9 @@ export default defineComponent({
const brandData = toRef(store.state.Brand, 'brandData');
const girderRest = useGirderRest();
function onLogin() {
// const token = cookies.get('girderToken');
// if (token) {
// window.localStorage.setItem('girderToken', token);
// }
if (girderRest.token) {
window.localStorage.setItem('girderToken', girderRest.token);
}
router.push('/');
}
girderRest.$on('login', onLogin);
Expand Down
Loading