Added an authenticated controller action. Docker-ized.

crowcoder · crowcoder · commit f47fbe7ef47f · 2019-12-28T11:05:27.000-05:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/PostmanDelivers.API/.config/dotnet-tools.json b/PostmanDelivers.API/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "3.1.0",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
diff --git a/PostmanDelivers.API/Controllers/EchoController.cs b/PostmanDelivers.API/Controllers/EchoController.cs
@@ -1,5 +1,7 @@
 ﻿using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
+using System;
 using System.Collections.Generic;
 
 namespace PostmanDelivers.API.Controllers
@@ -8,11 +10,17 @@ namespace PostmanDelivers.API.Controllers
     [ApiController]
     public class EchoController : ControllerBase
     {
+        IConfiguration _config;
+        public EchoController(IConfiguration config)
+        {
+            _config = config;
+        }
+
         [HttpPost]
-        [Authorize]
         [Consumes("application/x-www-form-urlencoded")]
         public ActionResult Post([FromForm] Dictionary<string, string> stringsToEcho)
         {
+            stringsToEcho.Add("env", _config.GetValue<string>("APP_ENVIRONMENT") ?? "No environment configured");
             return Ok(stringsToEcho);
         }
     }
diff --git a/PostmanDelivers.API/Controllers/GameController.cs b/PostmanDelivers.API/Controllers/GameController.cs
@@ -1,4 +1,5 @@
-﻿using Microsoft.AspNetCore.Mvc;
+﻿using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using System.Collections.Generic;
 using TikTakToe.Engine;
@@ -16,7 +17,7 @@ public GameController(IConfiguration config)
         }
 
         [HttpPost]
-        public ActionResult<Game> Post(string[] playerNames)
+        public ActionResult<Game> Post([FromBody]string[] playerNames)
         {
             try
             {
@@ -32,6 +33,7 @@ public ActionResult<Game> Post(string[] playerNames)
         }
 
         [HttpDelete]
+        [Authorize]
         [Route("{id:int}")]
         public ActionResult Delete(int id)
         {
diff --git a/PostmanDelivers.API/Dockerfile b/PostmanDelivers.API/Dockerfile
@@ -0,0 +1,23 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/core/sdk:2.2-stretch AS build
+WORKDIR /src
+COPY ["PostmanDelivers.API/PostmanDelivers.API.csproj", "PostmanDelivers.API/"]
+COPY ["TikTakToe.Engine/TikTakToe.Engine.csproj", "TikTakToe.Engine/"]
+RUN dotnet restore "PostmanDelivers.API/PostmanDelivers.API.csproj"
+COPY . .
+WORKDIR "/src/PostmanDelivers.API"
+RUN dotnet build "PostmanDelivers.API.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "PostmanDelivers.API.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "PostmanDelivers.API.dll"]
diff --git a/PostmanDelivers.API/PostmanDelivers.API.csproj b/PostmanDelivers.API/PostmanDelivers.API.csproj
@@ -4,17 +4,25 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <UserSecretsId>44bf9484-c87a-4a81-a5dd-b74cfa9ba5b7</UserSecretsId>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\TikTakToe.Engine\TikTakToe.Engine.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="data\GameDB.sqlite3">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/PostmanDelivers.API/Properties/launchSettings.json b/PostmanDelivers.API/Properties/launchSettings.json
@@ -21,9 +21,16 @@
       "commandName": "Project",
       "launchUrl": "api/values",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "APP_ENVIRONMENT": "Debug"
       },
       "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",
+      "publishAllPorts": true,
+      "useSSL": true
     }
   }
 }
diff --git a/PostmanDelivers.API/appsettings.json b/PostmanDelivers.API/appsettings.json
@@ -5,5 +5,5 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStr": "Data Source=C:\\ProgramData\\postmandeliversdata\\GameDB.sqlite3;Version=3;"
+  "ConnectionStr": "Data Source=data/GameDB.sqlite3;Version=3;"
 }
diff --git a/PostmanDelivers.API/data/GameDB.sqlite3 b/PostmanDelivers.API/data/GameDB.sqlite3
diff --git a/PostmanDelivers.sln b/PostmanDelivers.sln
@@ -11,8 +11,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		CustomScript.js = CustomScript.js
+		data.json = data.json
 		Database.sql = Database.sql
 		Echo.postman_collection.json = Echo.postman_collection.json
+		newman_script.txt = newman_script.txt
 		Postman Delivers.postman_globals.json = Postman Delivers.postman_globals.json
 		PostmandDelivers Azure.postman_environment.json = PostmandDelivers Azure.postman_environment.json
 		PostmandDelivers HTTPS.postman_environment.json = PostmandDelivers HTTPS.postman_environment.json
diff --git a/PostmandDelivers HTTPS.postman_environment.json b/PostmandDelivers HTTPS.postman_environment.json
@@ -4,7 +4,7 @@
 	"values": [
 		{
 			"key": "baseurl",
-			"value": "https://localhost:5001",
+			"value": "https://localhost:5001/api",
 			"enabled": true
 		},
 		{
diff --git a/data.json b/data.json
@@ -0,0 +1,42 @@
+[
+  {
+    "move_one": 1,
+    "move_two": 2,
+    "move_three": 3,
+    "move_four": 4,
+    "move_five": 5,
+    "move_six": 6
+  },
+  {
+    "move_one": 6,
+    "move_two": 7,
+    "move_three": 4,
+    "move_four": 3,
+    "move_five": 2,
+    "move_six": 1
+  },
+  {
+    "move_one": 1,
+    "move_two": 2,
+    "move_three": 7,
+    "move_four": 4,
+    "move_five": 5,
+    "move_six": 6
+  },
+  {
+    "move_one": 1,
+    "move_two": 2,
+    "move_three": 3,
+    "move_four": 8,
+    "move_five": 8,
+    "move_six": 6
+  },
+  {
+    "move_one": 1,
+    "move_two": 0,
+    "move_three": 10,
+    "move_four": 40,
+    "move_five": 50,
+    "move_six": 16
+  }
+]
diff --git a/newman_script.txt b/newman_script.txt
@@ -0,0 +1 @@
+newman run "X Wins With Tests.postman_collection.json" -e "PostmandDelivers HTTPS.postman_environment.json" --insecure

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Microsoft.AspNetCore.Mvc;`
	`1`	`+using Microsoft.AspNetCore.Authorization;`
	`2`	`+using Microsoft.AspNetCore.Mvc;`
`2`	`3`	`using Microsoft.Extensions.Configuration;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`	`using TikTakToe.Engine;`
`@@ -16,7 +17,7 @@ public GameController(IConfiguration config)`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`[HttpPost]`
`19`		`- public ActionResult<Game> Post(string[] playerNames)`
	`20`	`+ public ActionResult<Game> Post([FromBody]string[] playerNames)`
`20`	`21`	`{`
`21`	`22`	`try`
`22`	`23`	`{`
`@@ -32,6 +33,7 @@ public ActionResult<Game> Post(string[] playerNames)`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`[HttpDelete]`
	`36`	`+ [Authorize]`
`35`	`37`	`[Route("{id:int}")]`
`36`	`38`	`public ActionResult Delete(int id)`
`37`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,16 @@`
`21`	`21`	`"commandName": "Project",`
`22`	`22`	`"launchUrl": "api/values",`
`23`	`23`	`"environmentVariables": {`
`24`		`- "ASPNETCORE_ENVIRONMENT": "Development"`
	`24`	`+ "ASPNETCORE_ENVIRONMENT": "Development",`
	`25`	`+ "APP_ENVIRONMENT": "Debug"`
`25`	`26`	`},`
`26`	`27`	`"applicationUrl": "https://localhost:5001;http://localhost:5000"`
	`28`	`+ },`
	`29`	`+ "Docker": {`
	`30`	`+ "commandName": "Docker",`
	`31`	`+ "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values",`
	`32`	`+ "publishAllPorts": true,`
	`33`	`+ "useSSL": true`
`27`	`34`	`}`
`28`	`35`	`}`
`29`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`}`
`6`	`6`	`},`
`7`	`7`	`"AllowedHosts": "*",`
`8`		`- "ConnectionStr": "Data Source=C:\\ProgramData\\postmandeliversdata\\GameDB.sqlite3;Version=3;"`
	`8`	`+ "ConnectionStr": "Data Source=data/GameDB.sqlite3;Version=3;"`
`9`	`9`	`}`