Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix logging from 3rd-party auth provider

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2022-12-22 12:23:51 +01:00
parent 1854063f09
commit 3d99a41104
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/src/views/User/ProviderValidation.vue
View File

@ -1,6 +1,7 @@
<template>
<p>{{ t("Redirecting in progress…") }}</p>
</template>
<script lang="ts" setup>
import { ICurrentUserRole } from "@/types/enums";
import { UPDATE_CURRENT_USER_CLIENT, LOGGED_USER } from "../../graphql/user";
@ -9,10 +10,10 @@ import { saveUserData } from "../../utils/auth";
import { changeIdentity } from "../../utils/identity";
import { ICurrentUser, IUser } from "../../types/current-user.model";
import { useRouter } from "vue-router";
import { useMutation, useQuery } from "@vue/apollo-composable";
import { useLazyQuery, useMutation } from "@vue/apollo-composable";
import { useI18n } from "vue-i18n";
import { useHead } from "@vueuse/head";
import { computed } from "vue";
import { computed, onMounted } from "vue";
const { t } = useI18n({ useScope: "global" });
useHead({
@ -35,15 +36,17 @@ const userRole = getValueFromMeta("auth-user-role") as ICurrentUserRole;
const router = useRouter();
const { onDone, mutate } = useMutation<{ updateCurrentUser: ICurrentUser }>(
UPDATE_CURRENT_USER_CLIENT
);
const { onDone, mutate } = useMutation<
{ updateCurrentUser: ICurrentUser },
{ id: string; email: string; isLoggedIn: boolean; role: ICurrentUserRole }
>(UPDATE_CURRENT_USER_CLIENT);
onDone(() => {
const { onResult: onLoggedUserResult } = useQuery<{ loggedUser: IUser }>(
LOGGED_USER
);
const { onResult: onLoggedUserResult, load: loadUser } = useLazyQuery<{
loggedUser: IUser;
}>(LOGGED_USER);
onDone(async () => {
loadUser();
onLoggedUserResult(async ({ data: { loggedUser } }) => {
if (loggedUser.defaultActor) {
await changeIdentity(loggedUser.defaultActor);
@ -54,9 +57,10 @@ onDone(() => {
});
});
if (!(userId && userEmail && userRole && accessToken && refreshToken)) {
onMounted(async () => {
if (!(userId && userEmail && userRole && accessToken && refreshToken)) {
await router.push("/");
} else {
} else {
const login = {
user: {
id: userId,
@ -75,5 +79,6 @@ if (!(userId && userEmail && userRole && accessToken && refreshToken)) {
isLoggedIn: true,
role: userRole,
});
}
}
});
</script>