From bc67cc8443e16d48e0832608f648ebfc984be4a7 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@users.noreply.github.com>
Date: Fri, 13 Jan 2023 00:03:37 -0800
Subject: [PATCH] backend: registration: (#472)

- if registration is enabled, newly registred users get added to the default org, instead of getting their own org/archive
---
 backend/btrixcloud/archives.py | 13 +++++++++----
 backend/btrixcloud/users.py    |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/backend/btrixcloud/archives.py b/backend/btrixcloud/archives.py
index 75c37097..183e8836 100644
--- a/backend/btrixcloud/archives.py
+++ b/backend/btrixcloud/archives.py
@@ -287,10 +287,16 @@ class ArchiveOps:
                 status_code=400, detail="Invalid Invite Code, No Such Archive"
             )
 
-        archive.users[str(user.id)] = invite.role
-        await self.update(archive)
+        await self.add_user_to_archive(archive, user.id, invite.role)
         return True
 
+    async def add_user_to_archive(
+        self, archive: Archive, userid: uuid.UUID, role: UserRole = UserRole.OWNER
+    ):
+        """Add user to Archive with specified role"""
+        archive.users[str(userid)] = role
+        await self.update(archive)
+
 
 # ============================================================================
 def init_archives_api(app, mdb, user_manager, invites, user_dep: User):
@@ -404,8 +410,7 @@ def init_archives_api(app, mdb, user_manager, invites, user_dep: User):
         if other_user.email == user.email:
             raise HTTPException(status_code=400, detail="Can't change own role!")
 
-        archive.users[str(other_user.id)] = update.role
-        await ops.update(archive)
+        await ops.add_user_to_archive(archive, other_user.id, update.role)
 
         return {"updated": True}
 
diff --git a/backend/btrixcloud/users.py b/backend/btrixcloud/users.py
index cac10ce6..bad6bcce 100644
--- a/backend/btrixcloud/users.py
+++ b/backend/btrixcloud/users.py
@@ -232,6 +232,10 @@ class UserManager(BaseUserManager[UserCreate, UserDB]):
                 storage_name="default",
                 user=user,
             )
+        else:
+            default_org = await self.archive_ops.get_default_org()
+            if default_org:
+                await self.archive_ops.add_user_to_archive(default_org, user.id)
 
         is_verified = hasattr(user_create, "is_verified") and user_create.is_verified