fixed #5 (token removed), #7(whoami) and updated services

Author: bensteUEM

.github/workflows/release.yml

@@ -33,8 +33,6 @@ jobs:
 
       - name: Create Release
         uses: ncipollo/release-action@v1.12.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag: ${{ env.VERSION}}
           name: Version ${{env.VERSION}}

CommuniApi/__init__.py

@@ -27,6 +27,7 @@ def __init__(self, communi_server, communi_token, communi_appid):
                             level=logging.DEBUG)
         self.session = requests.Session()
         self.session.headers['X-Authorization'] = 'Bearer ' + self.communi_token
+        self.login()
 
         logging.debug('Instance initialized')
 
@@ -48,12 +49,26 @@ def login(self):
         response = self.session.get(url=url)
         if response.status_code == 200:
             response_content = json.loads(response.content)
-            logging.debug("Login with user ID:{} - success".format(response_content['id']))
+            self.user_id = response_content['id']
+            logging.debug("Login with user ID:{} - success".format(self.user_id))
             return response_content
         else:
             logging.debug("Login failed with {}".format(response.content))
             return False
 
+    def who_am_i(self):
+        """ Method to request user information associated with the logged in user (id stored upon successful login)
+        This can be used to test if the user is authorized
+
+        :return: dict of user OR bool False if not successful
+        """
+
+        userList = self.getUserList(userId=self.user_id)
+        if userList == {'_loadStatus': '1', 'vorname': '', 'nachname': ''}:
+            return False
+        else:
+            return self.getUserList(userId=self.user_id)
+
     def getUserList(self, **kwargs):
         """
         Method that requests the list of all users from Communi and optionally aplies filter by ID

CommuniApi/communiActions.py

@@ -65,8 +65,10 @@ def update_group_users_by_services(communi_api, event_services, groupId):
                 mail = user[0]
                 name = user[1]
                 logging.debug('Trying to match {} of user {} for service {}'.format(mail, name, service_name))
-
-                if mail in communi_users_ids.keys():
+                if service_name in ['Begrüßung & Opferzählen', 'Opfer zählen']:
+                    logging.debug('not adding User {} with mail {} because of service name'.format(name, mail))
+                    user_name_text += '\n• {} - nicht im Chat'.format(name)
+                elif mail in communi_users_ids.keys():
                     communi_user_id = communi_users_ids[mail]
                     logging.debug('User {} found in communi'.format(mail))
                     if new_group or (communi_user_id not in user_group_list):

tests/test_CommuniApi.py

@@ -54,6 +54,26 @@ def test_login(self):
         result = self.api.login()
         self.assertTrue(result)
 
+    def test_who_am_i(self):
+        """This test overwrites the stored user_id in order to fail who_am_i()
+        It will restore the original ID and expect a successful response
+        """
+        user_id = self.api.user_id
+        self.api.user_id = 0
+        result = self.api.who_am_i()
+        self.assertFalse(result)
+
+        self.api.user_id = user_id
+        result = self.api.who_am_i()
+        self.assertIsInstance(result, dict)
+        self.assertIn('id', result.keys())
+        self.assertGreaterEqual(result['id'],0)
+        self.assertGreaterEqual(len(result['vorname']),1)
+        self.assertGreaterEqual(len(result['nachname']),1)
+        self.assertIn('mailadresse', result.keys())
+        self.assertGreaterEqual(len(result['mailadresse']),1)
+
+
     def test_getUserList(self):
         """
         IMPORTANT - This test method and the parameters used depend on the target system!

versions.py

@@ -1,6 +1,6 @@
 import os
 
-VERSION = '1.0.0'
+VERSION = '1.0.1'
 
 if __name__ == '__main__':
     os.environ['VERSION'] = VERSION