diff --git a/backend/app/core/config.py b/backend/app/core/config.py index 3e63024..0bf8927 100644 --- a/backend/app/core/config.py +++ b/backend/app/core/config.py @@ -3,8 +3,8 @@ import base64 PROJECT_NAME = "KintoneAppBuilder" -# SQLALCHEMY_DATABASE_URI = "postgres://maxz64:m@xz1205@alicornkintone.postgres.database.azure.com/postgres" -SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/postgres" +SQLALCHEMY_DATABASE_URI = "postgres://maxz64:m@xz1205@alicornkintone.postgres.database.azure.com/postgres" +#SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/postgres" API_V1_STR = "/k/v1" diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts index 8900a93..8601e02 100644 --- a/frontend/src/stores/useAuthStore.ts +++ b/frontend/src/stores/useAuthStore.ts @@ -5,12 +5,18 @@ import { Router } from '../router'; export const useAuthStore = defineStore({ id: 'auth', - state: () => ({ - token: localStorage.getItem('token'), - name:localStorage.getItem('name'), - domain:localStorage.getItem('domain'), - returnUrl: '' - }), + state: () =>{ + const token=localStorage.getItem('token'); + if(token && token!==''){ + api.defaults.headers["Authorization"]='Bearer ' + token; + } + return { + token: token, + name:localStorage.getItem('name'), + domain:localStorage.getItem('domain'), + returnUrl: '' + } + }, actions: { async login(username:string, password:string) { const params = new URLSearchParams(); @@ -24,8 +30,9 @@ export const useAuthStore = defineStore({ localStorage.setItem('token', result.data.access_token); localStorage.setItem('id', result.data.user_id); localStorage.setItem('name', result.data.user_name); - const config = {headers:{Authorization : 'Bearer ' + this.token}}; - const activedomain = await api.get(`http://127.0.0.1:8000/api/activedomain`,config); + // const config = {headers:{Authorization : 'Bearer ' + this.token}}; + api.defaults.headers["Authorization"]='Bearer ' + this.token; + const activedomain = await api.get(`http://127.0.0.1:8000/api/activedomain`); this.domain = activedomain.data.name; localStorage.setItem('domain', activedomain.data.name); Router.push(this.returnUrl || '/');