daily backup

recepgunes1 · Sep 4, 2023 · 1952ce7 · 1952ce7
1 parent 468dda9
commit 1952ce7
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 50 deletions.
diff --git a/internal-services.yml b/internal-services.yml
@@ -60,4 +60,3 @@ services:
       - apigateway
     networks:
       - fronted
-
diff --git a/src/Buffer/Infrastructure/Buffer.Infrastructure.csproj b/src/Buffer/Infrastructure/Buffer.Infrastructure.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Npgsql" Version="7.0.4" />
+	<PackageReference Include="Npgsql" Version="7.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Buffer/WebAPI/Program.cs b/src/Buffer/WebAPI/Program.cs
@@ -14,21 +14,29 @@
 
 builder.Services.AddSwaggerGen();
 
-var app = builder.Build();
+builder.Services.AddCors();
+
+ var app = builder.Build();
 
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-
     app.UseSwaggerUI();
 }
 
+app.Use(async (context, next) =>
+{
+    context.Request.EnableBuffering();
+    await next();
+});
+
 app.UseRouting();
 
-app.Use((context, next) =>
+app.UseCors(p =>
 {
-    context.Request.EnableBuffering();
-    return next();
+    p.AllowAnyOrigin()
+    .AllowAnyMethod()
+    .AllowAnyHeader();
 });
 
 app.MapControllers();

diff --git a/src/ExpiryChecker/WebAPI/Program.cs b/src/ExpiryChecker/WebAPI/Program.cs
@@ -8,8 +8,23 @@
 
 builder.Services.LoadInfrastructureLayer(builder.Configuration);
 
+builder.Services.AddCors();
+
 var app = builder.Build();
 
+app.Use(async (context, next) =>
+{
+    context.Request.EnableBuffering();
+    await next();
+});
+
 app.UseRouting();
 
+app.UseCors(p =>
+{
+    p.AllowAnyOrigin()
+    .AllowAnyMethod()
+    .AllowAnyHeader();
+});
+
 app.Run();
diff --git a/src/Fronted/webui/Dockerfile b/src/Fronted/webui/Dockerfile
@@ -22,7 +22,7 @@ FROM nginx:1.25-alpine
 
 # Copy the built Vue application from the build-stage
 COPY --from=build-stage /app/dist /usr/share/nginx/html
-
+COPY production_nginx.conf /etc/nginx/conf.d/default.conf
 # Expose port 80
 EXPOSE 80
 

diff --git a/src/Fronted/webui/production_nginx.conf b/src/Fronted/webui/production_nginx.conf
@@ -0,0 +1,31 @@
+server {
+    listen 80;
+    server_name _;
+
+    location / {
+        root /usr/share/nginx/html;
+        index index.html;
+        try_files $uri $uri/ /index.html;
+
+        # Preflight request
+        if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Origin' '*';
+            add_header 'Access-Control-Allow-Methods' '*';
+            add_header 'Access-Control-Allow-Headers' '*';
+            add_header 'Access-Control-Max-Age' 1728000;
+            add_header 'Content-Type' 'text/plain; charset=utf-8';
+            add_header 'Content-Length' 0;
+            return 204;
+        }
+
+        # Regular requests
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' '*';
+        add_header 'Access-Control-Allow-Headers' '*';
+    }
+
+    error_page  404              /404.html;
+    location = /404.html {
+        root   /usr/share/nginx/html;
+    }
+}
diff --git a/src/Fronted/webui/src/App.vue b/src/Fronted/webui/src/App.vue
@@ -41,12 +41,7 @@ export default defineComponent({
     const urls = ref([]);
 
     axios
-      .get(`${process.env.VUE_APP_API_GATEWAY_URL}/get_all_urls`, {
-        headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Credentials": true,
-        },
-      })
+      .get(`${process.env.VUE_APP_API_GATEWAY_URL}/get_all_urls`)
       .then((response) => {
         urls.value = response.data;
       });

diff --git a/src/Fronted/webui/src/components/SearchBar.vue b/src/Fronted/webui/src/components/SearchBar.vue
@@ -51,24 +51,14 @@ export default defineComponent({
         .get(
           `${process.env.VUE_APP_API_GATEWAY_URL}/get_url/${encodeURIComponent(
             input
-          )}`,
-          {
-            headers: {
-              "Access-Control-Allow-Origin": "*",
-              "Access-Control-Allow-Credentials": true,
-            },
-          }
+          )}`
         )
         .then((response) => {
           this.url = response.data;
           if (this.url && this.url.longUrl == null) {
             return axios.post(
               `${process.env.VUE_APP_API_GATEWAY_URL}/publish_url`,
               {
-                headers: {
-                  "Access-Control-Allow-Origin": "*",
-                  "Access-Control-Allow-Credentials": true,
-                },
                 Url: input,
                 ExpireDate: this.$store.state.number,
                 IsPublic: this.$store.state.isPublic,
@@ -85,13 +75,7 @@ export default defineComponent({
                 .get(
                   `${
                     process.env.VUE_APP_API_GATEWAY_URL
-                  }/get_url/${encodeURIComponent(input)}`,
-                  {
-                    headers: {
-                      "Access-Control-Allow-Origin": "*",
-                      "Access-Control-Allow-Credentials": true,
-                    },
-                  }
+                  }/get_url/${encodeURIComponent(input)}`
                 )
                 .then((final_response) => {
                   this.url = final_response.data;

diff --git a/src/Gateway/Gateway.Infrastructure/Extensions/InfrastructureLayerExtensions.cs b/src/Gateway/Gateway.Infrastructure/Extensions/InfrastructureLayerExtensions.cs
@@ -8,17 +8,6 @@ public static class InfrastructureLayerExtensions
     {
         public static IServiceCollection LoadInfrastructreLayer(this IServiceCollection service, IConfiguration configuration)
         {
-            service.AddCors(options =>
-            {
-                options.AddPolicy("VueCorsPolicy", builder =>
-                {
-                    builder
-                        .AllowAnyOrigin()
-                        .AllowAnyMethod()
-                        .AllowAnyHeader()
-                        .AllowCredentials();
-                });
-            });
 
             var tempConfiguration = new ConfigurationBuilder()
                 .AddConfiguration(configuration)
@@ -28,7 +17,7 @@ public static IServiceCollection LoadInfrastructreLayer(this IServiceCollection
                 .Build();
 
             service.AddOcelot(tempConfiguration);
-            
+
             return service;
         }
     }

diff --git a/src/Gateway/Gateway.WebAPI/Program.cs b/src/Gateway/Gateway.WebAPI/Program.cs
@@ -9,9 +9,16 @@
 
 builder.Services.LoadInfrastructreLayer(builder.Configuration);
 
+builder.Services.AddCors();
+
 var app = builder.Build();
 
-app.UseCors("VueCorsPolicy");
+app.UseCors(p =>
+{
+    p.AllowAnyOrigin()
+    .AllowAnyMethod()
+    .AllowAnyHeader();
+});
 
 await app.UseOcelot();
 

diff --git a/src/Shortener/WebAPI/Program.cs b/src/Shortener/WebAPI/Program.cs
@@ -14,21 +14,29 @@
 
 builder.Services.AddSwaggerGen();
 
+builder.Services.AddCors();
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-
     app.UseSwaggerUI();
 }
 
+app.Use(async (context, next) =>
+{
+    context.Request.EnableBuffering();
+    await next();
+});
+
 app.UseRouting();
 
-app.Use((context, next) =>
+app.UseCors(p =>
 {
-    context.Request.EnableBuffering();
-    return next();
+    p.AllowAnyOrigin()
+    .AllowAnyMethod()
+    .AllowAnyHeader();
 });
 
 app.MapControllers();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,4 +60,3 @@ services:
		- apigateway
		networks:
		- fronted