From eed9df488e07060bc96955efa10f2dc93059ffc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jona=20Kl=C3=A4=C3=9F?= Date: Sat, 25 May 2024 14:15:40 +0200 Subject: [PATCH 1/2] changed endpoint --- src/stores/user-store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/user-store.ts b/src/stores/user-store.ts index 60a530d..fc88b56 100644 --- a/src/stores/user-store.ts +++ b/src/stores/user-store.ts @@ -85,7 +85,7 @@ export const useUserStore = defineStore('userStore', { }, async loadAllPtpUsers() { - return (await api.get("/users/user")).data; + return (await api.get("/users")).data; }, async initKeycloak() : Promise{ From 641efea6c4f41d95de0c3b751611da2ea71537a8 Mon Sep 17 00:00:00 2001 From: JonaKl Date: Mon, 27 May 2024 11:19:11 +0200 Subject: [PATCH 2/2] swapped await to then for being able to build app --- src/main.ts | 63 +++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/src/main.ts b/src/main.ts index 646db5d..5d0a6f7 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,8 +5,7 @@ import App from './App.vue'; import Keycloak from 'keycloak-js'; import {useUserStore} from 'stores/user-store'; -import { useQuasar } from 'quasar'; -import { useChatStore } from './stores/chat-store'; +import { useChatStore } from 'stores/chat-store'; const app = createApp(App); const pinia = createPinia(); @@ -16,41 +15,47 @@ app.use(pinia); const userStore = useUserStore(); const chatStore = useChatStore(); -const keycloak: Keycloak = await userStore.initKeycloak(); - -const $q = useQuasar(); -let tries = 1; +let keycloak:Keycloak; +userStore.initKeycloak() + .then(r=> + { + keycloak=r + let tries = 1; // Anfrage ans Backend -if (keycloak.subject) { + if (keycloak.subject) { - userStore.id = keycloak.subject; - await userStore.getPtpUserById(keycloak.subject); - userStore.loadPtpUsersById(keycloak.subject).then(user => { - console.log(JSON.stringify(user)); - }) + userStore.id = keycloak.subject; + userStore.getPtpUserById(keycloak.subject).then(() => + userStore.loadPtpUsersById(keycloak.subject||"").then(user => { + console.log(JSON.stringify(user)); + })); - - const interval = setInterval(() => { - if(userStore.userLoaded) clearInterval(interval); - userStore.getPtpUserById(keycloak.subject!).then(user => { - console.log("New attempt: " + JSON.stringify(user)); - console.warn(userStore.userLoaded); - }).catch(error => { - console.error("Ein Netzwerkfehler ist aufgetreten " + tries); - userStore.reconnectTries = tries; - tries++; - }); - }, 5000); + const interval = setInterval(() => { + if(userStore.userLoaded) clearInterval(interval); + + userStore.getPtpUserById(keycloak.subject!).then(user => { + console.log("New attempt: " + JSON.stringify(user)); + console.warn(userStore.userLoaded); + }).catch(() => { + console.error("Ein Netzwerkfehler ist aufgetreten " + tries); + userStore.reconnectTries = tries; + + tries++; + }); + }, 5000); + + chatStore.loadProfilePictures(); + userStore.loadProfilePictures(); + + } else { + console.error("hier ist was schlimmes passiert menno"); + } + }).catch(e=>console.error(e)); - chatStore.loadProfilePictures(); - userStore.loadProfilePictures(); -} else { - console.error("hier ist was schlimmes passiert menno"); -}