HTM-1721: Group OIDC info moved from additionalProperties to oidcInfo (#1037)

Author: matthijsln

projects/admin-api/src/lib/models/group.model.ts

@@ -1,5 +1,10 @@
 import { AdditionalPropertyModel } from './additional-property.model';
 
+export interface GroupOidcInfoModel {
+  clientIds: string[];
+  lastSeenByClientId: { [clientId: string]: string };
+}
+
 export interface GroupModel {
   name: string;
   description?: string | null;
@@ -8,4 +13,5 @@ export interface GroupModel {
   systemGroup?: boolean;
   version?: number | null;
   additionalProperties?: AdditionalPropertyModel[];
+  oidcInfo?: GroupOidcInfoModel | null;
 }

projects/admin-core/src/lib/oidc/oidc-configuration-edit/oidc-configuration-edit.component.ts

@@ -61,20 +61,15 @@ export class OIDCConfigurationEditComponent implements OnInit, OnDestroy {
             return [];
           }
 
-          return groups.filter(group => {
-            const oidcClientIdsProperty = group?.additionalProperties?.find(value => value.key === 'oidcClientIds');
-            const oidcClientIds = oidcClientIdsProperty && Array.isArray(oidcClientIdsProperty.value) ? oidcClientIdsProperty.value as string[] : [];
-
-            return oidcClientIds.includes(oidcConfiguration.clientId);
-          }).map(group => {
-            const oidcLastSeenProperty = group?.additionalProperties?.find(value => value.key === 'oidcLastSeen');
-            const oidcLastSeen = oidcLastSeenProperty && typeof oidcLastSeenProperty.value === 'object' ? oidcLastSeenProperty.value as { [key: string]: string } : {};
-
-            return {
-              ...group,
-              lastSeen: oidcLastSeen[oidcConfiguration.clientId] ? new Date(oidcLastSeen[oidcConfiguration.clientId]) : null,
-            };
-          });
+          return groups.filter(group => group.oidcInfo?.clientIds.includes(oidcConfiguration.clientId))
+            .map(group => {
+              const lastSeenValue = group.oidcInfo?.lastSeenByClientId[oidcConfiguration.clientId];
+              const lastSeen = lastSeenValue ? new Date(lastSeenValue) : null;
+              return {
+                ...group,
+                lastSeen,
+              };
+            });
         }),
       );
   }

projects/admin-core/src/lib/user/group-form/group-form.component.ts

@@ -85,22 +85,18 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       combineLatest( [ this.groupSubject.asObservable(), this.oidcConfigurationService.getOIDCConfigurations$() ] ).pipe(
         takeUntil(this.destroyed),
         map(([ group, oidcConfigurations ]) => {
-          if (group == null) {
+          if (group == null || !group.oidcInfo || group.oidcInfo.clientIds.length === 0) {
             return [];
           }
-          const oidcClientIdsProperty = group?.additionalProperties?.find(value => value.key === 'oidcClientIds');
-          const oidcClientIds = oidcClientIdsProperty && Array.isArray(oidcClientIdsProperty.value) ? oidcClientIdsProperty.value as string[] : [];
-          const oidcLastSeenProperty = group?.additionalProperties?.find(value => value.key === 'oidcLastSeen');
-          const oidcLastSeen = oidcLastSeenProperty && typeof oidcLastSeenProperty.value === 'object' ? oidcLastSeenProperty.value as { [key: string]: string } : {};
-
-          return oidcConfigurations.filter(oidcConfiguration => {
-            return oidcClientIds.includes(oidcConfiguration.clientId);
-          }).map(oidcConfiguration => {
-            return {
-              ...oidcConfiguration,
-              lastSeen: oidcLastSeen[oidcConfiguration.clientId] ? new Date(oidcLastSeen[oidcConfiguration.clientId]) : null,
-            };
-          });
+          return oidcConfigurations.filter(oidcConfiguration => group.oidcInfo?.clientIds.includes(oidcConfiguration.clientId))
+            .map(oidcConfiguration => {
+              const lastSeenValue = group.oidcInfo?.lastSeenByClientId[oidcConfiguration.clientId];
+              const lastSeen = lastSeenValue ? new Date(lastSeenValue) : null;
+              return {
+                ...oidcConfiguration,
+                lastSeen,
+              };
+            });
         }),
       );
   }