set new version

Author: nwoodward

Pipfile

@@ -6,31 +6,31 @@ verify_ssl = true
 [dev-packages]
 
 [packages]
-astroid = "==2.9.0"
-bleach = "==4.1.0"
-certifi = "==2021.10.8"
+astroid = "==2.11.5"
+bleach = "==5.0.0"
+certifi = "==2022.9.24"
 chardet = "==4.0.0"
-click = "==8.0.3"
+click = "==8.1.3"
 dataverse = {editable = true, git = "https://github.com/IQSS/dataverse-client-python.git", ref = "5f95a11e2f32bcfabe28e6ad43b2f7edac60d983"}
 first = "==2.0.2"
 html5lib = "==1.1"
 idna = "==3.3"
 isort = "==5.10.1"
 lazy-object-proxy = "==1.7.1"
-lxml = "==4.7.1"
-mccabe = "==0.6.1"
-psycopg2 = "==2.9.2"
-pylint = "==2.12.2"
-pyparsing = "==3.0.6"
-requests = "==2.26.0"
+lxml = "==4.9.1"
+mccabe = "==0.7.0"
+psycopg2-binary = "==2.9.4"
+pylint = "==2.13.8"
+pyparsing = "==3.0.8"
+requests = "==2.28.1"
 six = "==1.16.0"
 toml = "==0.10.2"
-typed-ast = "==1.5.1"
-urllib3 = "==1.26.7"
+typed-ast = "==1.5.3"
+urllib3 = "==1.26.12"
 webencodings = "==0.5.1"
-wrapt = "==1.13.3"
+wrapt = "==1.14.1"
 PyYAML = "==6.0"
-XlsxWriter = "==3.0.2"
+XlsxWriter = "==3.0.3"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -36,6 +36,11 @@ work_dir: '/tmp'
 log_path: 'logs'
 log_file: 'dataverse-reports.log'
 log_level: 'INFO'
+smtp_host: 'localhost'
+smtp_auth: ''
+smtp_port: 25
+smtp_username: 'username'
+smtp_password: 'password'
 from_email: ''
 admin_emails:
         - email1
@@ -55,7 +60,7 @@ accounts:
                - email1
 ```
 
-Set parameters for API and database connections. Accounts list refers to top-level dataverses on which reports based at the institutional level will begin.
+Set parameters for API and database connections, as well as the SMTP configuration. Accounts list refers to top-level dataverses on which reports based at the institutional level will begin.
 
 NOTE: The accounts section can be left blank if your Dataverse instance is not set up with separate institutions as top-level dataverses. In that case, your reports will be for everything from the root dataverse on down and sent to all admins.
 

README.md

@@ -9,6 +9,11 @@ work_dir: '/tmp'
 log_path: 'logs'
 log_file: 'dataverse-reports.log'
 log_level: 'INFO'
+smtp_host: 'localhost'
+smtp_auth: ''
+smtp_port: 25
+smtp_username: 'username'
+smtp_password: 'password'
 from_email: ''
 admin_emails:
         - email1

config/application.yml.sample

@@ -74,7 +74,20 @@ def email_report_internal(self, report_file_paths=[], to_email=None, from_email=
             part.add_header('Content-Disposition', "attachment; filename= %s" % report_file_name)
             message.attach(part)
 
+
+        # Get SMTP configuration 
+        smtp_host = self.config['smtp_host']
+        smtp_auth = self.config['smtp_auth']
+        smtp_port = self.config['smtp_port']
+        smtp_username = self.config['smtp_username']
+        smtp_password = self.config['smtp_password']
+
         # Send email
-        self.logger.info("Sending dataverse report to %s.", to_email)
-        with smtplib.SMTP('localhost') as s:
-            s.send_message(message)
+        self.logger.info('Sending Dataverse report to {email}.'.format(email=to_email))
+        server = smtplib.SMTP(smtp_host, smtp_port)
+        if smtp_auth == 'tls':
+            server.starttls()
+        if smtp_username and smtp_password:
+            server.login(smtp_username, smtp_password)
+        server.send_message(message)
+        server.quit()

lib/email.py

@@ -52,8 +52,10 @@ def load_all_users_list(self):
     def find_user_email(self, email):
         user = {}
 
+        email_lower = email.casefold()
+
         for u in self.all_users:
-            if email == u['email']:
+            if 'email' in u and email_lower == u['email'].casefold():
                 user = u
 
         return user

reports/user.py

@@ -8,7 +8,7 @@
 
 setup(
     name = 'dataverse-reports',
-    version='1.3.0',
+    version='1.4.0',
     url = 'https://www.tdl.org/',
     author = 'Nicholas Woodward',
     author_email = '[email protected]',