Update rules and updated_at field value

canopas · Jun 11, 2024 · 4823f61 · 4823f61
1 parent ea1eb59
commit 4823f61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/data/src/main/java/com/canopas/yourspace/data/service/user/ApiUserService.kt b/data/src/main/java/com/canopas/yourspace/data/service/user/ApiUserService.kt
@@ -109,12 +109,12 @@ class ApiUserService @Inject constructor(
 
     suspend fun updateBatteryPct(userId: String, batteryPct: Float) {
         userRef.document(userId)
-            .update("battery_pct", batteryPct, "updated_at", FieldValue.serverTimestamp()).await()
+            .update("battery_pct", batteryPct, "updated_at", System.currentTimeMillis()).await()
     }
 
     suspend fun updateSessionState(id: String, state: Int) {
         userRef.document(id)
-            .update("state", state, "updated_at", FieldValue.serverTimestamp()).await()
+            .update("state", state, "updated_at", System.currentTimeMillis()).await()
     }
 
     suspend fun getUserSession(userId: String): ApiUserSession? {

diff --git a/firestore.rules b/firestore.rules
@@ -48,7 +48,7 @@ service cloud.firestore {
                     request.resource.data.get('space_ids', []) is list;
 
             allow update: if isAuthorized() && request.auth.uid == resource.data.id &&
-                    request.resource.data.diff(resource.data).affectedKeys().hasAny(['first_name', 'last_name', 'profile_image', 'location_enabled', 'space_ids', 'phone', 'email','fcm_token']) &&
+                    request.resource.data.diff(resource.data).affectedKeys().hasAny(['first_name', 'last_name', 'profile_image', 'location_enabled', 'space_ids', 'phone', 'email','fcm_token', 'updated_at', 'battery_pct', 'state']) &&
                     request.resource.data.first_name is string &&
                     request.resource.data.get('last_name', '') is string &&
                     request.resource.data.get('fcm_token', '') is string &&
@@ -88,11 +88,10 @@ service cloud.firestore {
             match /user_sessions/{docId} {
                 allow read: if isAuthorized();
                 allow create : if isAuthorized() && request.auth.uid == request.resource.data.user_id &&
-                        request.resource.data.keys().hasAll(["id", "user_id", "device_id", "fcm_token", "device_name", "platform", "session_active", "app_version", "created_at"]) &&
+                        request.resource.data.keys().hasAll(["id", "user_id", "device_id", "device_name", "platform", "session_active", "app_version", "created_at"]) &&
                         request.resource.data.id is string &&
                         request.resource.data.user_id is string &&
                         request.resource.data.device_id is string &&
-                        request.resource.data.fcm_token is string &&
                         request.resource.data.device_name is string &&
                         request.resource.data.platform is int &&
                         request.resource.data.platform == 1 &&