From 9f28102a8736c9fd72f88737db5ec498645a4717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Gr=C3=A4f?= <evandor@gmail.com>
Date: Sun, 11 Feb 2024 08:56:53 +0100
Subject: [PATCH 1/3] TAB-485 move gitsync data to account and store in backend

---
 src/pages/SettingsPage.vue                    | 12 ++-----
 src/pages/SidePanelPage.vue                   | 23 ++++++------
 src/pages/helper/SyncingSettings.vue          | 35 +++++++++----------
 .../persistence/GitPersistentService.ts       |  4 +--
 src/stores/searchStore.ts                     |  1 -
 src/stores/settingsStore.ts                   |  2 +-
 6 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/src/pages/SettingsPage.vue b/src/pages/SettingsPage.vue
index c697848c..d5438743 100644
--- a/src/pages/SettingsPage.vue
+++ b/src/pages/SettingsPage.vue
@@ -531,7 +531,7 @@ onMounted(() => {
 let suggestionsCounter = 0
 
 watchEffect(() => {
-  console.log("watching settingsStore.activeToggles...", settingsStore.activeToggles)
+  //console.log("watching settingsStore.activeToggles...", settingsStore.activeToggles)
   devEnabled.value = settingsStore.isEnabled('dev')
   ddgEnabled.value = settingsStore.isEnabled('noDDG')
   ignoreExtensionsEnabled.value = settingsStore.isEnabled('extensionsAsTabs')
@@ -575,7 +575,7 @@ watch(() => pageCapturePermissionGranted.value, (newValue, oldValue) => {
 })
 
 watchEffect(() => {
-  console.log("***setting dark mode to ", typeof darkMode.value, darkMode.value)
+  //console.log("***setting dark mode to ", typeof darkMode.value, darkMode.value)
   switch (darkMode.value) {
     case "true":
       $q.dark.set(true)
@@ -628,14 +628,6 @@ watchEffect(() => {
   sendMsg('detail-level-perTabset-changed', {level: detailLevelPerTabset.value})
 })
 
-watchEffect(() => {
-  console.log("activeToggles watcheffect", devEnabled.value)
-  //settingsStore.setFeatureToggle("stats", statsEnabled.value)
-  //settingsStore.setFeatureToggle("dev", devEnabled.value)
- // settingsStore.setFeatureToggle("noDDG", !ddgEnabled.value)
- // settingsStore.setFeatureToggle("extensionsAsTabs", !ignoreExtensionsEnabled.value)
-})
-
 watchEffect(() => {
   localStorage.set("layout", view.value)
 })
diff --git a/src/pages/SidePanelPage.vue b/src/pages/SidePanelPage.vue
index 3f02aaeb..7f3fd5be 100644
--- a/src/pages/SidePanelPage.vue
+++ b/src/pages/SidePanelPage.vue
@@ -278,16 +278,15 @@
         <template v-slot:title v-else>
           <div class="text-subtitle1">
             {{ toolbarTitle(tabsets as Tabset[]) }}
-            <q-icon
-              v-if="LocalStorage.getItem(SYNC_TYPE) as SyncType === SyncType.GITHUB && useAuthStore().isAuthenticated()"
-              class="q-ml-none" name="sync" size="12px">
-              <q-tooltip class="tooltip-small">Tabsets synced via {{ LocalStorage.getItem(SYNC_GITHUB_URL) }}
-              </q-tooltip>
-            </q-icon>
-            <q-icon v-if="LocalStorage.getItem(SYNC_TYPE) as SyncType === SyncType.MANAGED_GIT"
-                    class="q-ml-none" name="sync" size="12px">
-              <q-tooltip class="tooltip-small">Tabsets are being synced automatically</q-tooltip>
-            </q-icon>
+<!--            <q-icon-->
+<!--              v-if="LocalStorage.getItem(SYNC_TYPE) as SyncType === SyncType.GITHUB && useAuthStore().isAuthenticated()"-->
+<!--              class="q-ml-none" name="sync" size="12px">-->
+<!--              <q-tooltip class="tooltip-small">Tabsets synced via {{ syncSource() }}</q-tooltip>-->
+<!--            </q-icon>-->
+<!--            <q-icon v-if="LocalStorage.getItem(SYNC_TYPE) as SyncType === SyncType.MANAGED_GIT"-->
+<!--                    class="q-ml-none" name="sync" size="12px">-->
+<!--              <q-tooltip class="tooltip-small">Tabsets are being synced automatically</q-tooltip>-->
+<!--            </q-icon>-->
           </div>
         </template>
 
@@ -330,7 +329,7 @@ import {CopyToClipboardCommand} from "src/domain/commands/CopyToClipboard";
 import SidePanelTabsetDescriptionPage from "pages/sidepanel/SidePanelTabsetDescriptionPage.vue";
 import ShareTabsetPubliclyDialog from "components/dialogues/ShareTabsetPubliclyDialog.vue";
 import MqttService from "src/services/mqtt/MqttService";
-import {SyncType, useAppStore} from "stores/appStore";
+import {SyncType} from "stores/appStore";
 import {useVOnboarding, VOnboardingStep, VOnboardingWrapper} from 'v-onboarding'
 import {FirebaseCall} from "src/services/firebase/FirebaseCall";
 import getScrollTarget = scroll.getScrollTarget;
@@ -1019,6 +1018,8 @@ const tabsetSectionName = (tabset: Tabset) => {
   return tabset.name + (activeFolder ? " - " + activeFolder.name : "")
 }
 
+const syncSource = () => LocalStorage.getItem(SYNC_GITHUB_URL)
+
 </script>
 
 <style lang="scss">
diff --git a/src/pages/helper/SyncingSettings.vue b/src/pages/helper/SyncingSettings.vue
index 075a70a3..b806d457 100644
--- a/src/pages/helper/SyncingSettings.vue
+++ b/src/pages/helper/SyncingSettings.vue
@@ -310,12 +310,13 @@ import {
 } from "boot/constants";
 import GitPersistentService from "src/services/persistence/GitPersistentService";
 import {FirebaseCall} from "src/services/firebase/FirebaseCall";
-import {Tabset, TabsetSharing} from "src/models/Tabset";
-import {useTabsetService} from "src/services/TabsetService2";
-import {useSuggestionsStore} from "stores/suggestionsStore";
-import {StaticSuggestionIdent, Suggestion, SuggestionType} from "src/models/Suggestion";
 import {useUtils} from "src/services/Utils";
+import {useNotificationHandler} from "src/services/ErrorHandler";
+import {ExecutionResult} from "src/domain/ExecutionResult";
+import {useAuthStore} from "stores/authStore";
+
 const {sendMsg} = useUtils()
+const {handleSuccess, handleError} = useNotificationHandler()
 
 const emits = defineEmits(['wasClicked'])
 
@@ -402,9 +403,17 @@ const testDbConnection = async () => {
   }
 }
 
-const startGitSyncing = () => {
-  LocalStorage.set(SYNC_TYPE, tempSyncOption.value)
-  sendMsg('reload-application')
+const startGitSyncing = async () => {
+  try {
+    const res = await FirebaseCall.post("/users/" + useAuthStore().user.uid, {})
+    console.log("res", res)
+    LocalStorage.set(SYNC_TYPE, tempSyncOption.value)
+    sendMsg('reload-application')
+    handleSuccess(new ExecutionResult<string>("done", "done"))
+  } catch (err) {
+    console.error("startGitSyncing Error", err)
+    handleError('could not start syncing')
+  }
   //useSuggestionsStore().addSuggestion(Suggestion.getStaticSuggestion(StaticSuggestionIdent.RESTART_SUGGESTED))
 }
 const stopGitSyncing = () => {
@@ -418,18 +427,6 @@ const startSyncMessage = (targetType: SyncType) => testResult.value === 'success
 
 const stopSyncMessage = () => (syncType.value !== tempSyncOption.value) && syncType.value === SyncType.GITHUB && tempSyncOption.value === SyncType.NONE
 
-// const testSubscription = () => {
-//   console.log("testing subscription", subscription.value)
-//   FirebaseCall.get("/share/public/" + tabsetId + "?cb=" + new Date().getTime(), false)
-//     .then((res: any) => {
-//       const newTabset = res as Tabset
-//       newTabset.sharing = TabsetSharing.UNSHARED
-//       //_.forEach(newTabset.tabs, t => t.preview = TabPreview.THUMBNAIL)
-//       useTabsetService().saveTabset(newTabset)
-//       useTabsetService().reloadTabset(newTabset.id)
-//     })
-// }
-
 const checkManagedGitSetup = async () => {
   try {
     const response = await FirebaseCall.post("/subscriptions", {"userId": "abc"})
diff --git a/src/services/persistence/GitPersistentService.ts b/src/services/persistence/GitPersistentService.ts
index 6d34e0bb..04792a43 100644
--- a/src/services/persistence/GitPersistentService.ts
+++ b/src/services/persistence/GitPersistentService.ts
@@ -36,7 +36,7 @@ async function createDir(...segments: string[]) {
     try {
       // @ts-ignore
       const path = `${dir}/${prefix}${segment}`
-      console.debug("creating fs path", path)
+      //console.debug("creating fs path", path)
       prefix += segment + "/"
       // @ts-ignore
       await pfs.mkdir(path)
@@ -205,7 +205,7 @@ class GitPersistenceService implements PersistenceService {
         //log("got ts index", index)
         const tabsetId = result[index]
         const tsDataLocation = `${dir}/tabsets/${tabsetId}/tabset.json`
-        console.debug("tsDataLocation", tsDataLocation)
+        //console.debug("tsDataLocation", tsDataLocation)
         try {
           const tsData = await pfs.readFile(tsDataLocation)
           //log("tsData", tsData)
diff --git a/src/stores/searchStore.ts b/src/stores/searchStore.ts
index 17e5b3f9..f78318c4 100644
--- a/src/stores/searchStore.ts
+++ b/src/stores/searchStore.ts
@@ -74,7 +74,6 @@ export const useSearchStore = defineStore('search', () => {
 
   // @ts-ignore
   function getIndex(): Fuse.FuseIndex<SearchDoc> {
-    console.log("hier", fuse.value)
     return fuse.value ? fuse.value.getIndex() : null
   }
 
diff --git a/src/stores/settingsStore.ts b/src/stores/settingsStore.ts
index fc26ef72..08abcdb6 100644
--- a/src/stores/settingsStore.ts
+++ b/src/stores/settingsStore.ts
@@ -37,7 +37,7 @@ export const useSettingsStore = defineStore('settings', () => {
   watch(thumbnailQuality, (val: Object) => localStorage.set("thumbnailQuality", val))
 
   function initialize(localStorage: any) {
-    console.debug(" ...initializing settingsStore", localStorage, activeToggles.value)
+    console.debug(" ...initializing settingsStore")
     //this.localStorage = localStorage
     const fts: string | undefined = localStorage.getItem("settings")
     if (fts) {

From c83d5052eb84864fb36ccff32ce9159ce0e26cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Gr=C3=A4f?= <evandor@gmail.com>
Date: Sun, 11 Feb 2024 11:10:00 +0100
Subject: [PATCH 2/3] TAB-485 move gitsync data to account and store in backend

---
 src/App.vue                                   |  3 +-
 src/pages/helper/SyncingSettings.vue          |  3 +-
 src/services/firebase/FirebaseCall.ts         | 41 ++++++++++++++-----
 src/stores/authStore.ts                       | 14 ++++++-
 src/stores/settingsStore.ts                   | 20 ++++-----
 .../components/SidePanelFooter.test.ts        |  2 +-
 6 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c7ae4e02..2bb67574 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,10 +33,11 @@ onAuthStateChanged(auth, async (user) => {
     // https://firebase.google.com/docs/reference/js/auth.user
     console.log("%conAuthStateChanged: about to log in", "border:1px solid green")
 
-    // --- if we do this in useAuthStore.setUser(), we cannot properly run vitest any more
+    // --- if we do this in useAuthStore.setUser(), we cannot properly run vitest anymore (!?!)
     const userDoc = await getDoc(doc(firestore, "users", user.uid))
     const userData = userDoc.data()
     const account = new Account(user.uid, userData)
+    console.log("created account object", account)
     const querySnapshot = await getDocs(collection(firestore, "users", user.uid, "subscriptions"))
     const products = new Set<string>()
     querySnapshot.forEach((doc) => {
diff --git a/src/pages/helper/SyncingSettings.vue b/src/pages/helper/SyncingSettings.vue
index b806d457..99e4f476 100644
--- a/src/pages/helper/SyncingSettings.vue
+++ b/src/pages/helper/SyncingSettings.vue
@@ -405,7 +405,8 @@ const testDbConnection = async () => {
 
 const startGitSyncing = async () => {
   try {
-    const res = await FirebaseCall.post("/users/" + useAuthStore().user.uid, {})
+    const res = await FirebaseCall.patch("/users/" + useAuthStore().user.uid,
+      {sync: {type:tempSyncOption.value, url:githubRepoUrl.value}})
     console.log("res", res)
     LocalStorage.set(SYNC_TYPE, tempSyncOption.value)
     sendMsg('reload-application')
diff --git a/src/services/firebase/FirebaseCall.ts b/src/services/firebase/FirebaseCall.ts
index 67749527..42c618d1 100644
--- a/src/services/firebase/FirebaseCall.ts
+++ b/src/services/firebase/FirebaseCall.ts
@@ -1,6 +1,6 @@
 import {api} from "boot/axios";
 import axios, {AxiosError} from 'axios';
-import { useAuthStore } from "src/stores/authStore";
+import {useAuthStore} from "src/stores/authStore";
 
 export abstract class FirebaseCall<T> {
 
@@ -34,16 +34,35 @@ export abstract class FirebaseCall<T> {
 
   static post(path: string, data: object, resType = "json", fullPath = false) {
     console.log("firebase call to ", path)
-    return useAuthStore().getToken(api).then((token: string) => {
-      const urlToUse = fullPath ? path : `${process.env.BACKEND_URL}${path}`
-      console.log("posting to", urlToUse )
-      // @ts-ignore
-      return api.post(urlToUse, data, {headers: {'AuthToken': token}, responseType: resType})
-        .catch((err: any) => {
-          FirebaseCall.handleError(err)
-          return Promise.reject(err)
-        })
-    })
+    useAuthStore().user.getIdToken()
+      .then((idToken) => {
+        //console.log("got idTOken", idToken)
+        const urlToUse = fullPath ? path : `${process.env.BACKEND_URL}${path}`
+        console.log("posting to", urlToUse)
+        // @ts-ignore
+        return api.post(urlToUse, data, {headers: {'AuthToken': idToken}, responseType: resType})
+          .catch((err: any) => {
+            FirebaseCall.handleError(err)
+            return Promise.reject(err)
+          })
+      })
+  }
+
+
+  static patch(path: string, data: object, resType = "json", fullPath = false) {
+    console.log("firebase call to ", path)
+    useAuthStore().user.getIdToken()
+      .then((idToken) => {
+        //console.log("got idTOken", idToken)
+        const urlToUse = fullPath ? path : `${process.env.BACKEND_URL}${path}`
+        console.log("posting to", urlToUse)
+        // @ts-ignore
+        return api.patch(urlToUse, data, {headers: {'AuthToken': idToken}, responseType: resType})
+          .catch((err: any) => {
+            FirebaseCall.handleError(err)
+            return Promise.reject(err)
+          })
+      })
   }
 
   static put(path: string, data: object) {
diff --git a/src/stores/authStore.ts b/src/stores/authStore.ts
index ce68aee0..dceab70a 100644
--- a/src/stores/authStore.ts
+++ b/src/stores/authStore.ts
@@ -80,12 +80,12 @@ export const useAuthStore = defineStore('auth', () => {
 
   const userMayAccess = computed(() => {
     return (item: AccessItem): boolean => {
-      console.log("checking access item", item)
+      //console.log("checking access item", item)
       if (!user.value) {
         console.log("result: no (no user)")
         return false
       }
-      console.log("checking against account", account.value)
+      //console.log("checking against account", account.value)
       switch (item) {
         case AccessItem.SYNC:
           // return products.value.indexOf("prod_PLJipUG1Zfw7pC") >= 0
@@ -98,6 +98,16 @@ export const useAuthStore = defineStore('auth', () => {
     }
   })
 
+  // const getToken = async (api: any): Promise<string> => {
+  //   const token = await this.auth0.getAccessTokenSilently()
+  //   console.log("got token")
+  //   const firebaseToken = await api.get(`${process.env.BACKEND_URL}/firebase`, {
+  //     headers: {'Authorization': `Bearer ${token}`}
+  //   })
+  //   console.log("got firebase token", firebaseToken)
+  //   return Promise.resolve(firebaseToken.data['firebaseToken'])
+  // }
+
   // --- actions ---
   async function setUser(u: User | undefined) {
     console.log("setting user to ", u)
diff --git a/src/stores/settingsStore.ts b/src/stores/settingsStore.ts
index 08abcdb6..d7811c2f 100644
--- a/src/stores/settingsStore.ts
+++ b/src/stores/settingsStore.ts
@@ -9,23 +9,15 @@ export const useSettingsStore = defineStore('settings', () => {
   //let localStorage: LocalStorage = null as unknown as LocalStorage
 
   const activeToggles = ref<string[]>([])
-  const thresholds = ref(localStorage.getItem('thresholds') || {
+  const thresholds = ref( {
     min: 0,
     max: 40
   })
-  const thumbnailQuality = ref(localStorage.getItem('thumbnailQuality') || 25)
+  const thumbnailQuality = ref( 25)
 
   const isEnabled = computed(() => (ident: string) =>
     _.findIndex(activeToggles.value, (e: string) => e === ident) >= 0)
 
-  // watch(
-  //   activeToggles,
-  //   (activeTogglesVal: string[]) => {
-  //     console.log("setting activeToggles to", activeTogglesVal)
-  //     localStorage.set("settings", _.join(activeTogglesVal, ","))
-  //   }, {deep: true}
-  // )
-
   watch(
     thresholds,
     (thresholdsVal: Object) => {
@@ -44,6 +36,14 @@ export const useSettingsStore = defineStore('settings', () => {
       console.log("determining activeToggles from", fts)
       activeToggles.value = _.map(fts.split(","), e => e.trim())
     }
+    const ths = localStorage.getItem('thresholds')
+    if (ths) {
+      thresholds.value = ths
+    }
+    const tnq = localStorage.getItem('thumbnailQuality')
+    if (tnq) {
+      thumbnailQuality.value = tnq
+    }
   }
 
   function setFeatureToggle(ident: string, setActive: boolean) {
diff --git a/test/vitest/__tests__/components/SidePanelFooter.test.ts b/test/vitest/__tests__/components/SidePanelFooter.test.ts
index 802b1fc7..5e8dd1fa 100644
--- a/test/vitest/__tests__/components/SidePanelFooter.test.ts
+++ b/test/vitest/__tests__/components/SidePanelFooter.test.ts
@@ -136,7 +136,7 @@ describe('SidePanelFooter', () => {
   })
 
   it('should be mounted', async () => {
-    expect(wrapper.text()).toContain("grid_viewlogin");
+    expect(wrapper.text()).toContain("grid_viewshow_chartlogin");
     expect(wrapper.text()).not.toContain("Open Window");
   });
 

From 676aa2cbb2d262d74d776da147f16e48cbc6c4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Gr=C3=A4f?= <evandor@gmail.com>
Date: Sun, 11 Feb 2024 11:40:56 +0100
Subject: [PATCH 3/3] TAB-485 move gitsync data to account and store in backend

---
 src/App.vue                                   |  4 +-
 src/boot/constants.ts                         |  2 -
 src/models/Account.ts                         | 19 ++++++++-
 src/pages/SidePanelPage.vue                   | 20 +--------
 src/pages/helper/SyncingSettings.vue          | 23 +++++------
 src/services/AppService.ts                    |  5 +--
 src/services/firebase/FirebaseCall.ts         | 41 ++++++++++---------
 .../persistence/GitPersistentService.ts       |  2 +-
 8 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2bb67574..e2316b79 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,7 +16,7 @@ import {StaticSuggestionIdent, Suggestion} from "src/models/Suggestion";
 import {useRoute, useRouter} from "vue-router";
 import {collection, doc, getDoc, getDocs} from "firebase/firestore";
 import {firestore} from "boot/firebase";
-import {Account} from "src/models/Account";
+import {Account, UserData} from "src/models/Account";
 
 const $q = useQuasar()
 const router = useRouter()
@@ -35,7 +35,7 @@ onAuthStateChanged(auth, async (user) => {
 
     // --- if we do this in useAuthStore.setUser(), we cannot properly run vitest anymore (!?!)
     const userDoc = await getDoc(doc(firestore, "users", user.uid))
-    const userData = userDoc.data()
+    const userData = userDoc.data() as UserData
     const account = new Account(user.uid, userData)
     console.log("created account object", account)
     const querySnapshot = await getDocs(collection(firestore, "users", user.uid, "subscriptions"))
diff --git a/src/boot/constants.ts b/src/boot/constants.ts
index ee9f4b20..d6644554 100644
--- a/src/boot/constants.ts
+++ b/src/boot/constants.ts
@@ -32,7 +32,6 @@ const SYNC_TYPE = "sync.type"
 const SYNC_GITLAB_URL = "sync.gitlab.url"
 const SYNC_GITLAB_TOKEN = "sync.gitlab.token"
 
-const SYNC_GITHUB_URL = "sync.github.url"
 const SYNC_GITHUB_TOKEN = "sync.github.token"
 
 const SYNC_COUCHDB_USERNAME = "sync.couchdb.username"
@@ -67,7 +66,6 @@ export {
   SYNC_TYPE,
   SYNC_GITLAB_URL,
   SYNC_GITLAB_TOKEN,
-  SYNC_GITHUB_URL,
   SYNC_GITHUB_TOKEN,
   SYNC_COUCHDB_USERNAME,
   SYNC_COUCHDB_PASSWORD,
diff --git a/src/models/Account.ts b/src/models/Account.ts
index 4590dc52..bbf34182 100644
--- a/src/models/Account.ts
+++ b/src/models/Account.ts
@@ -1,10 +1,25 @@
+import {SyncType} from "stores/appStore";
+
+export class SyncSettings {
+
+  constructor(
+    public type: SyncType | undefined,
+    public url: string | undefined,
+  ) {
+  }
+}
+
+export class UserData {
+  sync: SyncSettings | undefined
+}
+
 export class Account {
   created: number
 
   constructor(
     public id: string,
-    public userData: object | undefined,
-    public products: string[] = [],
+    public userData: UserData | undefined,
+    public products: string[] = []
   ) {
     this.created = new Date().getTime()
   }
diff --git a/src/pages/SidePanelPage.vue b/src/pages/SidePanelPage.vue
index 7f3fd5be..254caf74 100644
--- a/src/pages/SidePanelPage.vue
+++ b/src/pages/SidePanelPage.vue
@@ -308,7 +308,7 @@ import {useRouter} from "vue-router";
 import {useUtils} from "src/services/Utils";
 import {LocalStorage, openURL, scroll, uid, useQuasar} from "quasar";
 import {useTabsetService} from "src/services/TabsetService2";
-import {ListDetailLevel, useUiStore} from "src/stores/uiStore";
+import {useUiStore} from "src/stores/uiStore";
 import {usePermissionsStore} from "src/stores/permissionsStore";
 import {useSpacesStore} from "src/stores/spacesStore";
 import FirstToolbarHelper from "pages/sidepanel/helper/FirstToolbarHelper.vue";
@@ -329,12 +329,11 @@ import {CopyToClipboardCommand} from "src/domain/commands/CopyToClipboard";
 import SidePanelTabsetDescriptionPage from "pages/sidepanel/SidePanelTabsetDescriptionPage.vue";
 import ShareTabsetPubliclyDialog from "components/dialogues/ShareTabsetPubliclyDialog.vue";
 import MqttService from "src/services/mqtt/MqttService";
-import {SyncType} from "stores/appStore";
 import {useVOnboarding, VOnboardingStep, VOnboardingWrapper} from 'v-onboarding'
 import {FirebaseCall} from "src/services/firebase/FirebaseCall";
 import getScrollTarget = scroll.getScrollTarget;
 import InfoMessageWidget from "components/widgets/InfoMessageWidget.vue";
-import {SYNC_GITHUB_URL, SYNC_TYPE, TITLE_IDENT} from "boot/constants";
+import {SYNC_TYPE, TITLE_IDENT} from "boot/constants";
 import AppService from "src/services/AppService";
 import SidePanelToolbarButton from "components/buttons/SidePanelToolbarButton.vue";
 
@@ -902,19 +901,6 @@ const suggestTabsetImport = () => {
   return false
 }
 
-const testShare = () => {
-  const shareData = {
-    title: "MDN",
-    text: "Learn web development on MDN!",
-    url: "https://developer.mozilla.org",
-  };
-  console.log(navigator)
-  if (navigator.canShare) {
-    console.log(navigator.canShare())
-    navigator.share(shareData).then((res) => console.log("res", res)).catch((err) => console.error(err))
-  }
-}
-
 const importSharedTabset = () => {
   const currentTabUrl = useTabsStore().currentChromeTab?.url
   if (currentTabUrl) {
@@ -1018,8 +1004,6 @@ const tabsetSectionName = (tabset: Tabset) => {
   return tabset.name + (activeFolder ? " - " + activeFolder.name : "")
 }
 
-const syncSource = () => LocalStorage.getItem(SYNC_GITHUB_URL)
-
 </script>
 
 <style lang="scss">
diff --git a/src/pages/helper/SyncingSettings.vue b/src/pages/helper/SyncingSettings.vue
index 99e4f476..42c3bb9c 100644
--- a/src/pages/helper/SyncingSettings.vue
+++ b/src/pages/helper/SyncingSettings.vue
@@ -303,9 +303,6 @@ import {
   SYNC_COUCHDB_URL,
   SYNC_COUCHDB_USERNAME,
   SYNC_GITHUB_TOKEN,
-  SYNC_GITHUB_URL,
-  SYNC_GITLAB_TOKEN,
-  SYNC_GITLAB_URL,
   SYNC_TYPE
 } from "boot/constants";
 import GitPersistentService from "src/services/persistence/GitPersistentService";
@@ -321,13 +318,13 @@ const {handleSuccess, handleError} = useNotificationHandler()
 const emits = defineEmits(['wasClicked'])
 
 const syncType = ref<string | undefined>(undefined)
-const tempSyncOption = ref<SyncType>(LocalStorage.getItem(SYNC_TYPE) as SyncType || SyncType.NONE)
+const tempSyncOption = ref<SyncType>(useAuthStore().getAccount()?.userData?.sync?.type  || SyncType.NONE)
 
-const gitlabRepoToken = ref<string>(LocalStorage.getItem(SYNC_GITLAB_TOKEN) as string || '')
-const gitlabRepoUrl = ref<string>(LocalStorage.getItem(SYNC_GITLAB_URL) as string || '')
+// const gitlabRepoToken = ref<string>(LocalStorage.getItem(SYNC_GITLAB_TOKEN) as string || '')
+// const gitlabRepoUrl = ref<string>(LocalStorage.getItem(SYNC_GITLAB_URL) as string || '')
 
 const githubRepoToken = ref<string>(LocalStorage.getItem(SYNC_GITHUB_TOKEN) as string || '')
-const githubRepoUrl = ref<string>(LocalStorage.getItem(SYNC_GITHUB_URL) as string || '')
+const githubRepoUrl = ref<string>(useAuthStore().getAccount()?.userData?.sync?.url || '')
 
 const couchdbUsername = ref<string>(LocalStorage.getItem(SYNC_COUCHDB_USERNAME) as string || '')
 const couchdbPassword = ref<string>(LocalStorage.getItem(SYNC_COUCHDB_PASSWORD) as string || '')
@@ -354,9 +351,9 @@ function checkAndUpdate(val: string, ident: string) {
   testResult.value = undefined
 }
 
-watchEffect(() => {
-  checkAndUpdate(githubRepoUrl.value, SYNC_GITHUB_URL)
-})
+// watchEffect(() => {
+//   checkAndUpdate(githubRepoUrl.value, SYNC_GITHUB_URL)
+// })
 
 watchEffect(() => {
   checkAndUpdate(githubRepoToken.value, SYNC_GITHUB_TOKEN)
@@ -368,9 +365,9 @@ watchEffect(() => {
   checkAndUpdate(couchdbUrl.value, SYNC_COUCHDB_URL)
 })
 
-watchEffect(() => {
-  syncType.value = LocalStorage.getItem(SYNC_TYPE) as SyncType
-})
+// watchEffect(() => {
+//   syncType.value = LocalStorage.getItem(SYNC_TYPE) as SyncType
+// })
 
 
 const testGitConnection = async () => {
diff --git a/src/services/AppService.ts b/src/services/AppService.ts
index 12eae6e0..907a9c19 100644
--- a/src/services/AppService.ts
+++ b/src/services/AppService.ts
@@ -23,7 +23,6 @@ import {FeatureIdent} from "src/models/AppFeature";
 import {useMessagesStore} from "src/stores/messagesStore";
 import {SyncType, useAppStore} from "stores/appStore";
 import GitPersistentService from "src/services/persistence/GitPersistentService";
-import {SYNC_GITHUB_URL, SYNC_TYPE} from "boot/constants";
 import {useAuthStore} from "stores/authStore";
 import PersistenceService from "src/services/PersistenceService";
 import {useUiStore} from "stores/uiStore";
@@ -99,8 +98,8 @@ class AppService {
 
     if (useAuthStore().isAuthenticated()) {
       // sync features
-      const syncType = LocalStorage.getItem(SYNC_TYPE) as SyncType || SyncType.NONE
-      const syncUrl = LocalStorage.getItem(SYNC_GITHUB_URL) as string
+      const syncType = useAuthStore().getAccount()?.userData?.sync?.type || SyncType.NONE
+      const syncUrl = useAuthStore().getAccount()?.userData?.sync?.url
       const dbOrGitDb = useGitStore(syncType, syncUrl) ?
         useDB(undefined).gitDb :
         useDB(undefined).db
diff --git a/src/services/firebase/FirebaseCall.ts b/src/services/firebase/FirebaseCall.ts
index 42c618d1..7f4d64fb 100644
--- a/src/services/firebase/FirebaseCall.ts
+++ b/src/services/firebase/FirebaseCall.ts
@@ -21,16 +21,18 @@ export abstract class FirebaseCall<T> {
     }
   }
 
-  static async delete<T>(path: string): Promise<T> {
-    try {
-      const token = await useAuthStore().getToken(api)
-      const response = await api.delete<T>(`${process.env.BACKEND_URL}${path}`, {headers: {'AuthToken': token}})
-      return response.data;
-    } catch (err) {
-      FirebaseCall.handleError(err)
-      return Promise.reject("user not authenticated")
-    }
-  }
+  // static async delete<T>(path: string): Promise<T> {
+  //   try {
+  //     useAuthStore().user.getIdToken()
+  //       .then((idToken) => {
+  //         const response = api.delete<T>(`${process.env.BACKEND_URL}${path}`, {headers: {'AuthToken': token}})
+  //         return response.data;
+  //       })
+  //   } catch (err) {
+  //     FirebaseCall.handleError(err)
+  //     return Promise.reject("user not authenticated")
+  //   }
+  // }
 
   static post(path: string, data: object, resType = "json", fullPath = false) {
     console.log("firebase call to ", path)
@@ -51,6 +53,7 @@ export abstract class FirebaseCall<T> {
 
   static patch(path: string, data: object, resType = "json", fullPath = false) {
     console.log("firebase call to ", path)
+    // TODO use approach as in onAuthStateChanged?
     useAuthStore().user.getIdToken()
       .then((idToken) => {
         //console.log("got idTOken", idToken)
@@ -65,15 +68,15 @@ export abstract class FirebaseCall<T> {
       })
   }
 
-  static put(path: string, data: object) {
-    return useAuthStore().getToken(api).then((token: string) => {
-      return api.put(`${process.env.BACKEND_URL}${path}`, data, {headers: {'AuthToken': token}})
-        .catch((err: any) => {
-          FirebaseCall.handleError(err)
-          return Promise.reject("user not authenticated")
-        })
-    })
-  }
+  // static put(path: string, data: object) {
+  //   return useAuthStore().getToken(api).then((token: string) => {
+  //     return api.put(`${process.env.BACKEND_URL}${path}`, data, {headers: {'AuthToken': token}})
+  //       .catch((err: any) => {
+  //         FirebaseCall.handleError(err)
+  //         return Promise.reject("user not authenticated")
+  //       })
+  //   })
+  // }
 
   private static handleError(err: any) {
     if (axios.isAxiosError(err)) {
diff --git a/src/services/persistence/GitPersistentService.ts b/src/services/persistence/GitPersistentService.ts
index 04792a43..dbe68514 100644
--- a/src/services/persistence/GitPersistentService.ts
+++ b/src/services/persistence/GitPersistentService.ts
@@ -23,7 +23,7 @@ import {useTabsStore} from "stores/tabsStore";
 import {useSpacesStore} from "stores/spacesStore";
 import {LocalStorage, uid} from "quasar";
 import {SyncType} from "stores/appStore";
-import {SUBSCRIPTION_ID_IDENT, SYNC_GITHUB_TOKEN, SYNC_GITHUB_URL} from "boot/constants";
+import {SUBSCRIPTION_ID_IDENT, SYNC_GITHUB_TOKEN} from "boot/constants";
 
 if (typeof self !== 'undefined') {
   self.Buffer = Buffer;