sessions are unique changed to be more like require login in its effe…

…ct on functions; fixed issue with email

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [1.5.1] - 2024-08-15
+
+### Fixed
+- Problem with sending email due to change in Flask-Mail.
+- The effect of `sessions are unique` was changed to be more like
+  the effect of `require login`.
+
 ## [1.5.0] - 2024-08-14
 
 ### Added

docassemble_base/docassemble/base/config.py

@@ -617,6 +617,7 @@ def load(**kwargs):
                         else:
                             new_item['roles'] = None
                         new_item['require_login'] = bool(item.get('require login', False))
+                        new_item['unique_sessions'] = bool(item.get('sessions are unique', False))
                         new_admin_interviews.append(new_item)
                     else:
                         config_error("Unrecognized item in administrative interviews.")

docassemble_base/docassemble/base/parse.py

@@ -8353,11 +8353,14 @@ def allowed_to_access(self, is_anonymous=False, has_roles=None):
             if has_roles is not None:
                 return len(set(roles).intersection(set(has_roles))) > 0
         if is_anonymous:
+            unique_sessions = False
             require_login = False
             for metadata in self.metadata:
                 if 'require login' in metadata:
                     require_login = bool(metadata['require login'])
-            if require_login:
+                if 'sessions are unique' in metadata:
+                    unique_sessions = bool(metadata['sessions are unique'])
+            if require_login or unique_sessions:
                 return False
         return True
 
@@ -8419,11 +8422,14 @@ def allowed_to_see_listed(self, is_anonymous=False, has_roles=None):
             if has_roles is not None:
                 return len(set(roles).intersection(set(has_roles))) > 0
         if is_anonymous:
+            unique_sessions = False
             require_login = False
             for metadata in self.metadata:
                 if 'require login' in metadata:
                     require_login = bool(metadata['require login'])
-            if require_login:
+                if 'sessions are unique' in metadata:
+                    unique_sessions = bool(metadata['sessions are unique'])
+            if require_login or unique_sessions:
                 return False
         return True
 

docassemble_webapp/docassemble/webapp/da_flask_mail.py

@@ -41,6 +41,7 @@ def __init__(self, subject='',
                  recipients=None,
                  body=None,
                  html=None,
+                 alts={},
                  sender=None,
                  cc=None,
                  bcc=None,
@@ -52,6 +53,6 @@ def __init__(self, subject='',
                  mail_options=None,
                  rcpt_options=None):
         null_sender = sender is None
-        super().__init__(subject, recipients, body, html, sender, cc, bcc, attachments, reply_to, date, charset, extra_headers, mail_options, rcpt_options)
+        super().__init__(subject, recipients, body, html, alts, sender, cc, bcc, attachments, reply_to, date, charset, extra_headers, mail_options, rcpt_options)
         if null_sender:
             self.sender = None

docassemble_webapp/docassemble/webapp/server.py

@@ -6863,7 +6863,7 @@ def index(action_argument=None, refer=None):
             session_id = None
             if reset_interview == 2:
                 delete_session_sessions()
-            if (not reset_interview) and (unique_sessions is True or (isinstance(unique_sessions, list) and len(unique_sessions) and current_user.has_role(*unique_sessions))):
+            if (not reset_interview) and (unique_sessions is True or (isinstance(unique_sessions, list) and len(unique_sessions) > 0 and current_user.has_role(*unique_sessions))):
                 session_id, encrypted = get_existing_session(yaml_filename, secret)
             if session_id is None:
                 user_code, user_dict = reset_session(yaml_filename, secret)
@@ -31797,7 +31797,7 @@ def is_not(self, interview):
         return self.interview != interview
 
     def can_use(self):
-        if self.require_login and current_user.is_anonymous:
+        if (self.require_login or self.unique_sessions) and current_user.is_anonymous:
             return False
         if self.roles is None:
             return True
@@ -31869,6 +31869,7 @@ def set_admin_interviews():
                         menu_item.label = item['label']
                         menu_item.roles = item['roles']
                         menu_item.require_login = item['require_login']
+                        menu_item.unique_sessions = item['unique_sessions']
                         admin_interviews.append(menu_item)
                     elif 'interview' in item and isinstance(item['interview'], str):
                         try:
@@ -31945,6 +31946,13 @@ def set_admin_interviews():
                             for metadata in interview.metadata:
                                 if 'require login' in metadata:
                                     admin_interview.require_login = bool(metadata['require login'])
+                        admin_interview.unique_sessions = False
+                        if 'sessions are unique' in item and item['sessions are unique'] is not None:
+                            admin_interview.unique_sessions = bool(item['sessions are unique'])
+                        else:
+                            for metadata in interview.metadata:
+                                if 'sessions are unique' in metadata:
+                                    admin_interview.unique_sessions = bool(metadata['sessions are unique'])
                         admin_interviews.append(admin_interview)
                     else:
                         logmessage("item in administrative interviews must contain a valid interview name")