Fix bugs

Author: aorzelskiGH

src/AasSecurity/SecurityService.cs

@@ -376,14 +376,10 @@ private string GetAccessRole(NameValueCollection queries, NameValueCollection he
                 {
                     foreach (var securityRight in securityRights)
                     {
-                        //Email
-                        if (securityRight.Name.Contains('@'))
+                        if (user.Equals(securityRight.Name))
                         {
-                            if (user.Contains('@') && user.Equals(securityRight.Name))
-                            {
-                                accessRole = securityRight.Role;
-                                return accessRole;
-                            }
+                            accessRole = securityRight.Role;
+                            return accessRole;
                         }
                     }
 

src/AasxServerDB/EntityFrameworkPersistenceService.cs

@@ -2144,7 +2144,7 @@ private bool InitSecurity(ISecurityConfig? securityConfig, out Dictionary<string
         securityCondition = _contractSecurityRules.GetCondition(accessRole, neededRights.ToString(), tokenClaims: tokenClaims);
         accessRules = _contractSecurityRules.GetAccessRules(accessRole, neededRights.ToString(), tokenClaims: tokenClaims);
 
-        if (accessRules.Count != 0 && httpRoute != null)
+        if (accessRules?.Count != 0 && httpRoute != null)
         {
             authResult = _contractSecurityRules.AuthorizeRequest(accessRole, httpRoute, neededRights, out _, out _, out _, tokenClaims: tokenClaims);
         }

src/IO.Swagger.Registry.Lib.V3/Services/AasRegistryService.cs

@@ -78,8 +78,8 @@ public static AssetAdministrationShellDescriptor GlobalCreateAasDescriptorFromDB
                 // Submodels
                 // var submodelDBList = db.SMSets.Where(s => s.AASId == aasDB.Id);
                 var submodelRefDBList = db.SMRefSets.Where(s => s.AASId == aasDB.Id);
-                var smList = submodelRefDBList.Select(s => s.Id).ToList();
-                var submodelDBList = db.SMSets.Where(s => smList.Contains(s.Id));
+                var smList = submodelRefDBList.Select(s => s.Identifier).ToList();
+                var submodelDBList = db.SMSets.Where(s => smList.Contains(s.Identifier));
                 if (submodelDBList.Any())
                 {
                     ad.SubmodelDescriptors = new List<SubmodelDescriptor>();