Add OrderBy top the First/FirstOrDefault operator.

Resolve #6179

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs

@@ -22,6 +22,7 @@ namespace Volo.Abp.IdentityServer.ApiResources
         {
             var query = from apiResource in DbSet.IncludeDetails(includeDetails)
                 where apiResource.Name == apiResourceName
+                orderby apiResource.Id
                 select apiResource;
 
             return await query.FirstOrDefaultAsync(GetCancellationToken(cancellationToken));

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiScopes/ApiScopeRepository.cs

@@ -28,6 +28,7 @@ namespace Volo.Abp.IdentityServer.ApiScopes
         {
             var query = from scope in DbSet.IncludeDetails(includeDetails)
                 where scopeNames.Contains(scope.Name)
+                orderby scope.Id
                 select scope;
 
             return await query.ToListAsync(GetCancellationToken(cancellationToken));

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Devices/DeviceFlowCodesRepository.cs

@@ -24,16 +24,19 @@ namespace Volo.Abp.IdentityServer.Devices
             CancellationToken cancellationToken = default)
         {
             return await DbSet
-                .FirstOrDefaultAsync(d => d.UserCode == userCode, GetCancellationToken(cancellationToken))
-                ;
+                .Where(d => d.UserCode == userCode)
+                .OrderBy(d => d.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<DeviceFlowCodes> FindByDeviceCodeAsync(
-            string deviceCode, 
+            string deviceCode,
             CancellationToken cancellationToken = default)
         {
             return await DbSet
-                .FirstOrDefaultAsync(d => d.DeviceCode == deviceCode, GetCancellationToken(cancellationToken));
+                .Where(d => d.DeviceCode == deviceCode)
+                .OrderBy(d => d.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<List<DeviceFlowCodes>> GetListByExpirationAsync(DateTime maxExpirationDate, int maxResultCount,

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Grants/PersistedGrantRepository.cs

@@ -29,7 +29,10 @@ namespace Volo.Abp.IdentityServer.Grants
             string key,
             CancellationToken cancellationToken = default)
         {
-            return await DbSet.FirstOrDefaultAsync(x => x.Key == key, GetCancellationToken(cancellationToken));
+            return await DbSet
+                .Where(x => x.Key == key)
+                .OrderBy(x => x.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<List<PersistedGrant>> GetListBySubjectIdAsync(

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceRepository.cs

@@ -57,6 +57,7 @@ namespace Volo.Abp.IdentityServer.IdentityResources
             return await DbSet
                 .IncludeDetails(includeDetails)
                 .Where(x => x.Name == name)
+                .OrderBy(x => x.Id)
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiResourceRepository.cs

@@ -23,6 +23,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
         {
             return await GetMongoQueryable()
                 .Where(ar => ar.Name == apiResourceName)
+                .OrderBy(ar => ar.Id)
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiScopeRepository.cs

@@ -22,7 +22,10 @@ namespace Volo.Abp.IdentityServer.MongoDB
 
         public async Task<ApiScope> GetByNameAsync(string scopeName, bool includeDetails = true, CancellationToken cancellationToken = default)
         {
-            return await GetMongoQueryable().FirstOrDefaultAsync(x => x.Name == scopeName, GetCancellationToken(cancellationToken));
+            return await GetMongoQueryable()
+                .Where(x => x.Name == scopeName)
+                .OrderBy(x => x.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public async Task<List<ApiScope>> GetListByNameAsync(string[] scopeNames, bool includeDetails = false,
@@ -30,6 +33,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
         {
             var query = from scope in GetMongoQueryable()
                 where scopeNames.Contains(scope.Name)
+                orderby scope.Id
                 select scope;
 
             return await query.ToListAsync(GetCancellationToken(cancellationToken));

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoClientRepository.cs

@@ -26,7 +26,10 @@ namespace Volo.Abp.IdentityServer.MongoDB
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
         {
-            return await GetMongoQueryable().FirstOrDefaultAsync(x => x.ClientId == clientId, GetCancellationToken(cancellationToken));
+            return await GetMongoQueryable()
+                .Where(x => x.ClientId == clientId)
+                .OrderBy(x => x.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<List<Client>> GetListAsync(

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoDeviceFlowCodesRepository.cs

@@ -24,18 +24,21 @@ namespace Volo.Abp.IdentityServer.MongoDB
             CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
-                .FirstOrDefaultAsync(d => d.UserCode == userCode, GetCancellationToken(cancellationToken))
-                ;
+                .Where(d => d.UserCode == userCode)
+                .OrderBy(x => x.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<DeviceFlowCodes> FindByDeviceCodeAsync(string deviceCode, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
-                .FirstOrDefaultAsync(d => d.DeviceCode == deviceCode, GetCancellationToken(cancellationToken));
+                .Where(d => d.DeviceCode == deviceCode)
+                .OrderBy(x => x.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<List<DeviceFlowCodes>> GetListByExpirationAsync(
-            DateTime maxExpirationDate, 
+            DateTime maxExpirationDate,
             int maxResultCount,
             CancellationToken cancellationToken = default)
         {
@@ -46,4 +49,4 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
     }
-}
+}

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoIdentityResourceRepository.cs

@@ -37,6 +37,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
         {
             return await GetMongoQueryable()
                 .Where(x => x.Name == name)
+                .OrderBy(x => x.Id)
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 

modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -27,9 +27,10 @@ namespace Volo.Abp.IdentityServer.MongoDB
 
         public virtual async Task<PersistedGrant> FindByKeyAsync(string key, CancellationToken cancellationToken = default)
         {
-
             return await GetMongoQueryable()
-                .FirstOrDefaultAsync(x => x.Key == key, GetCancellationToken(cancellationToken));
+                .Where(x => x.Key == key)
+                .OrderBy(x => x.Id)
+                .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
         public virtual async Task<List<PersistedGrant>> GetListBySubjectIdAsync(string subjectId, CancellationToken cancellationToken = default)