considering that userLastConnection should now be provided into a dedicated document, so that a new /users/{userId} document can be created when it doesn't exist (yet)

Author: fcamblor

cloud/firestore/firestore.default.rules

@@ -170,12 +170,21 @@ service cloud.firestore {
     match /users/{userId} {
       allow list, create, delete: if false;
     	allow get: if iAm(userId);
+    	/* TODO: update this to false after DVBE25
+    	  (user should have had time to update to the new version of the app which, now, populates
+    	  /users/{userId}/last-connection/self node which, in turn, copies userLastConnection to this document)
+    	*/
     	allow update: if iAm(userId) && onlyAllowedUpdatedFields(["userLastConnection"]);
 
       match /preferences/self {
         allow get, create, update: if iAm(userId);
         allow delete, list: if false;
       }
+      match /last-connection/self {
+        /* Don't know why, but we need to allow update in order to be able to create (at least in unit tests) */
+        allow create, update: if iAm(userId);
+        allow get, delete, list: if false;
+      }
       /* Legacy node: but kept for backward compatibility until every users have migrated their tokens-wallet
          (this can take a lot of time)
        */

cloud/firestore/firestore.default.rules.spec.ts

@@ -80,6 +80,24 @@ const FIREBASE_MANAGED_COLLECTIONS = [
       data: () => ({pinnedEventIds: []}),
       updatedData: () => ({pinnedEventIds: ['42']})
     }]
+  }, {
+    name: '/users/{userId}/last-connection/self',
+    docInitializations: [{
+      name: 'alice',
+      collection: '/users/alice/last-connection',
+      path: '/users/alice/last-connection/self',
+      newDocPath: '/users/alice/last-connection/other',
+      data: () => ({userLastConnection: "2024-10-27T12:00:00Z"}),
+      updatedData: () => ({userLastConnection: "2024-10-27T12:42:00Z"})
+    }, {
+      name: 'fred',
+      collection: '/users/fred/last-connection',
+      path: '/users/fred/last-connection/self',
+      newDocPath: '/users/fred/last-connection/other',
+      data: () => ({userLastConnection: "2024-10-27T12:00:00Z"}),
+      updatedData: () => ({userLastConnection: "2024-10-27T12:42:00Z"})
+    }]
+
   }, {
     name: '/users/{userId}/events/{eventId}',
     docInitializations: [{
@@ -802,6 +820,31 @@ const COLLECTIONS: CollectionDescriptor[] = [{
           list: false, createDoc: false, delete: false, get: false, update: false, createNew: false
         }, 'alice')
     }
+}, {
+    name: "/users/{userId}/last-connection",
+    aroundTests: (userContext: UserContext) => match(userContext)
+        .with({ name: "unauthenticated user" },  () => ({
+            beforeEach: [],
+            afterEach: [],
+        }))
+        .with({ name: "fred user" },  () => ({
+            beforeEach: [],
+            afterEach: [],
+        })).run(),
+    tests: (userContext: UserContext) => {
+      ensureCollectionFollowAccessPermissions('/users/{userId}/last-connection/self', userContext,
+        {
+          createDoc: userContext.name === 'fred user',
+          get: false, update: userContext.name === 'fred user',
+          list: false, delete: false, createNew: false,
+        }, 'fred')
+
+      ensureCollectionFollowAccessPermissions('/users/{userId}/last-connection/self', userContext,
+        {
+          get: false, update: false, createDoc: false,
+          list: false, delete: false, createNew: false,
+        }, 'alice')
+    }
 }, {
     name: "/users/{userId}/preferences",
     aroundTests: (userContext: UserContext) => match(userContext)

cloud/functions/src/functions/firestore/onUserCreated.ts

@@ -20,6 +20,7 @@ export async function createUserInfos(userId: string) {
         privateUserId: userId,
         publicUserToken,
         userCreation: new Date().toISOString() as ISODatetime,
+        userLastConnection: new Date().toISOString() as ISODatetime,
         username: `Anonymous${generateRandom15DigitInteger()}`,
         totalFavs: {
           total: 0,

cloud/functions/src/functions/firestore/onUserLastConnectionCreated.ts

@@ -0,0 +1,26 @@
+import {QueryDocumentSnapshot} from "firebase-functions/lib/v1/providers/firestore";
+import {EventContext} from "firebase-functions/lib/v1/cloud-functions";
+import {db} from "../../firebase";
+import {firestore} from "firebase-admin";
+import {User} from "../../../../../shared/user.firestore";
+import DocumentSnapshot = firestore.DocumentSnapshot;
+import {UserLastConnection} from "../../../../../shared/user-last-connection.firestore";
+import {createUserInfos} from "./onUserCreated";
+
+export const onUserLastConnectionCreated = async (snapshot: QueryDocumentSnapshot, context: EventContext<{ userId: string }>) => {
+  const userId = context.params.userId;
+  // Checking if user infos have been created: if not, creating it
+  // This can happen in multiple cases:
+  // - onUserCreated() has not been called (yet)
+  // - user has been considered outdated and has been cleant (this allows to re-create a well formed user data in case
+  // someone doesn't connect to voxxrin for a very long time)
+  const userDoc = await db.doc(`/users/${userId}`).get() as DocumentSnapshot<User>
+  const user = userDoc.data();
+  const userLastConnection = snapshot.data() as UserLastConnection;
+  if(!userDoc.exists || !user) {
+    await createUserInfos(userId)
+  }
+
+  // Updating user last connection in main document
+  await userDoc.ref.update("userLastConnection", userLastConnection.userLastConnection)
+}

cloud/functions/src/index.ts

@@ -103,6 +103,11 @@ exports.onUserPrivateSpaceTalkFeedbackCreated = functions.firestore
   .onCreate(async (snapshot, context) => {
     (await import('./functions/firestore/onTalkFeedbackProvided')).onUserTalkFeedbackCreated(snapshot, context)
   });
+exports.onUserLastConnectionCreated = functions.firestore
+  .document(`users/{userId}/last-connection/self`)
+  .onCreate(async (snapshot, context) => {
+    (await import('./functions/firestore/onUserLastConnectionCreated')).onUserLastConnectionCreated(snapshot, context)
+  });
 
 // Schedulers
 exports.refreshSlowPacedTalkStatsCron = functions.pubsub

mobile/src/components/user/AuthenticatedUserContextProvider.vue

@@ -3,13 +3,15 @@
 </template>
 
 <script setup lang="ts">
-import {PropType, watch} from "vue";
+import {PropType} from "vue";
 import {migrateData} from "@/data-migrations/migrate-data";
-import {collection, doc, updateDoc} from "firebase/firestore";
+import {doc, setDoc} from "firebase/firestore";
 import {db} from "@/state/firebase";
 import {User} from "firebase/auth";
 import {useUserTokensWallet} from "@/state/useUserTokensWallet";
 import {match, P} from "ts-pattern";
+import {UserLastConnection} from "../../../../shared/user-last-connection.firestore";
+import {ISODatetime} from "../../../../shared/type-utils";
 
 const props = defineProps({
   user: {
@@ -20,12 +22,12 @@ const props = defineProps({
 
 migrateData(props.user.uid);
 
-const userRef = doc(collection(db, 'users'), props.user.uid)
-// Letting some time to the server to create the new user node the first time the user authenticates
-// ... so that we can then update last connection date
-setTimeout(() => {
-  updateDoc(userRef, "userLastConnection", new Date().toISOString())
-}, 30000);
+const userLastConnexion: UserLastConnection = {
+  privateUserId: props.user.uid,
+  userLastConnection: new Date().toISOString() as ISODatetime,
+}
+// Creating user last-connection doc with (always) last known user connection in it
+setDoc(doc(db, `/users/${props.user.uid}/last-connexion/self`), userLastConnexion);
 
 
 const { registerTalkFeedbacksViewerSecretToken, registerEventOrganizerSecretToken, registerPrivateSpaceSecretToken } = useUserTokensWallet();

shared/user-last-connection.firestore.d.ts

@@ -0,0 +1,6 @@
+import {ISODatetime} from "./type-utils";
+
+export type UserLastConnection = {
+  privateUserId: string;
+  userLastConnection: ISODatetime;
+}