Merge branch 'fix-email-access-authn' of https://github.com/NCAR/ckan…

…ext-harvest into NCAR-fix-email-access-authn
ckan · Sep 20, 2022 · 72e9fee · 72e9fee
2 parents 98edcd3 + 125ec71
commit 72e9fee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,6 @@ development.ini
 node_modules
 *.project
 .eggs
-.vscode/
+.idea/
+.vscode/
+
diff --git a/ckanext/harvest/logic/action/get.py b/ckanext/harvest/logic/action/get.py
@@ -436,11 +436,13 @@ def harvest_get_notifications_recipients(context, data_dict):
         model.User.sysadmin == True  # noqa: E712
     ).all()
 
+    # Send mail to all sysadmins with a non-empty email address
     for sysadmin in sysadmins:
-        if sysadmin.email:
+        email_address = sysadmin.email
+        if email_address and email_address.strip():
             recipients.append({
                 'name': sysadmin.name,
-                'email': sysadmin.email
+                'email': email_address,
             })
 
     # gather organization-admins
@@ -451,14 +453,17 @@ def harvest_get_notifications_recipients(context, data_dict):
             'capacity': 'admin'
         })
 
+        # Get access to email address by running action as admin user
+        context['user'] = p.toolkit.get_action('get_site_user')({'ignore_auth': True})['name']
         for member in members:
             member_details = p.toolkit.get_action(
                 'user_show')(context, {'id': member[0]})
 
-            if member_details.get('email', None):
+            email_address = member_details.get('email', None)
+            if email_address and email_address.strip():
                 recipients.append({
                     'name': member_details['name'],
-                    'email': member_details['email']
+                    'email': email_address
                 })
 
     return recipients