add subscription info to invite emails

Author: emma-sg

backend/btrixcloud/emailsender.py

@@ -16,6 +16,7 @@
 
 from .models import CreateReplicaJob, DeleteReplicaJob, Organization, InvitePending
 from .utils import is_bool, get_origin
+from backend.btrixcloud.models import Subscription
 
 
 # pylint: disable=too-few-public-methods, too-many-instance-attributes
@@ -138,6 +139,7 @@ async def send_user_invite(
         token: UUID,
         org_name: str,
         is_new: bool,
+        subscription: Optional[Subscription] = None,
         headers: Optional[dict] = None,
     ):
         """Send email to invite new user"""
@@ -160,6 +162,11 @@ async def send_user_invite(
             sender=invite.inviterEmail if not invite.fromSuperuser else "",
             org_name=org_name,
             support_email=self.support_email,
+            trial_remaining_days=(
+                (subscription.futureCancelDate - datetime.now()).days
+                if subscription and subscription.futureCancelDate
+                else None
+            ),
         )
 
     async def send_user_forgot_password(self, receiver_email, token, headers=None):

backend/btrixcloud/invites.py

@@ -16,10 +16,11 @@
     EmailStr,
     UserRole,
     InvitePending,
-    InviteRequest,
+    InviteToOrgRequest,
     InviteOut,
     User,
     Organization,
+    Subscription
 )
 from .users import UserManager
 from .emailsender import EmailSender
@@ -71,6 +72,7 @@ async def add_new_user_invite(
         new_user_invite: InvitePending,
         invite_token: UUID,
         org_name: str,
+        subscription: Optional[Subscription],
         headers: Optional[dict],
     ) -> None:
         """Add invite for new user"""
@@ -94,7 +96,12 @@ async def add_new_user_invite(
         await self.invites.insert_one(new_user_invite.to_dict())
 
         await self.email.send_user_invite(
-            new_user_invite, invite_token, org_name, True, headers
+            invite=new_user_invite,
+            token=invite_token,
+            org_name=org_name,
+            is_new=True,
+            subscription=subscription,
+            headers=headers,
         )
 
     # pylint: disable=too-many-arguments
@@ -130,7 +137,12 @@ async def add_existing_user_invite(
         await self.invites.insert_one(existing_user_invite.to_dict())
 
         await self.email.send_user_invite(
-            existing_user_invite, invite_token, org_name, False, headers
+            invite=existing_user_invite,
+            token=invite_token,
+            org_name=org_name,
+            is_new=False,
+            subscription=org.subscription,
+            headers=headers,
         )
 
     async def get_valid_invite(
@@ -173,7 +185,7 @@ async def remove_invite_by_email(
     # pylint: disable=too-many-arguments
     async def invite_user(
         self,
-        invite: InviteRequest,
+        invite: InviteToOrgRequest,
         user: User,
         user_manager: UserManager,
         org: Organization,
@@ -199,9 +211,9 @@ async def invite_user(
             id=uuid4(),
             oid=oid,
             created=dt_now(),
-            role=invite.role if hasattr(invite, "role") else None,
+            role=invite.role if hasattr(invite, "role") else UserRole.VIEWER,
             # URL decode email address just in case
-            email=urllib.parse.unquote(invite.email),
+            email=EmailStr(urllib.parse.unquote(invite.email)),
             inviterEmail=user.email,
             fromSuperuser=user.is_superuser,
             tokenHash=get_hash(invite_token),
@@ -223,10 +235,11 @@ async def invite_user(
             return False, invite_token
 
         await self.add_new_user_invite(
-            invite_pending,
-            invite_token,
-            org_name,
-            headers,
+            new_user_invite=invite_pending,
+            invite_token=invite_token,
+            org_name=org_name,
+            headers=headers,
+            subscription=org.subscription,
         )
         return True, invite_token
 
@@ -275,11 +288,10 @@ async def get_invite_out(
             created=invite.created,
             inviterEmail=inviter_email,
             inviterName=inviter_name,
-            fromSuperuser=from_superuser,
+            fromSuperuser=from_superuser or False,
             oid=invite.oid,
             role=invite.role,
             email=invite.email,
-            userid=invite.userid,
         )
 
         if not invite.oid: