Merge pull request #19859 from jmchilton/clean_circular_2

Remove circular dependency around user store.

Author: ahmedhamidawan

client/src/composables/hashedUserId.ts

@@ -1,8 +1,6 @@
-import { storeToRefs } from "pinia";
 import { computed, type Ref, ref, watch } from "vue";
 
 import { type AnyUser } from "@/api";
-import { useUserStore } from "@/stores/userStore";
 
 import { usePersistentRef } from "./persistentRef";
 
@@ -33,15 +31,8 @@ let unhashedId: string | null = null;
 /**
  * One way hashed ID of the current User
  */
-export function useHashedUserId(user?: Ref<AnyUser>) {
-    let currentUser: Ref<AnyUser>;
-
-    if (user) {
-        currentUser = user;
-    } else {
-        const { currentUser: currentUserRef } = storeToRefs(useUserStore());
-        currentUser = currentUserRef;
-    }
+export function useHashedUserId(user: Ref<AnyUser>) {
+    const currentUser: Ref<AnyUser> = user;
 
     // salt the local store, to make a user untraceable by id across different clients
     const localStorageSalt = usePersistentRef("local-storage-salt", createSalt());

client/src/composables/hashedUserIdFromUserStore.ts

@@ -0,0 +1,13 @@
+import { storeToRefs } from "pinia";
+
+import { useUserStore } from "@/stores/userStore";
+
+import { useHashedUserId as parentUseHashedUserId } from "./hashedUserId";
+
+/**
+ * One way hashed ID of the current User
+ */
+export function useHashedUserId() {
+    const { currentUser: currentUserRef } = storeToRefs(useUserStore());
+    return parentUseHashedUserId(currentUserRef);
+}

client/src/composables/userLocalStorage.ts

@@ -4,6 +4,7 @@ import { type Ref, ref } from "vue";
 import { type AnyUser } from "@/api";
 
 import { useHashedUserId } from "./hashedUserId";
+import { useHashedUserId as useHashedUserIdFromStore } from "./hashedUserIdFromUserStore";
 import { syncRefToLocalStorage } from "./persistentRef";
 
 /**
@@ -12,7 +13,12 @@ import { syncRefToLocalStorage } from "./persistentRef";
  * @param initialValue
  */
 export function useUserLocalStorage<T>(key: string, initialValue: T, user?: Ref<AnyUser>) {
-    const { hashedUserId } = useHashedUserId(user);
+    let hashedUserId;
+    if (user) {
+        hashedUserId = useHashedUserId(user).hashedUserId;
+    } else {
+        hashedUserId = useHashedUserIdFromStore().hashedUserId;
+    }
 
     const refToSync = ref(initialValue);
     let hasSynced = false;

client/src/stores/activityStore.ts

@@ -4,7 +4,7 @@
 import { useDebounceFn, watchImmediate } from "@vueuse/core";
 import { computed, type Ref, ref, set } from "vue";
 
-import { useHashedUserId } from "@/composables/hashedUserId";
+import { useHashedUserId } from "@/composables/hashedUserIdFromUserStore";
 import { useUserLocalStorage } from "@/composables/userLocalStorage";
 import { ensureDefined } from "@/utils/assertions";