Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-02-16 12:53:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: #6263 remove reserved prefix (#7033)

Browse Source
This commit is contained in:
Zachary Schaffter
2026-02-14 13:05:42 -08:00
committed by GitHub
parent 5aafb56c4f
commit 904e6b7d82
55 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/pages/login.vue
View File

@@ -228,10 +228,10 @@ export default defineNuxtComponent({
const router = useRouter();
const i18n = useI18n();
const $auth = useMealieAuth();
const auth = useMealieAuth();
const { $appInfo, $axios } = useNuxtApp();
const { loggedIn } = useLoggedInState();
const groupSlug = computed(() => $auth.user.value?.groupSlug);
const groupSlug = computed(() => auth.user.value?.groupSlug);
const isDemo = ref(false);
const isFirstLogin = ref(false);
const activityPreferences = useUserActivityPreferences();
@@ -265,7 +265,7 @@ export default defineNuxtComponent({
activityPreferences.value.defaultActivity,
groupSlug.value,
);
if (!isDemo.value && isFirstLogin.value && $auth.user.value?.admin) {
if (!isDemo.value && isFirstLogin.value && auth.user.value?.admin) {
router.push("/admin/setup");
}
else if (defaultActivityRoute) {
@@ -284,7 +284,7 @@ export default defineNuxtComponent({
const { passwordIcon, inputType, togglePasswordShow } = usePasswordField();
whenever(
() => $appInfo.enableOidc && $appInfo.oidcRedirect && !isCallback() && !isDirectLogin() /* && !$auth.check().valid */,
() => $appInfo.enableOidc && $appInfo.oidcRedirect && !isCallback() && !isDirectLogin() /* && !auth.check().valid */,
() => oidcAuthenticate(),
{ immediate: true },
);
@@ -309,7 +309,7 @@ export default defineNuxtComponent({
if (callback) {
oidcLoggingIn.value = true;
try {
await $auth.oauthSignIn();
await auth.oauthSignIn();
}
catch (error) {
await router.replace("/login?direct=1");
@@ -335,7 +335,7 @@ export default defineNuxtComponent({
formData.append("remember_me", String(form.remember));
try {
await $auth.signIn(formData);
await auth.signIn(formData);
}
catch (error) {
console.log(error);