Merge pull request #8 from SAPUCC/fix/externalusers

Fix: Support external users in Azure AD

Author: v411e

CHANGELOG.md

@@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - 
 
+## [0.1.3] - 2023-04-12
+
+### Fix
+
+- Fix: Support external users in Azure AD. (Remove _abc.com#EXT# artifacts from username)
+
 ## [0.1.2] - 2023-03-13
 
 ### Fix

inviter/ms_graph_connector.py

@@ -25,6 +25,8 @@
 from inviter.config import Config
 from inviter.room_structure import MXID, PowerLevel, RoomMember, Room, RoomAlias
 
+import re
+
 
 async def get_client(tenant_id: str, client_id: str, client_secret: str) -> GraphClient:
     """
@@ -136,9 +138,10 @@ async def get_rooms(config: Config) -> List[Room]:
             elif account_enabled is False:
                 continue
 
-            # Get room member details from user
+            # Get room member details from user, remove artifacts of external users
+            userPrincipalName: str = re.sub('\_.*#EXT#', '', user.get('userPrincipalName').split('@', 1)[0])
             mxid = config.get_renamed_mxid(
-                MXID(user.get('userPrincipalName').split('@', 1)[0], member_homeserver))
+                MXID(userPrincipalName, member_homeserver))
             permission_level = PowerLevel.STANDARD
 
             # Group owners in AD get the moderator role in matrix room

maubot.yaml

@@ -1,6 +1,6 @@
 maubot: 0.2.0
 id: de.in4md-service.inviterbot
-version: 0.1.2
+version: 0.1.3
 license: GPLv3
 modules:
  - inviter