Improving project templates (#229)

- Adding more case tests - Fixing the weird namespaces inside namespaces in Startup.cs and controllers - removing a wrong .AddMicrosoftIdentityUi() call in a startup.cs for mvc2 project templates
AzureAD · Jun 22, 2020 · be99a87 · be99a87
1 parent 2e68423
commit be99a87
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 78 deletions.
diff --git a/ProjectTemplates/templates/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs b/ProjectTemplates/templates/RazorPagesWeb-CSharp/Pages/Index.cshtml.cs
@@ -7,6 +7,7 @@
 using Microsoft.Identity.Web;
 using System.Net;
 using System.Net.Http;
+using Company.WebApplication1.Services;
 #endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -15,8 +16,6 @@
 namespace Company.WebApplication1.Pages
 {
 #if (GenerateApi)
-    using Services;
-
     [AuthorizeForScopes(ScopeKeySection = "CalledApi:CalledApiScopes")]
 #endif 
     public class IndexModel : PageModel

diff --git a/ProjectTemplates/templates/RazorPagesWeb-CSharp/Startup.cs b/ProjectTemplates/templates/RazorPagesWeb-CSharp/Startup.cs
@@ -41,13 +41,12 @@
 #if(MultiOrgAuth)
 using Microsoft.IdentityModel.Tokens;
 #endif
-
-namespace Company.WebApplication1
-{
 #if (GenerateApi)
-    using Services;
+using Company.WebApplication1.Services;
 #endif
 
+namespace Company.WebApplication1
+{
     public class Startup
     {
         public Startup(IConfiguration configuration)
@@ -100,8 +99,7 @@ public void ConfigureServices(IServiceCollection services)
                 options.Filters.Add(new AuthorizeFilter(policy));
             }).AddMicrosoftIdentityUI();
 #else
-            services.AddRazorPages()
-                    .AddMicrosoftIdentityUI();
+            services.AddRazorPages();
 #endif
         }
 

diff --git a/ProjectTemplates/templates/StarterWeb-CSharp/Controllers/HomeController.cs b/ProjectTemplates/templates/StarterWeb-CSharp/Controllers/HomeController.cs
@@ -11,17 +11,14 @@
 using Microsoft.Identity.Web;
 using System.Net;
 using System.Net.Http;
+using Company.WebApplication1.Services;
 #endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Company.WebApplication1.Models;
 
 namespace Company.WebApplication1.Controllers
 {
-#if (GenerateApi)
-    using Services;
-
-#endif 
 #if (OrganizationalAuth)
     [Authorize]
 #endif

diff --git a/ProjectTemplates/templates/StarterWeb-CSharp/Startup.cs b/ProjectTemplates/templates/StarterWeb-CSharp/Startup.cs
@@ -41,13 +41,12 @@
 #if(MultiOrgAuth)
 using Microsoft.IdentityModel.Tokens;
 #endif
-
-namespace Company.WebApplication1
-{
 #if (GenerateApi)
-    using Services;
+using Company.WebApplication1.Services;
 #endif
 
+namespace Company.WebApplication1
+{
     public class Startup
     {
         public Startup(IConfiguration configuration)

diff --git a/ProjectTemplates/templates/WebApi-CSharp/Controllers/WeatherForecastController.cs b/ProjectTemplates/templates/WebApi-CSharp/Controllers/WeatherForecastController.cs
@@ -10,17 +10,13 @@
 using Microsoft.Identity.Web;
 using System.Net;
 using System.Net.Http;
+using Company.WebApplication1.Services;
 #endif
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Identity.Web.Resource;
 using Microsoft.Extensions.Logging;
-
 namespace Company.WebApplication1.Controllers
 {
-#if (GenerateApi)
-    using Services;
-
-#endif 
 #if (!NoAuth)
     [Authorize]
 #endif

diff --git a/ProjectTemplates/templates/WebApi-CSharp/Startup.cs b/ProjectTemplates/templates/WebApi-CSharp/Startup.cs
@@ -24,13 +24,12 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+#if (GenerateApi)
+using Company.WebApplication1.Services;
+#endif
 
 namespace Company.WebApplication1
 {
-#if (GenerateApi)
-    using Services;
-
-#endif
     public class Startup
     {
         public Startup(IConfiguration configuration)

diff --git a/ProjectTemplates/test-templates.bat b/ProjectTemplates/test-templates.bat
@@ -8,6 +8,28 @@ echo "Test templates"
 mkdir tests
 cd tests
 
+echo " Test Web app (No Auth)"
+mkdir webapp-noauth
+cd webapp-noauth
+dotnet new webapp2
+dotnet build
+cd ..
+
+echo " Test Web app (No Auth)"
+mkdir mvcwebapp-noauth
+cd mvcwebapp-noauth
+dotnet new mvc2
+dotnet build
+cd ..
+
+echo " Test Web API (No auth)"
+mkdir webapi-noauth
+cd webapi-noauth
+dotnet new webapi2
+dotnet build
+cd ..
+
+
 echo " Test Web app (Microsoft identity platform, MVC, Single Org)"
 mkdir mvcwebapp
 cd mvcwebapp
@@ -51,7 +73,6 @@ dotnet new mvc2 --auth  IndividualB2C --called-api-url "https://localhost:44332"
 dotnet build
 cd ..
 
-
 echo " Test Web app (Microsoft identity platform, Razor, Single Org)"
 mkdir webapp
 cd webapp
@@ -73,7 +94,6 @@ dotnet new webapp2 --auth  IndividualB2C
 dotnet build
 cd ..
 
-
 echo " Test Web app calling Web API  (Microsoft identity platform, Razor, Single Org)"
 mkdir webapp-api
 cd webapp-api

diff --git a/ProjectTemplates/test-templates.sh b/ProjectTemplates/test-templates.sh