fix user update

Author: alexcibotari

firestore.rules

@@ -82,8 +82,7 @@ service cloud.firestore {
 
     // Users
     match /users/{userId} {
-      allow get: if isSignedIn() && ( isSignedInWithUser(userId) || (hasRole('admin') || hasPermission('USER_MANAGEMENT')));
-      allow list: if isSignedIn() && (hasRole('admin') || hasPermission('USER_MANAGEMENT'));
+      allow read: if isSignedIn() && ( isSignedInWithUser(userId) || (hasRole('admin') || hasPermission('USER_MANAGEMENT')));
       allow write: if isSignedIn() && (hasRole('admin') || hasPermission('USER_MANAGEMENT'));
     }
 

src/app/features/admin/users/users.component.ts

@@ -49,7 +49,6 @@ export class UsersComponent implements OnInit {
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe({
         next: users => {
-          console.log(users);
           this.dataSource.data = users;
           this.dataSource.filterPredicate = this.userFilterPredicate;
           this.dataSource.sort = this.sort();
@@ -86,11 +85,9 @@ export class UsersComponent implements OnInit {
       .subscribe({
         next: () => {
           this.notificationService.success('User has been invited.');
-          this.loadData();
         },
         error: () => {
           this.notificationService.error('User can not be invited.');
-          this.loadData();
         },
       });
   }
@@ -113,11 +110,10 @@ export class UsersComponent implements OnInit {
       .subscribe({
         next: () => {
           this.notificationService.success('User has been updated.');
-          this.loadData();
         },
-        error: () => {
+        error: (error) => {
           this.notificationService.error('User can not be updated.');
-          this.loadData();
+          console.error(error);
         },
       });
   }
@@ -138,11 +134,9 @@ export class UsersComponent implements OnInit {
       .subscribe({
         next: () => {
           this.notificationService.success(`User '${element.email}' has been deleted.`);
-          this.loadData();
         },
         error: () => {
           this.notificationService.error(`User '${element.email}' can not be deleted.`);
-          this.loadData();
         },
       });
   }

src/app/shared/services/user.service.ts

@@ -39,19 +39,21 @@ export class UserService {
   }
 
   update(id: string, model: UserUpdate): Observable<void> {
+    console.log('UserService:update', id, model);
     const update: UpdateData<User> = {
       updatedAt: serverTimestamp(),
     };
     switch (model.role) {
       case 'admin': {
         update.role = model.role;
         update.permissions = deleteField();
+        update.lock = deleteField();
         break;
       }
       case 'custom': {
         update.role = model.role;
         update.permissions = model.permissions;
-        update.lock = model.lock;
+        update.lock = model.lock || false;
         break;
       }
       case undefined: {