#72 introduced useFirestoreUser() hook and using it to show private/p…

…ublic tokens on user dashboard page, thus allowing to remove those fields from user-tokens-wallet collection

mobile/src/models/VoxxrinUser.ts

@@ -7,10 +7,20 @@ import {
 } from "../../../shared/user-tokens-wallet.localstorage";
 import {TalkId} from "@/models/VoxxrinTalk";
 import {Replace} from "../../../shared/type-utils";
+import {User} from "../../../shared/user.firestore";
 
 
 export class UserLocale extends ValueObject<string>{ _userLocaleClassDiscriminator!: never; }
 
+export type VoxxrinUser = Replace<User, {}>
+
+export function toVoxxrinUser(firestoreUser: User): VoxxrinUser {
+  return { ...firestoreUser };
+}
+export function toFirestoreUser(voxxrinUser: VoxxrinUser): User {
+  return { ...voxxrinUser };
+}
+
 export type VoxxrinUserPreferences = Replace<UserPreferences, {
     pinnedEventIds: Array<EventId>
 }>

mobile/src/state/useCurrentUser.ts

@@ -1,5 +1,10 @@
-import {UserLocale} from "@/models/VoxxrinUser";
+import {toVoxxrinUser, UserLocale} from "@/models/VoxxrinUser";
 import {useCurrentUser as vueFireUseCurrentUser} from "vuefire";
+import {computed, toValue} from "vue";
+import {db} from "@/state/firebase";
+import {deferredVuefireUseDocument} from "@/views/vue-utils";
+import {doc, DocumentReference} from "firebase/firestore";
+import {User} from "../../../shared/user.firestore";
 
 
 export function useCurrentUserLocale() {
@@ -9,3 +14,27 @@ export function useCurrentUserLocale() {
 }
 
 export const useCurrentUser = vueFireUseCurrentUser;
+
+export function useFirestoreUser() {
+  const userRef = useCurrentUser()
+
+  const firestoreUserRef = deferredVuefireUseDocument([userRef],
+    ([user]) => {
+      if(!user) {
+        return undefined;
+      }
+
+      return doc(db, `users/${user.uid}`) as DocumentReference<User>
+    })
+
+  return {
+    userRef: computed(() => {
+      const firestoreUser = toValue(firestoreUserRef);
+      if(!firestoreUser) {
+        return undefined;
+      }
+
+      return toVoxxrinUser(firestoreUser);
+    })
+  }
+}

mobile/src/views/user/UserDashboardPage.vue

@@ -18,11 +18,11 @@
         </div>
         <div class="userDashboard-user-infos">
           <strong>{{ LL.Anonymous_private_user_id() }}:</strong><br/>
-          <span class="userUid">{{currentUserRef?.uid}}</span><br/>
+          <span class="userUid">{{userRef?.privateUserId}}</span><br/>
           <small>{{LL.Please_keep_this_token_private()}}</small><br/>
           <hr/>
           <strong>{{ LL.Public_user_id() }}:</strong><br/>
-          <span class="userUid">{{userTokensWalletRef?.publicUserToken}}</span><br/>
+          <span class="userUid">{{ userRef?.publicUserToken }}</span><br/>
           <small>{{LL.This_token_will_be_used_to_reference_you_in_APIs()}}</small><br/>
         </div>
       </div>
@@ -97,7 +97,7 @@
 <script setup lang="ts">
 
 import {useIonRouter} from "@ionic/vue";
-import {useCurrentUser} from "@/state/useCurrentUser";
+import {useFirestoreUser} from "@/state/useCurrentUser";
 import Callout from "@/components/ui/Callout.vue";
 import {typesafeI18n} from "@/i18n/i18n-vue";
 import {computed, toValue} from "vue";
@@ -107,7 +107,7 @@ import {helpCircle} from "ionicons/icons";
 
 const ionRouter = useIonRouter();
 
-const currentUserRef = useCurrentUser();
+const { userRef } = useFirestoreUser();
 const { LL } = typesafeI18n()
 
 const { userTokensWalletRef } = useUserTokensWallet();

shared/user-tokens-wallet.localstorage.d.ts

@@ -1,7 +1,5 @@
 
 export type UserTokensWallet = {
-    privateUserId: string;
-    publicUserToken: string;
     secretTokens: {
         eventOrganizerTokens: UserWalletEventOrganizerSecretToken[],
         talkFeedbacksViewerTokens: UserWalletTalkFeedbacksViewerSecretToken[]