Merge branch 'main' of https://github.com/ankaboot-source/leadminer

Author: malek10xdev

frontend/src/app.vue

@@ -65,7 +65,7 @@
 import { useIdle } from '@vueuse/core';
 import { reloadNuxtApp } from 'nuxt/app';
 import { signOutManually } from './utils/auth';
-const user = useSupabaseUser();
+const $user = useSupabaseUser();
 const $leadminerStore = useLeadminerStore();
 const activeTask = computed(() => $leadminerStore.activeTask);
 const $supabaseClient = useSupabaseClient();
@@ -81,7 +81,7 @@ $supabaseClient.auth.onAuthStateChange((event) => {
   }
 });
 watch(idle, (isIdle) => {
-  if (isIdle && !activeTask.value && user.value) {
+  if (isIdle && !activeTask.value && $user.value) {
     signOut();
   }
 });

frontend/src/pages/account/settings.vue

@@ -149,7 +149,7 @@
 </template>
 
 <script setup lang="ts">
-import type { User, UserAttributes } from '@supabase/supabase-js';
+import type { UserAttributes } from '@supabase/supabase-js';
 import { AcceptNewsLetter } from '~/utils/extras';
 
 import { isInvalidEmail } from '@/utils/email';
@@ -176,10 +176,10 @@ const $profile = useSupabaseUserProfile();
 
 const {
   data: { user },
-  error,
+  error: userError,
 } = await useSupabaseClient().auth.getUser();
 
-if (!user || error) throw new Error('Unable to fetch user data');
+if (!user || userError) throw new Error('Unable to fetch user data');
 
 const isLoading = ref(false);
 const showDeleteModal = ref(false);

frontend/src/stores/contacts.ts

@@ -180,15 +180,15 @@ export const useContactsStore = defineStore('contacts-store', () => {
    * Check if there is data in persons.
    */
   async function hasPersons(): Promise<boolean> {
-    if (!$user.value?.id) return false;
+    if (!$user.value?.sub) return false;
 
     console.log('Checking if user has persons...');
     const { data, error } = await $supabase
       // @ts-expect-error: Issue with nuxt/supabase
       .schema('private')
       .from('persons')
       .select('*', { count: 'exact' })
-      .eq('user_id', $user.value.id)
+      .eq('user_id', $user.value.sub)
       .limit(1);
 
     if (error) throw error;

frontend/src/stores/notifications.ts

@@ -10,12 +10,12 @@ export interface Notification {
 export const useNotificationsStore = defineStore('notifications', () => {
   const notifications = ref<Notification[]>([]);
   const supabase = useSupabaseClient();
-  const user = useSupabaseUser();
+  const $user = useSupabaseUser();
 
   let subscription: ReturnType<typeof supabase.channel> | null = null;
 
   function subscribe(callback?: (notification: Notification) => void) {
-    if (!user.value?.id) return;
+    if (!$user.value?.sub) return;
 
     if (subscription) {
       supabase.removeChannel(subscription);
@@ -30,7 +30,7 @@ export const useNotificationsStore = defineStore('notifications', () => {
           event: 'INSERT',
           schema: 'private',
           table: 'notifications',
-          filter: `user_id=eq.${user.value.id}`,
+          filter: `user_id=eq.${$user.value.sub}`,
         },
         (payload) => {
           const newNotification = payload.new as Notification;