fix(identity): change identity service to scoped (#370)

Refs: CPLP-3102
eclipse-tractusx · Dec 4, 2023 · e4a9057 · e4a9057
1 parent 64b36a0
commit e4a9057
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...amework.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs b/...amework.ProcessIdentity/DependencyInjection/ProcessIdentityServiceCollectionExtensions.cs
@@ -44,7 +44,7 @@ public static IServiceCollection AddConfigurationIdentityService(this IServiceCo
             .ValidateOnStart();
 
         return services
-            .AddTransient<IIdentityIdDetermination, ConfigurationIdentityIdDetermination>()
-            .AddTransient<IIdentityService, IdentityService>();
+            .AddScoped<IIdentityIdDetermination, ConfigurationIdentityIdDetermination>()
+            .AddScoped<IIdentityService, IdentityService>();
     }
 }
diff --git a/src/framework/Framework.Web/ClaimsIdentityServiceCollectionExtensions.cs b/src/framework/Framework.Web/ClaimsIdentityServiceCollectionExtensions.cs
@@ -29,6 +29,6 @@ public static IServiceCollection AddClaimsIdentityIdDetermination(this IServiceC
     {
         return services
             .AddScoped<IIdentityIdDetermination, ClaimsIdentityIdDetermination>()
-            .AddTransient<IIdentityService, IdentityService>();
+            .AddScoped<IIdentityService, IdentityService>();
     }
 }
diff --git a/src/portalbackend/PortalBackend.DBAccess/Identities/IdentityService.cs b/src/portalbackend/PortalBackend.DBAccess/Identities/IdentityService.cs
@@ -37,7 +37,9 @@ public IdentityService(IPortalRepositories portalRepositories, IIdentityIdDeterm
 
     /// <inheritdoc />
     public async ValueTask<IdentityData> GetIdentityData() =>
-        _identityData ??= await _identityRepository.GetActiveIdentityDataByIdentityId(IdentityId).ConfigureAwait(false) ?? throw new ConflictException($"Identity {_identityIdDetermination.IdentityId} could not be found");
+        _identityData ?? (_identityData =
+            await _identityRepository.GetActiveIdentityDataByIdentityId(IdentityId).ConfigureAwait(false) ??
+            throw new ConflictException($"Identity {_identityIdDetermination.IdentityId} could not be found"));
 
     public IdentityData IdentityData => _identityData ?? throw new UnexpectedConditionException("identityData should never be null here (endpoint must be annotated with an identity policy / as an alternative GetIdentityData should be used)");