+
-
Kein Aktiver Mandant. Bitte wählen Sie ein Mandant.
+
Kein Aktiver Mandant.
Bitte wählen Sie ein Mandant.
{{tenant.name}}
{
-
+ Test
+ {{auth.tenants}}
+
+ Abmelden
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
index 8d0d033..c03e09a 100644
--- a/middleware/auth.global.ts
+++ b/middleware/auth.global.ts
@@ -1,6 +1,9 @@
export default defineNuxtRouteMiddleware(async (to, from) => {
const auth = useAuthStore()
+ console.log(auth)
+
+ if (auth.loading) return
// Wenn nicht eingeloggt → auf /login (außer er will schon dahin)
diff --git a/package.json b/package.json
index 0103f48..cc0dc96 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
},
"dependencies": {
"@capacitor/android": "^7.0.0",
+ "@capacitor/browser": "^7.0.2",
"@capacitor/core": "^7.0.0",
"@capacitor/device": "^7.0.0",
"@capacitor/ios": "^7.0.0",
@@ -66,7 +67,7 @@
"maplibre-gl": "^4.7.0",
"nuxt-editorjs": "^1.0.4",
"nuxt-viewport": "^2.0.6",
- "onesignal-cordova-plugin": "^5.2.11",
+ "onesignal-cordova-plugin": "^5.2.14",
"papaparse": "^5.4.1",
"pdf-lib": "^1.17.1",
"pinia": "^2.1.7",
diff --git a/pages/login.vue b/pages/login.vue
index 09ae74e..70f0b2a 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -5,6 +5,7 @@ definePageMeta({
const auth = useAuthStore()
const toast = useToast()
+const router = useRouter()
const platformIsNative = useCapacitor().getIsNative()
@@ -15,9 +16,9 @@ const doLogin = async (data:any) => {
// Weiterleiten nach erfolgreichem Login
toast.add({title:"Einloggen erfolgreich"})
if(platformIsNative) {
- return navigateTo("/mobile")
+ await router.push("/mobile")
} else {
- return navigateTo("/")
+ await router.push("/")
}
} catch (err: any) {
toast.add({title:"Zugangsdaten falsch. Bitte überprüfen Sie Ihre Eingaben",color:"rose"})
diff --git a/plugins/api.ts b/plugins/api.ts
index 7853e35..62fca69 100644
--- a/plugins/api.ts
+++ b/plugins/api.ts
@@ -4,12 +4,12 @@ export default defineNuxtPlugin(() => {
const config = useRuntimeConfig()
const api = $fetch.create({
- baseURL: config.public.apiBase,/*"http://192.168.1.227:3100" "https://backend.fedeo.io"*/
+ baseURL: config.public.apiBase,
credentials: "include",
async onRequest({options}) {
// Token aus Cookie holen
let token: string | null | undefined = ""
- if (await useCapacitor().getIsNative()) {
+ if (useCapacitor().getIsNative()) {
const {value} = await Preferences.get({key: 'token'});
token = value
} else {
diff --git a/stores/auth.ts b/stores/auth.ts
index 29f43dc..f01f5ca 100644
--- a/stores/auth.ts
+++ b/stores/auth.ts
@@ -63,13 +63,18 @@ export const useAuthStore = defineStore("auth", {
},
async login(email: string, password: string) {
- console.log("Auth login")
- const { token } = await useNuxtApp().$api("/auth/login", {
- method: "POST",
- body: { email, password }
- })
- console.log(token)
- await this.fetchMe(token)
+ try {
+ console.log("Auth login")
+ const { token } = await useNuxtApp().$api("/auth/login", {
+ method: "POST",
+ body: { email, password }
+ })
+ console.log("Token: " + token)
+ await this.fetchMe(token)
+ } catch (e) {
+ console.log("login error:" + e)
+ }
+
},
async logout() {
@@ -105,6 +110,7 @@ export const useAuthStore = defineStore("auth", {
jwt
}}
})
+ console.log(me)
this.user = me.user
this.permissions = me.permissions
this.tenants = me.tenants
@@ -143,7 +149,7 @@ export const useAuthStore = defineStore("auth", {
const {token} = res
- if(await useCapacitor().getIsNative()) {
+ if(useCapacitor().getIsNative()) {
await Preferences.set({
key:"token",
value: token,