merge

synapse/handlers/oidc.py

@@ -1487,6 +1487,8 @@ class UserAttributeDict(TypedDict):
     display_name: Optional[str]
     picture: Optional[str]  # may be omitted by older `OidcMappingProviders`
     emails: List[str]
+    is_admin: Optional[bool]  # watcha+
+    nextcloud_username: Optional[str]  # watcha+
 
 
 C = TypeVar("C")

synapse/types/__init__.py

@@ -1179,7 +1179,7 @@ class UserInfo:
     is_shadow_banned: bool
     approved: bool
     locked: bool
-
+    is_partner: bool # watcha+
 
 class UserProfile(TypedDict):
     user_id: str

tests/storage/test_user_directory.py

@@ -656,14 +656,6 @@ class UserDirectoryStoreTestCase(HomeserverTestCase):
     test_search_user_dir_stop_words.skip = skip_reason
     # +watcha
 
-
-# watcha+
-USER = "@user:test"
-USER_X = "@user_x:test"
-USER_Y = "@user_y:test"
-PARTNER = "@partner:test"
-
-
 class UserDirectoryStoreTestCaseWithIcu(UserDirectoryStoreTestCase):
     use_icu = True
 
@@ -736,7 +728,15 @@ class UserDirectoryICUTestCase(HomeserverTestCase):
             ["lazy", "fox", "jumped", "over", "the", "dog"],
         )
 
-        class WatchaUserDirectoryStoreTestCase(HomeserverTestCase):
+
+# watcha+
+USER = "@user:test"
+USER_X = "@user_x:test"
+USER_Y = "@user_y:test"
+PARTNER = "@partner:test"
+
+
+class WatchaUserDirectoryStoreTestCase(HomeserverTestCase):
     def prepare(self, reactor, clock, hs):
         self.registration_handler = self.hs.get_registration_handler()
         self.store = hs.get_datastores().main
@@ -852,4 +852,3 @@ class UserDirectoryICUTestCase(HomeserverTestCase):
 
 
 # +watcha
-