Merge branch 'feature/chatSettingsComponent' of https://github.com/joschuatonn/praxistransferFrontend into feature/chatSettingsComponent

This commit is contained in:
joschuatonn
2024-05-30 09:25:23 +02:00

View File

@@ -5,8 +5,7 @@ import App from './App.vue';
import Keycloak from 'keycloak-js'; import Keycloak from 'keycloak-js';
import {useUserStore} from 'stores/user-store'; 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 app = createApp(App);
const pinia = createPinia(); const pinia = createPinia();
@@ -16,9 +15,11 @@ app.use(pinia);
const userStore = useUserStore(); const userStore = useUserStore();
const chatStore = useChatStore(); const chatStore = useChatStore();
const keycloak: Keycloak = await userStore.initKeycloak(); let keycloak:Keycloak;
userStore.initKeycloak()
const $q = useQuasar(); .then(r=>
{
keycloak=r
let tries = 1; let tries = 1;
// Anfrage ans Backend // Anfrage ans Backend
@@ -26,10 +27,11 @@ let tries = 1;
if (keycloak.subject) { if (keycloak.subject) {
userStore.id = keycloak.subject; userStore.id = keycloak.subject;
await userStore.getPtpUserById(keycloak.subject); userStore.getPtpUserById(keycloak.subject).then(() =>
userStore.loadPtpUsersById(keycloak.subject).then(user => { userStore.loadPtpUsersById(keycloak.subject||"").then(user => {
console.log(JSON.stringify(user)); console.log(JSON.stringify(user));
}) }));
@@ -39,7 +41,7 @@ if (keycloak.subject) {
userStore.getPtpUserById(keycloak.subject!).then(user => { userStore.getPtpUserById(keycloak.subject!).then(user => {
console.log("New attempt: " + JSON.stringify(user)); console.log("New attempt: " + JSON.stringify(user));
console.warn(userStore.userLoaded); console.warn(userStore.userLoaded);
}).catch(error => { }).catch(() => {
console.error("Ein Netzwerkfehler ist aufgetreten " + tries); console.error("Ein Netzwerkfehler ist aufgetreten " + tries);
userStore.reconnectTries = tries; userStore.reconnectTries = tries;
@@ -53,4 +55,7 @@ if (keycloak.subject) {
} else { } else {
console.error("hier ist was schlimmes passiert menno"); console.error("hier ist was schlimmes passiert menno");
} }
}).catch(e=>console.error(e));