diff --git a/projectroles/forms.py b/projectroles/forms.py index 47dd0531..c5c5977c 100644 --- a/projectroles/forms.py +++ b/projectroles/forms.py @@ -1136,6 +1136,7 @@ def clean(self): pass # Local users check + # TODO: Add OIDC users for this check if user_email: domain = user_email[user_email.find('@') + 1 :] domain_list = [ diff --git a/projectroles/management/commands/checkusers.py b/projectroles/management/commands/checkusers.py index f0829243..764197d0 100644 --- a/projectroles/management/commands/checkusers.py +++ b/projectroles/management/commands/checkusers.py @@ -166,6 +166,7 @@ def handle(self, *args, **options): return self._check_search_base_setting(primary=True) self._check_search_base_setting(primary=False) + # TODO: Limit this to users with LDAP domains in username users = User.objects.filter(username__contains='@').order_by('username') limit = options.get('limit') if not limit or limit == 'ldap1': diff --git a/projectroles/remote_projects.py b/projectroles/remote_projects.py index afe038c8..72bd38b7 100644 --- a/projectroles/remote_projects.py +++ b/projectroles/remote_projects.py @@ -413,9 +413,9 @@ def _check_local_categories(self, uuid): def _sync_user(self, uuid, user_data): """ - Synchronize LDAP or local user on target site. For local users, will - only update an existing user object. Local users must be manually - created. If local users are not allowed, data is not synchronized. + Synchronize user on target site. For local users, will only update an + existing user object. Local users must be manually created. If local + users are not allowed, data is not synchronized. :param uuid: User UUID (string) :param user_data: User sync data (dict) @@ -750,7 +750,7 @@ def _update_roles(self, project, project_data): self._handle_user_error(error_msg, project, r_uuid) continue - # Use the default owner, if owner role for a non-LDAP user and local + # Use the default owner, if owner role is for local user and local # users are not allowed if ( r['role'] == PROJECT_ROLE_OWNER @@ -763,7 +763,7 @@ def _update_roles(self, project, project_data): role_user = self.default_owner # Notify of assigning role to default owner status_msg = ( - 'Non-LDAP/AD user "{}" set as owner, assigning role ' + 'Local user "{}" set as owner, assigning role ' 'to user "{}"'.format( r['user'], self.default_owner.username )