API URL sets in CLient side

Atharva-System · May 1, 2023 · f7b1d61 · f7b1d61
1 parent 115a0c5
commit f7b1d61
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/src/Presentation/Client/Program.cs b/src/Presentation/Client/Program.cs
@@ -6,11 +6,10 @@
 global using BlazorEcommerce.Client.Services.ProductService;
 global using BlazorEcommerce.Client.Services.ProductTypeService;
 global using BlazorEcommerce.Shared;
-global using BlazorEcommerce.Shared.Response.Abstract;
-global using BlazorEcommerce.Shared.Response.Concrete;
 global using BlazorEcommerce.Shared.Cart;
-global using BlazorEcommerce.Shared.Product;
 global using BlazorEcommerce.Shared.Order;
+global using BlazorEcommerce.Shared.Product;
+global using BlazorEcommerce.Shared.Response.Concrete;
 global using System.Net.Http.Json;
 using BlazorEcommerce.Client;
 using Blazored.LocalStorage;
@@ -25,7 +24,9 @@
 
 builder.Services.AddBlazoredLocalStorage();
 builder.Services.AddMudServices();
-builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+var apiUrl = builder.Configuration.GetValue<string>("AppConfig:ApiUrl");
+builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(!string.IsNullOrEmpty(apiUrl) ? apiUrl : builder.HostEnvironment.BaseAddress) });
 builder.Services.AddScoped<IProductService, ProductService>();
 builder.Services.AddScoped<ICategoryService, CategoryService>();
 builder.Services.AddScoped<ICartService, CartService>();

diff --git a/src/Presentation/Client/wwwroot/appsettings.development.json b/src/Presentation/Client/wwwroot/appsettings.development.json
@@ -0,0 +1,5 @@
+{
+  "AppConfig": {
+    "ApiUrl": "https://localhost:7018"
+  }
+}
diff --git a/src/Presentation/Client/wwwroot/appsettings.json b/src/Presentation/Client/wwwroot/appsettings.json
@@ -0,0 +1,5 @@
+{
+  "AppConfig": {
+    "ApiUrl": "https://localhost:7018"
+  }
+}
diff --git a/src/Presentation/Server/Program.cs b/src/Presentation/Server/Program.cs
@@ -27,6 +27,13 @@
 
 builder.Services.AddHttpContextAccessor();
 
+builder.Services.AddCors(options =>
+{
+    options.AddPolicy("all", builder => builder.AllowAnyOrigin()
+    .AllowAnyHeader()
+    .AllowAnyMethod());
+});
+
 var app = builder.Build();
 
 // Initialise and seed the database
@@ -82,4 +89,6 @@
 app.MapControllers();
 app.MapFallbackToFile("index.html");
 
+app.UseCors("all");
+
 app.Run();
diff --git a/src/Presentation/Server/appsettings.json b/src/Presentation/Server/appsettings.json
@@ -2,9 +2,6 @@
   "ConnectionStrings": {
     "Default": "Data Source=.;Initial Catalog=blazorecommerce;Integrated Security=True;MultipleActiveResultSets=true;TrustServerCertificate=True"
   },
-  "AppSettings": {
-    "Token": "my top secret key"
-  },
   "JwtSettings": {
     "Key": "SECRET_JWT_KEY_HERE",
     "Issuer": "BlazorEcommerce.Api",