Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import {defineStore} from 'pinia';
|
import {defineStore} from 'pinia';
|
||||||
import {computed, ref} from "vue";
|
import {computed} from "vue";
|
||||||
import {useRouter} from "vue-router";
|
import {useRouter} from "vue-router";
|
||||||
import {useClient} from "@/plugins/api.js";
|
import {useClient} from "@/plugins/api.js";
|
||||||
import {useSessionStorage} from "@vueuse/core";
|
import {useSessionStorage} from "@vueuse/core";
|
||||||
@@ -79,6 +79,22 @@ export const useAuthStore = defineStore(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function loginWithFacebook(authResponse) {
|
||||||
|
try {
|
||||||
|
const response = await clientApi.post(
|
||||||
|
'api/users/login-with-facebook',
|
||||||
|
{
|
||||||
|
token: authResponse.accessToken
|
||||||
|
})
|
||||||
|
updateTokens(response.data)
|
||||||
|
return true
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
cleanTokens()
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function refresh() {
|
async function refresh() {
|
||||||
try {
|
try {
|
||||||
const response = await clientApi.post(
|
const response = await clientApi.post(
|
||||||
@@ -97,5 +113,14 @@ export const useAuthStore = defineStore(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return {accessToken, refreshToken, isAuthenticated, userId, login, loginWithGoogle, logout}
|
return {
|
||||||
|
accessToken,
|
||||||
|
refreshToken,
|
||||||
|
isAuthenticated,
|
||||||
|
userId,
|
||||||
|
login,
|
||||||
|
loginWithGoogle,
|
||||||
|
loginWithFacebook,
|
||||||
|
logout
|
||||||
|
}
|
||||||
})
|
})
|
||||||
@@ -58,10 +58,6 @@ export const useUserProfileStore = defineStore(
|
|||||||
const client = useClient()
|
const client = useClient()
|
||||||
const userResponse = await client.get("/api/users/profile");
|
const userResponse = await client.get("/api/users/profile");
|
||||||
value.value = userResponse.data
|
value.value = userResponse.data
|
||||||
// Cache-busting only if portraitUrl exists
|
|
||||||
if (value.value.portraitUrl) {
|
|
||||||
value.value.portraitUrl = `${value.value.portraitUrl}?${Date.now()}`;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
value.value = undefined;
|
value.value = undefined;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user