diff --suppress-common-lines -r apps/user_oidc/lib/Command/UpsertProvider.php user_oidc-1.2.1/lib/Command/UpsertProvider.php
66,68d65
<             ->addOption('mapping-groups', null, InputOption::VALUE_OPTIONAL, 'Attribute mapping of the user groups (must be an array)')
<             ->addOption('check-groupadmin', null, InputOption::VALUE_OPTIONAL, 'Flag if admin group is managed via user groups (or use isAdmin option to map a specific field)')
<             ->addOption('mapping-isadmin', null, InputOption::VALUE_OPTIONAL, 'Attribute mapping of the admin group (GroupAdmin option must be unchecked)')
100c97
<                               'mapping-uid', 'mapping-display-name', 'mapping-email', 'mapping-quota', 'mapping-groups', 'check-groupadmin', 'mapping-isadmin',
---
>                               'mapping-uid', 'mapping-display-name', 'mapping-email', 'mapping-quota',
170,178d166
<               }
<               if ($mapping = $input->getOption('mapping-groups')) {
<                       $this->providerService->setSetting($provider->getId(), ProviderService::SETTING_MAPPING_GROUPS, $mapping);
<               }
<               if (($checkGroupAdmin = $input->getOption('check-groupadmin')) !== null) {
<                       $this->providerService->setSetting($provider->getId(), ProviderService::SETTING_CHECK_GROUPADMIN, (string)$checkGroupAdmin === '0' ? '0' : '1');
<               }
<               if ($mapping = $input->getOption('mapping-isadmin')) {
<                       $this->providerService->setSetting($provider->getId(), ProviderService::SETTING_MAPPING_ISADMIN, $mapping);
diff --suppress-common-lines -r apps/user_oidc/lib/Controller/LoginController.php user_oidc-1.2.1/lib/Controller/LoginController.php
32d31
< use OC\Group\Manager as GroupManager;
65,66d63
< use OCP\GroupInterface;
< use OCP\IGroupManager;
115,117d111
<
<       /** @var GroupManager */
<       protected $groupManager;
153,154c147
<               ILogger $logger,
<               IGroupManager $groupManager
---
>               ILogger $logger
176d168
<               $this->groupManager = $groupManager;
238,239d229
<               $groupsAttribute = $this->providerService->getSetting($providerId, ProviderService::SETTING_MAPPING_GROUPS, 'groups');
<               $isAdmin = $this->providerService->getSetting($providerId, ProviderService::SETTING_MAPPING_ISADMIN, 'isadmin');
250,251d239
<                               $groupsAttribute => null,
<                               $isadminAttribute => null,
257,258d244
<                               $groupsAttribute => null,
<                               $isadminAttribute => null,
489c475
<               // get name/email/quota/groups/isadmin information from the token itself
---
>               // get name/email/quota information from the token itself
496,499d481
<               $groupsAttribute = $this->providerService->getSetting($providerId, ProviderService::SETTING_MAPPING_GROUPS, 'groups');
<               $groups = $idTokenPayload->{$groupsAttribute} ?? null;
<               $isadminAttribute = $this->providerService->getSetting($providerId, ProviderService::SETTING_MAPPING_ISADMIN, 'isadmin');
<               $isadmin = $idTokenPayload->{$isadminAttribute} ?? null;
542,609d523
<               }
<
<               // Update groups (create, delete the group or add/remove the user to/from the group)
<               // First, get the list of all groups this user is in, before any manipulation
<               $userGroups=$this->groupManager->getUserGroupIds($user);
<               $checkGroupAdmin = $this->providerService->getSetting($providerId, ProviderService::SETTING_CHECK_GROUPADMIN, '0') === '1';
<
<               // Treat each group the user is in
<               foreach ($groups as $group) {
<                       // Special admin group is managed by its specific attribute
<                       if ($group == 'admin' && !$checkGroupAdmin) continue;
<
<                       $event = new AttributeMappedEvent(ProviderService::SETTING_MAPPING_GROUPS, $idTokenPayload, $group);
<                       $this->eventDispatcher->dispatchTyped($event);
<                       $this->logger->debug("Group '$group' mapping event dispatched");
<                       if ($event->hasValue()) {
<                               if ($this->groupManager->groupExists($event->getValue())) {
<                                       $this->logger->debug('Group '.$event->getValue().' already exists');
<                                       if (! $this->groupManager->isInGroup($user->getUID(), $event->getValue())) {
<                                               $this->logger->debug('Adding user '.$user->getUID().' to group '.$event->getValue());
<                                               $groupItem = $this->groupManager->get($event->getValue());
<                                               $groupItem->addUser($user);
<                                       }   
<                               } else {
<                                       $this->logger->debug('Creating group '.$event->getValue());
<                                       $this->groupManager->createGroup($event->getValue());
<
<                                       $this->logger->debug('Adding user '.$user->getUID().' to group '.$event->getValue());
<                                       $groupItem = $this->groupManager->get($event->getValue());
<                                       $groupItem->addUser($user);
<                               }
<                       }
<                       // Remove from the userGroups list the one we just managed
<                       $userGroups = array_merge(array_diff($userGroups, array($event->getValue())));
<               }
<
<               // At this point, userGroups list contains only this user groups that he's not in anymore.
<               // If the group is empty, we can delete it (maybe add an option in the configuration webui for this feature)
<               foreach ($userGroups as $oldGroup) {
<                       $groupItem = $this->groupManager->get($oldGroup);
<                       $listUserGroup = $groupItem->getUsers();
<                       if ($oldGroup != 'admin' && count($listUserGroup) == 1 && isset($listUserGroup[$user->getUID()])) {
<                               $this->logger->debug("Deleting group $oldGroup because it's empty");
<                               $groupItem->delete();
<                       } else {
<                               $this->logger->debug("Removing user ".$user->getUID()." from group $oldGroup");
<                               $groupItem->removeUser($user);
<                       }
<               }
<
<               // Update admin group
<               if (!$checkGroupAdmin) {
<                       $event = new AttributeMappedEvent(ProviderService::SETTING_MAPPING_GROUPS, $idTokenPayload, strval($isadmin));
<                       $this->eventDispatcher->dispatchTyped($event);
<                       $this->logger->debug("isAdmin mapping event dispatched");
<                       // (boolean)json_decode(strtolower($string)) handles lots of possible variants
<                       // 'true'  => true  
<                       // 'True'  => true  
<                       // '1'     => true  
<                       // 'false' => false 
<                       // 'False' => false 
<                       // '0'     => false 
<                       // 'foo'   => false 
<                       // ''      => false 
<                       $isadminbln = (boolean)json_decode(strtolower($event->getValue()));
<                       if ($isadminbln) {  
<                               $this->groupManager->get("admin")->addUser($user);
<                       }
diff --suppress-common-lines -r apps/user_oidc/lib/Service/ProviderService.php user_oidc-1.2.1/lib/Service/ProviderService.php
44,46d43
<       public const SETTING_MAPPING_GROUPS = 'mappingGroups';
<       public const SETTING_CHECK_GROUPADMIN = 'checkGroupAdmin';
<       public const SETTING_MAPPING_ISADMIN = 'mappingIsAdmin';
53,54c50
<               self::SETTING_SEND_ID_TOKEN_HINT,
<               self::SETTING_CHECK_GROUPADMIN
---
>               self::SETTING_SEND_ID_TOKEN_HINT
137,139d132
<                       self::SETTING_MAPPING_GROUPS,
<                       self::SETTING_CHECK_GROUPADMIN,
<                       self::SETTING_MAPPING_ISADMIN,