Merge branch 'dev' into main

damienbod · Nov 8, 2020 · f641f91 · f641f91
2 parents d0a23fd + 5e74f6e
commit f641f91
Show file tree

Hide file tree

Showing 69 changed files with 12 additions and 1 deletion.
diff --git a/AspNetCoreHybridFlow.sln b/AspNetCoreHybridFlow.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StsServerIdentity", "StsSer
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApi", "WebApi\WebApi.csproj", "{AB31E1B1-F103-4A8B-BE79-1966C57C319A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHybridClient", "WebMVCClient\WebHybridClient.csproj", "{5A1E5B5D-4CE7-439E-938A-DA9937091586}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebHybridFlowClient", "WebHybridFlowClient\WebHybridFlowClient.csproj", "{5A1E5B5D-4CE7-439E-938A-DA9937091586}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{038CF360-14D7-4AF0-8BA9-5FF422D3CC7E}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/WebMVCClient/ApiService.cs → WebHybridFlowClient/ApiService.cs b/WebMVCClient/ApiService.cs → WebHybridFlowClient/ApiService.cs
diff --git a/WebMVCClient/ApiTokenCacheClient.cs → WebHybridFlowClient/ApiTokenCacheClient.cs b/WebMVCClient/ApiTokenCacheClient.cs → WebHybridFlowClient/ApiTokenCacheClient.cs
diff --git a/WebMVCClient/ApiTokenInMemoryClient.cs → ...ybridFlowClient/ApiTokenInMemoryClient.cs b/WebMVCClient/ApiTokenInMemoryClient.cs → ...ybridFlowClient/ApiTokenInMemoryClient.cs
diff --git a/WebMVCClient/AuthConfigurations.cs → WebHybridFlowClient/AuthConfigurations.cs b/WebMVCClient/AuthConfigurations.cs → WebHybridFlowClient/AuthConfigurations.cs
diff --git a/WebMVCClient/Controllers/HomeController.cs → ...dFlowClient/Controllers/HomeController.cs b/WebMVCClient/Controllers/HomeController.cs → ...dFlowClient/Controllers/HomeController.cs
diff --git a/WebMVCClient/Controllers/TestController.cs → ...dFlowClient/Controllers/TestController.cs b/WebMVCClient/Controllers/TestController.cs → ...dFlowClient/Controllers/TestController.cs
diff --git a/WebMVCClient/MissingSecurityHeaders.cs → ...ybridFlowClient/MissingSecurityHeaders.cs b/WebMVCClient/MissingSecurityHeaders.cs → ...ybridFlowClient/MissingSecurityHeaders.cs
diff --git a/WebMVCClient/Models/ErrorViewModel.cs → WebHybridFlowClient/Models/ErrorViewModel.cs b/WebMVCClient/Models/ErrorViewModel.cs → WebHybridFlowClient/Models/ErrorViewModel.cs
diff --git a/WebMVCClient/Program.cs → WebHybridFlowClient/Program.cs b/WebMVCClient/Program.cs → WebHybridFlowClient/Program.cs
diff --git a/...aders-webhybridclient - Web Deploy.pubxml → ...aders-webhybridclient - Web Deploy.pubxml b/...aders-webhybridclient - Web Deploy.pubxml → ...aders-webhybridclient - Web Deploy.pubxml
diff --git a/...ient/Properties/PublishProfiles/security-headers-webhybridclient - Web Deploy.pubxml.user b/...ient/Properties/PublishProfiles/security-headers-webhybridclient - Web Deploy.pubxml.user
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <TimeStampOfAssociatedLegacyPublishXmlFile />
+    <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA1APQrvh86kG63cjwRBZPmgAAAAACAAAAAAAQZgAAAAEAACAAAAALMFgjnPmL0aKTAwB2iOMNJSznZGsMGeTSBX7fcMxCYwAAAAAOgAAAAAIAACAAAACowRzhGYKrRYs2tgxT9zMw+G0eXyDjWGFmIp33Xq7/cYAAAAB/xoxctb8dwrq7P/i0e6Hgfv8Lzo6y+rHHVIpKZwHwstZF2acReBax8gbmWno3NQccmymC7CktrRJXCsLCp0jbXKFYrbZgxKoOHMuahdUgAgv6Q4RwGsKx+UCc2dZGcHoLRfXk/QSoaqwWeU1IHky2MoEzGR1SmiLzs1qFd5pZpUAAAAC4hc7FRb59l9/IlmEc6a1zz0sEK2y4Coj9waCwS11Jg/3MidFUA5Nu+1vrZklhasQM4bfG+yBLhDmLcyJ7XGuu</EncryptedPassword>
+  </PropertyGroup>
+</Project>
diff --git a/WebMVCClient/Properties/launchSettings.json → ...FlowClient/Properties/launchSettings.json b/WebMVCClient/Properties/launchSettings.json → ...FlowClient/Properties/launchSettings.json
diff --git a/WebMVCClient/Startup.cs → WebHybridFlowClient/Startup.cs b/WebMVCClient/Startup.cs → WebHybridFlowClient/Startup.cs
diff --git a/WebMVCClient/Views/Home/Index.cshtml → WebHybridFlowClient/Views/Home/Index.cshtml b/WebMVCClient/Views/Home/Index.cshtml → WebHybridFlowClient/Views/Home/Index.cshtml
diff --git a/WebMVCClient/Views/Shared/Error.cshtml → ...ybridFlowClient/Views/Shared/Error.cshtml b/WebMVCClient/Views/Shared/Error.cshtml → ...ybridFlowClient/Views/Shared/Error.cshtml
diff --git a/WebMVCClient/Views/Shared/_Layout.cshtml → ...ridFlowClient/Views/Shared/_Layout.cshtml b/WebMVCClient/Views/Shared/_Layout.cshtml → ...ridFlowClient/Views/Shared/_Layout.cshtml
diff --git a/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml b/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml
diff --git a/WebMVCClient/Views/Status/Test.cshtml → WebHybridFlowClient/Views/Status/Test.cshtml b/WebMVCClient/Views/Status/Test.cshtml → WebHybridFlowClient/Views/Status/Test.cshtml
diff --git a/WebMVCClient/Views/_ViewImports.cshtml → ...ybridFlowClient/Views/_ViewImports.cshtml b/WebMVCClient/Views/_ViewImports.cshtml → ...ybridFlowClient/Views/_ViewImports.cshtml
diff --git a/WebMVCClient/Views/_ViewStart.cshtml → WebHybridFlowClient/Views/_ViewStart.cshtml b/WebMVCClient/Views/_ViewStart.cshtml → WebHybridFlowClient/Views/_ViewStart.cshtml
diff --git a/WebMVCClient/WebHybridClient.csproj → ...bridFlowClient/WebHybridFlowClient.csproj b/WebMVCClient/WebHybridClient.csproj → ...bridFlowClient/WebHybridFlowClient.csproj
diff --git a/WebMVCClient/appsettings.Development.json → ...idFlowClient/appsettings.Development.json b/WebMVCClient/appsettings.Development.json → ...idFlowClient/appsettings.Development.json
diff --git a/...ient/appsettings.Release.Development.json → ...ient/appsettings.Release.Development.json b/...ient/appsettings.Release.Development.json → ...ient/appsettings.Release.Development.json
diff --git a/WebMVCClient/appsettings.Release.json → WebHybridFlowClient/appsettings.Release.json b/WebMVCClient/appsettings.Release.json → WebHybridFlowClient/appsettings.Release.json
diff --git a/WebMVCClient/appsettings.json → WebHybridFlowClient/appsettings.json b/WebMVCClient/appsettings.json → WebHybridFlowClient/appsettings.json
diff --git a/WebMVCClient/bundleconfig.json → WebHybridFlowClient/bundleconfig.json b/WebMVCClient/bundleconfig.json → WebHybridFlowClient/bundleconfig.json
diff --git a/WebMVCClient/web.config → WebHybridFlowClient/web.config b/WebMVCClient/web.config → WebHybridFlowClient/web.config
diff --git a/WebMVCClient/wwwroot/css/site.css → WebHybridFlowClient/wwwroot/css/site.css b/WebMVCClient/wwwroot/css/site.css → WebHybridFlowClient/wwwroot/css/site.css
diff --git a/WebMVCClient/wwwroot/css/site.min.css → WebHybridFlowClient/wwwroot/css/site.min.css b/WebMVCClient/wwwroot/css/site.min.css → WebHybridFlowClient/wwwroot/css/site.min.css
diff --git a/WebMVCClient/wwwroot/favicon.ico → WebHybridFlowClient/wwwroot/favicon.ico b/WebMVCClient/wwwroot/favicon.ico → WebHybridFlowClient/wwwroot/favicon.ico
diff --git a/WebMVCClient/wwwroot/images/banner1.svg → ...bridFlowClient/wwwroot/images/banner1.svg b/WebMVCClient/wwwroot/images/banner1.svg → ...bridFlowClient/wwwroot/images/banner1.svg
diff --git a/WebMVCClient/wwwroot/images/banner2.svg → ...bridFlowClient/wwwroot/images/banner2.svg b/WebMVCClient/wwwroot/images/banner2.svg → ...bridFlowClient/wwwroot/images/banner2.svg
diff --git a/WebMVCClient/wwwroot/images/banner3.svg → ...bridFlowClient/wwwroot/images/banner3.svg b/WebMVCClient/wwwroot/images/banner3.svg → ...bridFlowClient/wwwroot/images/banner3.svg
diff --git a/WebMVCClient/wwwroot/images/banner4.svg → ...bridFlowClient/wwwroot/images/banner4.svg b/WebMVCClient/wwwroot/images/banner4.svg → ...bridFlowClient/wwwroot/images/banner4.svg
diff --git a/WebMVCClient/wwwroot/js/site.js → WebHybridFlowClient/wwwroot/js/site.js b/WebMVCClient/wwwroot/js/site.js → WebHybridFlowClient/wwwroot/js/site.js
diff --git a/WebMVCClient/wwwroot/js/site.min.js → WebHybridFlowClient/wwwroot/js/site.min.js b/WebMVCClient/wwwroot/js/site.min.js → WebHybridFlowClient/wwwroot/js/site.min.js
diff --git a/...CClient/wwwroot/lib/bootstrap/.bower.json → ...wClient/wwwroot/lib/bootstrap/.bower.json b/...CClient/wwwroot/lib/bootstrap/.bower.json → ...wClient/wwwroot/lib/bootstrap/.bower.json
diff --git a/WebMVCClient/wwwroot/lib/bootstrap/LICENSE → ...dFlowClient/wwwroot/lib/bootstrap/LICENSE b/WebMVCClient/wwwroot/lib/bootstrap/LICENSE → ...dFlowClient/wwwroot/lib/bootstrap/LICENSE
diff --git a/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css b/...ib/bootstrap/dist/css/bootstrap-theme.css → ...ib/bootstrap/dist/css/bootstrap-theme.css
diff --git a/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map b/...ootstrap/dist/css/bootstrap-theme.css.map → ...ootstrap/dist/css/bootstrap-theme.css.map
diff --git a/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css b/...ootstrap/dist/css/bootstrap-theme.min.css → ...ootstrap/dist/css/bootstrap-theme.min.css
diff --git a/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map b/...trap/dist/css/bootstrap-theme.min.css.map → ...trap/dist/css/bootstrap-theme.min.css.map
diff --git a/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css b/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot b/...st/fonts/glyphicons-halflings-regular.eot → ...st/fonts/glyphicons-halflings-regular.eot
diff --git a/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg b/...st/fonts/glyphicons-halflings-regular.svg → ...st/fonts/glyphicons-halflings-regular.svg
diff --git a/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf b/...st/fonts/glyphicons-halflings-regular.ttf → ...st/fonts/glyphicons-halflings-regular.ttf
diff --git a/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff b/...t/fonts/glyphicons-halflings-regular.woff → ...t/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js b/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/...ient/wwwroot/lib/bootstrap/dist/js/npm.js → ...ient/wwwroot/lib/bootstrap/dist/js/npm.js b/...ient/wwwroot/lib/bootstrap/dist/js/npm.js → ...ient/wwwroot/lib/bootstrap/dist/js/npm.js
diff --git a/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json b/...jquery-validation-unobtrusive/.bower.json → ...jquery-validation-unobtrusive/.bower.json
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json b/...wwwroot/lib/jquery-validation/.bower.json → ...wwwroot/lib/jquery-validation/.bower.json
diff --git a/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js b/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js b/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js
diff --git a/WebMVCClient/wwwroot/lib/jquery/.bower.json → ...FlowClient/wwwroot/lib/jquery/.bower.json b/WebMVCClient/wwwroot/lib/jquery/.bower.json → ...FlowClient/wwwroot/lib/jquery/.bower.json
diff --git a/WebMVCClient/wwwroot/lib/jquery/LICENSE.txt → ...FlowClient/wwwroot/lib/jquery/LICENSE.txt b/WebMVCClient/wwwroot/lib/jquery/LICENSE.txt → ...FlowClient/wwwroot/lib/jquery/LICENSE.txt
diff --git a/...CClient/wwwroot/lib/jquery/dist/jquery.js → ...wClient/wwwroot/lib/jquery/dist/jquery.js b/...CClient/wwwroot/lib/jquery/dist/jquery.js → ...wClient/wwwroot/lib/jquery/dist/jquery.js
diff --git a/...ent/wwwroot/lib/jquery/dist/jquery.min.js → ...ent/wwwroot/lib/jquery/dist/jquery.min.js b/...ent/wwwroot/lib/jquery/dist/jquery.min.js → ...ent/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/...nt/wwwroot/lib/jquery/dist/jquery.min.map → ...nt/wwwroot/lib/jquery/dist/jquery.min.map b/...nt/wwwroot/lib/jquery/dist/jquery.min.map → ...nt/wwwroot/lib/jquery/dist/jquery.min.map