Revize 88d5dda9

docker-compose.yml testing CORS

Backend/Backend/Program.cs

@@ -33 +33 @@
         new OpenApiInfo {Title = "AnnotationTool", Description = "KIV/ASWI ZČU Plzeň, 2022", Version = "0.1.1"});
 });
 
+
+builder.Services.AddCors();
+
 // JWT authentication
 var tokenValidationParams = JwtUtils.GetTokenValidationParameters(builder.Configuration);
 builder.Services.AddSingleton(tokenValidationParams);
@@ -73 +76 @@
     app.UseSwaggerUI();
 }
 
-app.UseHttpsRedirection();
+//app.UseHttpsRedirection();
 
 // CORS
-app.UseCors(x => x.WithOrigins(
-        "http://localhost",
-        "https://localhost:3000",
-        "http://localhost:3000",
-        "http://localhost:5007",
-        "https://annotation.vlc3k.com")
-    .SetIsOriginAllowedToAllowWildcardSubdomains()
-    .AllowAnyHeader()
-    .AllowAnyMethod()
-    .AllowCredentials());
+app.UseCors(builder => builder
+                .AllowAnyHeader()
+                .AllowAnyMethod()
+                .SetIsOriginAllowed(_ => true)
+                .AllowCredentials()
+            );
+
 
 // JWT Authentication
 app.UseMiddleware<JwtMiddleware>();
@@ -97 +97 @@
 
 // Logging
 app.UseSerilogRequestLogging();
-app.Logger.LogInformation("Starting up");
+app.Logger.LogInformation("Starting up with CORS.....");
 
 // Database seeding
 using (var scope = app.Services.CreateScope())

docker-compose.yml

@@ -9 +9 @@
     ports:
       - '5432:5432'
     environment:
-      - POSTGRES_DB=annotool
+      - POSTGRES_DB=annotool-db
       - POSTGRES_USER=root
       - POSTGRES_PASSWORD=HEun3RGgEYwknRuk4adh4ZKW
       - PGDATA=/var/lib/postgresql/data/pgdata
@@ -22 +22 @@
       context: ./Backend
     ports:
       - '7241:7241'
+      - '5241:5241'
     environment:
-      - ConnectionString=Host=annotool-db:5432;Database=annotool;Username=root;Password=HEun3RGgEYwknRuk4adh4ZKW
+      - ConnectionString=Host=annotool-db:5432;Database=annotool-db;Username=root;Password=HEun3RGgEYwknRuk4adh4ZKW
     depends_on:
       - db
 
@@ -32 +33 @@
     build:
       dockerfile: ./Dockerfile
       context: ./webapp
+    environment:
+      - ASWI_APP_BACKEND_URL=http://localhost:5241
     ports:
       - '5000:5000'