refactor appsettings

Author: Comply5000

docker-compose.yml

@@ -2,23 +2,22 @@
 
 services:
   api:
-    image: skit
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: skitskni/api:latest
     depends_on: 
       - db
     ports:
       - '5000:80'
+    env_file:
+      - .env
 
   db:
     image: postgres
     ports:
       - '6000:5432'
-    environment: 
-      POSTGRES_DB: skit-database
-      POSTGRES_USER: skit-user
-      POSTGRES_PASSWORD: 1qazXSW@
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
       - postgres-data:/var/lib/postgresql/data
     depends_on:
@@ -32,8 +31,8 @@ services:
     volumes:
       - minio_data:/data
     environment:
-      - MINIO_ROOT_USER=admin
-      - MINIO_ROOT_PASSWORD=1qazXSW@
+      - MINIO_ROOT_USER=${S3Service__AccessKey}
+      - MINIO_ROOT_PASSWORD=${S3Service__SecretKey}
     command: server --console-address ":9001" --address ":9000" /data
 
 volumes:

skit.API/Program.cs

@@ -39,11 +39,11 @@
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
+//if (app.Environment.IsDevelopment())
+//{
     app.UseSwagger();
     app.UseSwaggerUI();
-}
+//}
 
 app.UseHttpsRedirection();
 app.UseRouting();

skit.API/appsettings.json

@@ -5,5 +5,36 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "ApplicationConfig": {
+    "APIUrl": "",
+    "ApplicationUrl": ""
+  },
+  "ConnectionStrings": {
+    "DatabaseConnection": ""
+  },
+  "Authentication": {
+    "JwtKey": "",
+    "JwtIssuer": "",
+    "Expires": "",
+    "RefreshTokenTTL": ""
+  },
+  "SMTP": {
+    "SmtpUrl": "",
+    "SmtpPort": "",
+    "SmtpLogin": "",
+    "SmtpPassword": "",
+    "SmtpSenderMail": "",
+    "SmtpSenderName": ""
+  },
+  "S3Service": {
+    "S3Url": "",
+    "AccessKey": "",
+    "SecretKey": "",
+    "BucketName": "",
+    "UrlExpires": ""
+  },
+  "GoogleAuth": {
+    "ClientId": "",
+    "ClientSecret": ""
+  }
 }

skitBackend.sln

@@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		docker-compose.yml = docker-compose.yml
 		Dockerfile = Dockerfile
 		.dockerignore = .dockerignore
+		.env = .env
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "skit.UnitTests", "skit.UnitTests\skit.UnitTests.csproj", "{CC7C66BF-EB32-4418-B791-717CE566E822}"