django-restit 4.2.72__tar.gz → 4.2.74__tar.gz

{django_restit-4.2.72 → django_restit-4.2.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.72
+Version: 4.2.74
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.72 → django_restit-4.2.74}/account/models/device.py

@@ -113,9 +113,20 @@ class MemberDeviceMetaData(rm.MetaDataBase):
 
 class CloudCredentials(models.Model, rm.RestModel, rm.MetaDataModel):
     """
-    MemberDevice Model tracks personal devices associated with a user.
-    This can include mobile and desktop devices.
+    CloudCredentials is a global setting for a group to store this groups cloud credentials.
     """
+    class RestMeta:
+        VIEW_PERMS = ["view_cm", "manage_cm"]
+        EDIT_PERMS = ["manage_cm"]
+        GRAPHS = {
+            "default": {
+                "extra": ["metadata"],
+                "graphs": {
+                    "group": "basic"
+                }
+            }
+        }
+
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
     group = models.ForeignKey("account.Group", related_name="cloud_credentials", on_delete=models.CASCADE)

{django_restit-4.2.72 → django_restit-4.2.74}/account/models/member.py

@@ -88,7 +88,8 @@ class Member(User, RestModel, MetaDataModel):
             ("perms", "properties|permissions.")]
         QUERY_FIELDS_SPECIAL = {
             "ip": "auth_sessions__ip",
-            "login_country": "auth_sessions__location__country"
+            "login_country": "auth_sessions__location__country",
+            "not_login_country": "auth_sessions__location__country__ne"
         }
         UNIQUE_LOOKUP = ["username", "email"]
         METADATA_FIELD_PROPERTIES = settings.USER_METADATA_PROPERTIES
@@ -221,6 +222,14 @@ class Member(User, RestModel, MetaDataModel):
             return token.secure_token
         return None
 
+    @property
+    def force_single_session(self):
+        return self.hasPermission("force_single_session")
+
+    @property
+    def email_disabled(self):
+        return self.hasPermission("email_disabled")
+
     @property
     def has_totp(self):
         token = self.getProperty("totp_token", category="secrets", default=None)
@@ -617,7 +626,11 @@ class Member(User, RestModel, MetaDataModel):
         email = self.email
         valid_email = email is not None and "@" in email and "invalid" not in email
         allow_sms = not email_only and phone and (force or via in ["all", "sms"])
-        allow_email = valid_email and (force or via in ["all", "email"])
+        if not force:
+            allow_email = not self.email_disabled and valid_email and (force or via in ["all", "email"])
+        else:
+            allow_email = valid_email
+        
         if not allow_email and not allow_sms:
             return False
 
@@ -847,6 +860,8 @@ class Member(User, RestModel, MetaDataModel):
             if token is None:
                 token = AuthToken(member=self, role="default")
             token.generateToken()
+        elif action == "refresh_keys":
+            self.refreshSecurityToken()
 
     def set_full_name(self, value):
         self.set_name(value)
@@ -1042,7 +1057,7 @@ class Member(User, RestModel, MetaDataModel):
         return Member.objects.filter(phone_number=phone_number.lower()).last()
 
     @staticmethod
-    def GetWithPermission(perm, email_list=False):
+    def GetWithPermission(perm, email_list=False, ignore_disabled_email=True):
         if type(perm) is list:
             queries = [Q(properties__category="permissions", properties__key=p, properties__value="1") for p in perm]
             query = queries.pop()
@@ -1052,12 +1067,17 @@ class Member(User, RestModel, MetaDataModel):
         else:
             qset = Member.objects.filter(is_active=True).filter(properties__category="permissions", properties__key=perm, properties__value="1")
 
+        if not ignore_disabled_email:
+            qset = qset.exclude(
+                properties__category="permissions",
+                properties__key="email_disabled",
+                properties__int_value=1)
         if email_list:
             return list(qset.exclude(email__icontains="invalid").values_list('email', flat=True))
         return qset
 
     @staticmethod
-    def GetWithNotification(perm, email_list=False, exclude_member=None):
+    def GetWithNotification(perm, email_list=False, exclude_member=None, ignore_disabled_email=True):
         qset = Member.objects.filter(is_active=True)
         if exclude_member:
             qset = qset.exclude(pk=exclude_member.pk)
@@ -1080,6 +1100,11 @@ class Member(User, RestModel, MetaDataModel):
                 properties__key=perm,
                 properties__int_value=1)
 
+        if not ignore_disabled_email:
+            qset = qset.exclude(
+                properties__category="permissions",
+                properties__key="email_disabled",
+                properties__int_value=1)
         if email_list:
             return list(qset.exclude(email__icontains="invalid").values_list('email', flat=True))
         return qset
@@ -1126,7 +1151,7 @@ class Member(User, RestModel, MetaDataModel):
                              email_only=False, sms_msg=None, force=False, from_email=None):
         NotificationRecord = RestModel.getModel("account", "NotificationRecord")
         NotificationRecord.notify(
-            Member.GetWithPermission(perm), subject, message,
+            Member.GetWithPermission(perm, ignore_disabled_email=True), subject, message,
             template, context, email_only, sms_msg, force,
             from_email=from_email)
 
@@ -1136,7 +1161,8 @@ class Member(User, RestModel, MetaDataModel):
                    exclude_member=None):
         NotificationRecord = RestModel.getModel("account", "NotificationRecord")
         NotificationRecord.notify(
-            Member.GetWithNotification(setting, exclude_member=exclude_member), subject, message,
+            Member.GetWithNotification(setting, exclude_member=exclude_member, ignore_disabled_email=True),
+            subject, message,
             template, context, email_only, sms_msg, force,
             from_email=from_email)
 

{django_restit-4.2.72 → django_restit-4.2.74}/account/models/membership.py

@@ -82,13 +82,14 @@ class Membership(models.Model, RestModel, MetaDataModel):
         if value == "resend_invite":
             self.sendInvite(self.getActiveRequest())
 
-    def sendInvite(self, request=None, url=None, subject=None, site_logo=None, company_name=None):
+    def sendInvite(self, request=None, url=None, subject=None, site_logo=None, company_name=None, msg=None):
         if request:
             powered_by = request.DATA.get("powered_by", True)
             subject = request.DATA.get("invite_subject")
             url = request.DATA.get("invite_url")
             site_logo = request.DATA.get("site_logo", settings.SITE_LOGO)
             company_name = request.DATA.get("company_name", settings.COMPANY_NAME)
+            msg = request.DATA.get("invite_msg", None)
         else:
             powered_by = True
             site_logo = settings.SITE_LOGO
@@ -109,7 +110,7 @@ class Membership(models.Model, RestModel, MetaDataModel):
             url = "{}&auth_code={}".format(url, auth_token.toBase64())
         self.member.sendInvite(
             subject, self.group, url=url, 
-            msg=request.DATA.get("invite_msg", None), 
+            msg=msg, 
             POWERED_BY=powered_by,
             SITE_LOGO=site_logo,
             COMPANY_NAME=company_name,

{django_restit-4.2.72 → django_restit-4.2.74}/account/models/notify.py

@@ -151,12 +151,90 @@ class NotificationRecord(models.Model, RestModel):
         members = Member.objects.filter(email__in=emails)
         cls.notify(members, subject, message, template, context, email_only, sms_msg, force, from_email, attachments)
 
+
     @classmethod
     def notify(cls, notify_users, subject, message=None, 
                template=None, context=None, email_only=False,
                sms_msg=None, force=False,
                from_email=settings.DEFAULT_FROM_EMAIL,
                attachments=[]):
+        dup_list = []
+        email_to = []
+        sms_to = []
+        for member in notify_users:
+            via = member.getProperty("notify_via", "all")
+            phone = member.getProperty("phone")
+            email = member.email
+            valid_email = email is not None and "@" in email and "invalid" not in email
+            allow_sms = not email_only and phone and (force or via in ["all", "sms"])
+            allow_email = not member.email_disabled and valid_email and (force or via in ["all", "email"])
+            if not allow_email and not allow_sms:
+                continue
+            if allow_email and email not in dup_list:
+                dup_list.append(email)
+                email_to.append(member)
+            if not email_only and allow_sms and phone not in dup_list:
+                dup_list.append(phone)
+                sms_to.append(phone)
+
+        if len(dup_list) == 0:
+            return
+
+        if not message and not template and subject:
+            message = subject
+        if not sms_msg and subject:
+            sms_msg = subject
+        if not sms_msg and message:
+            sms_msg = message
+
+        if subject and len(subject) > 80:
+            epos = subject.find('. ') + 1
+            if epos > 10:
+                subject = subject[:epos]
+            if len(subject) > 80:
+                subject = subject[:80]
+                subject = subject[:subject.rfind(' ')] + "..."
+
+        if sms_to:
+            for phone in sms_to:
+                SMS.send(phone, sms_msg)
+
+        if not email_to:
+            return
+        for member in email_to:
+            cls._notifyViaEmail(member, subject, message, template, context, attachments, from_email)
+
+    @classmethod
+    def _notifyViaEmail(cls, member, subject, message, template, context, 
+                        attachments, from_email=None):
+        # lets verify the db is working
+        if template:
+            if context is None:
+                context = {}
+            if message is not None:
+                context["body"] = message
+            context["unsubscribe_token"] = member.getUUID()
+            message = inbox.utils.renderTemplate(template, context)
+
+        nr = NotificationMemberRecord(member=member, to_addr=member.email)
+        email_record = NotificationRecord(
+            method="email",
+            subject=subject,
+            from_addr=from_email,
+            body=message)
+        try:
+            email_record.save()
+            email_record.addAttachments(attachments)
+            email_record.send([nr])
+        except Exception as err:
+            rh.log_exception("email send failed", email_to)
+
+    @classmethod
+    def notifyLegacy(cls, notify_users, subject, message=None, 
+               template=None, context=None, email_only=False,
+               sms_msg=None, force=False,
+               from_email=settings.DEFAULT_FROM_EMAIL,
+               attachments=[]):
         # this will create a record for each email address message is sent to
         from telephony.models import SMS
         email_to = []
@@ -165,7 +243,6 @@ class NotificationRecord(models.Model, RestModel):
 
         if not message and not template and subject:
             message = subject
-
         if not sms_msg and subject:
             sms_msg = subject
         if not sms_msg and message:
@@ -197,7 +274,7 @@ class NotificationRecord(models.Model, RestModel):
             email = member.email
             valid_email = email is not None and "@" in email and "invalid" not in email
             allow_sms = not email_only and phone and (force or via in ["all", "sms"])
-            allow_email = valid_email and (force or via in ["all", "email"])
+            allow_email = not member.email_disabled and valid_email and (force or via in ["all", "email"])
             if not allow_email and not allow_sms:
                 continue
             if allow_email and email not in email_list:
@@ -226,7 +303,7 @@ class NotificationRecord(models.Model, RestModel):
                 email_record.addAttachments(attachments)
                 email_record.send(email_to)
             except Exception as err:
-                print(("failed to create record: {}".format(str(err))))
+                rh.log_exception("email send failed", email_to)
                 # we need to send emails the old way
                 addrs = []
                 for to in email_to:
@@ -302,6 +379,7 @@ class BounceHistory(models.Model, RestModel):
                 if bounce_count > 2:
                     # TODO notify support an account has been disabled because of bounce
                     user.setProperty("notify_via", "off")
+                    user.addPermission("email_disabled")
                     user.log("disabled", "notifications disabled because email bounced", method="notify")
         else:
             # TODO notify support of unknown bounce

{django_restit-4.2.72 → django_restit-4.2.74}/account/models/session.py

@@ -8,7 +8,7 @@ from rest import ua
 # replacing legacy cookie session system with more robust session info
 class AuthSession(models.Model, RestModel):
     class RestMeta:
-        SEARCH_FIELDS = ["ip", "member__username", "browser", "location__city"]
+        SEARCH_FIELDS = ["ip", "member__username", "browser", "location__city", "buid"]
         VIEW_PERMS = ["view_members", "manage_members", "manage_users", "owner"]
         CAN_SAVE = False
         CAN_DELETE = False

{django_restit-4.2.72 → django_restit-4.2.74}/account/rpc/auth.py

@@ -12,6 +12,7 @@ from django.http import HttpResponse
 from datetime import datetime, timedelta
 
 ALLOW_BASIC_LOGIN = settings.get("ALLOW_BASIC_LOGIN", False)
+FORGET_ALWAYS_TRUE = settings.get("FORGET_ALWAYS_TRUE", True)
 
 
 @rd.urlPOST(r'^login$')
@@ -57,7 +58,7 @@ def jwt_login(request):
 
 
 def on_complete_jwt(request, member):
-    if member.security_token is None or member.security_token == JWT_KEY:
+    if member.security_token is None or member.security_token == JWT_KEY or member.force_single_session:
         member.refreshSecurityToken()
 
     member.log(
@@ -301,14 +302,20 @@ def member_forgot_password(request):
     """
     member, resp = get_member_from_request(request)
     if member is None:
+        if FORGET_ALWAYS_TRUE:
+            return rv.restStatus(request, True, msg="Password reset instructions have been sent to your email. (If valid account)")
         return resp
     if resp is not None and not member.is_active:
+        if FORGET_ALWAYS_TRUE:
+            return rv.restStatus(request, True, msg="Password reset instructions have been sent to your email. (If valid account)")
         return resp
 
     if request.DATA.get("use_code", False):
         return member_forgot_password_code(request, member)
 
     if member.auth_code is not None and member.auth_code_expires > datetime.now():
+        if FORGET_ALWAYS_TRUE:
+            return rv.restStatus(request, True, msg="Password reset instructions have been sent to your email. (If valid account)")
         return rv.restPermissionDenied(request, "already sent valid auth code")
 
     member.auth_code = crypto.randomString(16)
@@ -325,7 +332,7 @@ def member_forgot_password(request):
         'to': [member.email],
     })
 
-    return rv.restStatus(request, True, msg="Password reset instructions have been sent to your email.")
+    return rv.restStatus(request, True, msg="Password reset instructions have been sent to your email. (If valid account)")
 
 
 def member_forgot_password_code(request, member):

{django_restit-4.2.72 → django_restit-4.2.74}/account/rpc/device.py

@@ -5,6 +5,13 @@ from account import models as am
 from objict import objict
 
 
+@rd.url(r'^group/cloud/credentials$')
+@rd.url(r'^group/cloud/credentials/(?P<pk>\d+)$')
+@rd.login_required
+def rest_on_group_cloud_creds(request, pk=None):
+    return am.CloudCredentials.on_rest_request(request, pk)
+
+
 @rd.url(r'^member/device$')
 @rd.url(r'^member/device/(?P<pk>\d+)$')
 @rd.login_required

{django_restit-4.2.72 → django_restit-4.2.74}/account/rpc/member.py

@@ -1,5 +1,6 @@
 from rest import decorators as rd
-from rest.views import restPermissionDenied, restStatus
+from rest.views import restPermissionDenied, restStatus, restHTML
+from rest import helpers as rh
 from account import models as am
 
 
@@ -39,3 +40,14 @@ def rest_on_authtoken(request, pk=None):
 def rest_on_session(request, pk=None):
     return am.AuthSession.on_rest_request(request, pk)
 
+
+@rd.urlGET('unsubscribe')
+@rd.requires_params(["t"])
+def rest_on_member(request):
+    t = request.DATA.get("t")
+    m = am.Member.objects.filter(uuid=t).last()
+    if m is not None:
+        m.addPermission("email_disabled")
+        m.reportIncident("email", f"{m.email} has unsubscribed to all email")
+    context = rh.getContext(request, member=m)
+    return restHTML(request, template="unsubscribed.html", context=context)

{django_restit-4.2.72 → django_restit-4.2.74}/account/templates/email/base.html

@@ -281,7 +281,7 @@
                                         <a href="{{settings.BASE_URL}}">{{settings.SITE_LABEL}}</a>
                                     </div>
                                     {% endblock %}
-                                    <p style="text-align: center; font-size: 10px;">Don't want to get notifications? <a href="{{settings.BASE_URL}}rpc/account/member/unsubscribe?email={{to}}&token={{to_token}}">Unsubscribe</a>
+                                    <p style="text-align: center; font-size: 10px;">Don't want to get notifications? <a href="{{UNSUBSCRIBE_URL}}?t={{unsubscribe_token}}">Unsubscribe</a>
                                     </p>
                                     <div>
                                 

{django_restit-4.2.72 → django_restit-4.2.74}/account/templates/email/invite.html

@@ -387,11 +387,6 @@
             <!-- START FOOTER -->
             <div class="footer">
               <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td class="content-block">
-                    <br> Don't like these emails? <a href="{{BASE_URL}}member/unsubscribe/">Unsubscribe</a>.
-                  </td>
-                </tr>
                 <tr>
                   <td class="content-block powered-by">
                     <div>Powered by {{SITE_LABEL}}</div>

{django_restit-4.2.72 → django_restit-4.2.74}/account/templates/email/plain/invite.html

@@ -295,13 +295,6 @@
                   {% endif %}
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:14px;font-weight:300;line-height:20px;text-align:center;color:#000000;">
-                        Don't like these emails? <a style="color: #c0c1ff;font-weight: bold;text-decoration: none;" href="{{BASE_URL}}member/unsubscribe/">Unsubscribe</a>.
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
       
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"

{django_restit-4.2.72 → django_restit-4.2.74}/account/templates/email/plain/reset_code.html

@@ -284,13 +284,6 @@
                   </tr>
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:14px;font-weight:300;line-height:20px;text-align:center;color:#000000;">
-                        Don't like these emails? <a style="color: #c0c1ff;font-weight: bold;text-decoration: none;" href="{{BASE_URL}}member/unsubscribe/">Unsubscribe</a>.
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
       
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"

{django_restit-4.2.72 → django_restit-4.2.74}/account/templates/email/reset_code.html

@@ -377,11 +377,6 @@
             <!-- START FOOTER -->
             <div class="footer">
               <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td class="content-block">
-                    <br> Don't like these emails? <a href="{{BASE_URL}}member/unsubscribe/">Unsubscribe</a>.
-                  </td>
-                </tr>
                 <tr>
                   <td class="content-block powered-by">
                     <div>Powered by {{SITE_LABEL}}</div>

{django_restit-4.2.72 → django_restit-4.2.74}/account/templates/email/simple/invite.html

@@ -293,13 +293,6 @@
                   </tr>
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:14px;font-weight:300;line-height:20px;text-align:center;color:#fafafa;">
-                        Don't like these emails? <a style="color: #c0c1ff;font-weight: bold;text-decoration: none;" href="{{BASE_URL}}member/unsubscribe/">Unsubscribe</a>.
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
       
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"

{django_restit-4.2.72 → django_restit-4.2.74}/account/templates/email/simple/reset_code.html

@@ -284,13 +284,6 @@
                   </tr>
                   <tr>
                     <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                      <div style="font-family:Roboto, Helvetica, Arial, sans-serif;font-size:14px;font-weight:300;line-height:20px;text-align:center;color:#fafafa;">
-                        Don't like these emails? <a style="color: #c0c1ff;font-weight: bold;text-decoration: none;" href="{{BASE_URL}}member/unsubscribe/">Unsubscribe</a>.
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td align="center" style="font-size:0px;padding:10px 25px;word-break:break-word;">
       
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:600px;" width="600"