Merge pull request #65 from Macro-Deck-App/develop

Develop
Macro-Deck-App · Aug 11, 2023 · c2790ae · c2790ae
2 parents 82dcfe9 + 7c5bee2
commit c2790ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/ExtensionStoreAPI.Core/DataTypes/Response/PagedList.cs b/src/ExtensionStoreAPI.Core/DataTypes/Response/PagedList.cs
@@ -19,10 +19,10 @@ private PagedList(List<T> items, int page, int pageSize, int totalItems)
 
     public static async ValueTask<PagedList<T>> CreatePagedListAsync(IQueryable<T> query, int page, int pageSize)
     {
-        query = query.Skip((page - 1) * pageSize).Take(pageSize);
-
-        var items = await query.ToListAsync();
         var totalItems = await query.CountAsync();
+        var items = await query.Skip((page - 1) * pageSize)
+            .Take(pageSize)
+            .ToListAsync();
 
         return new PagedList<T>(items, page, pageSize, totalItems);
     }

diff --git a/src/ExtensionStoreAPI/Startup.cs b/src/ExtensionStoreAPI/Startup.cs
@@ -21,6 +21,16 @@ public void ConfigureServices(IServiceCollection services)
         services.AddScoped<IGitHubRepositoryService, GitHubRepositoryService>();
         services.AddEndpointsApiExplorer();
         services.AddSwagger();
+        services.AddCors(options =>
+        {
+            options.AddPolicy("AllowAny",
+                builder =>
+                {
+                    builder.AllowAnyOrigin()
+                        .AllowAnyMethod()
+                        .AllowAnyHeader();
+                });
+        });
         services.AddControllers()
             .AddJsonOptions(opt =>
             {