Merge pull request #72 from AppliedIS/feature-ci

Feature ci - app setting updates / local https
ais-open · Oct 21, 2016 · e2da225 · e2da225
2 parents 9436f9d + 6757139
commit e2da225
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 17 deletions.
diff --git a/DOL.WHD.Section14c.Api/DOL.WHD.Section14c.Api.csproj b/DOL.WHD.Section14c.Api/DOL.WHD.Section14c.Api.csproj
@@ -18,7 +18,7 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
+    <IISExpressSSLPort>44399</IISExpressSSLPort>
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
@@ -36,6 +36,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -44,6 +45,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework6.Npgsql, Version=3.1.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">

diff --git a/DOL.WHD.Section14c.Api/Parameters.xml b/DOL.WHD.Section14c.Api/Parameters.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <parameters>
   <parameter name="UserLockoutEnabledByDefault" defaultValue="true">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='UserLockoutEnabledByDefault']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='UserLockoutEnabledByDefault']/@value" />
+  </parameter>
+  <parameter name="PasswordExpirationDays" defaultValue="90">
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='PasswordExpirationDays']/@value" />
   </parameter>
   <parameter name="DefaultAccountLockoutTimeSpan" defaultValue="15">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='DefaultAccountLockoutTimeSpan']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='DefaultAccountLockoutTimeSpan']/@value" />
   </parameter>
   <parameter name="MaxFailedAccessAttemptsBeforeLockout" defaultValue="3">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='MaxFailedAccessAttemptsBeforeLockout']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='MaxFailedAccessAttemptsBeforeLockout']/@value" />
   </parameter>
   <parameter name="AccessTokenExpireTimeSpanMinutes" defaultValue="3">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='AccessTokenExpireTimeSpanMinutes']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='AccessTokenExpireTimeSpanMinutes']/@value" />
   </parameter>
   <parameter name="ConnectionString" defaultValue="ConnectionString">
     <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/connectionStrings/add[@name='ApplicationDbContext']/@connectionString" />
   </parameter>
   <parameter name="ReCaptchaVerfiyUrl" defaultValue="https://www.google.com/recaptcha/api/siteverify">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='ReCaptchaVerfiyUrl']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='ReCaptchaVerfiyUrl']/@value" />
   </parameter>
   <parameter name="ReCaptchaSecretKey" defaultValue="6LeqeggUAAAAAEY5KpgWZGkOHnkyQXmiSKg7tqsY">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='ReCaptchaSecretKey']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='ReCaptchaSecretKey']/@value" />
   </parameter>
   <parameter name="AttachmentRepositoryRootFolder" defaultValue="AttachmentRepositoryRootFolder">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='AttachmentRepositoryRootFolder']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='AttachmentRepositoryRootFolder']/@value" />
   </parameter>
   <parameter name="AllowedFileNamesRegex" defaultValue="^(.*\.(doc|docx|xls|xlsx|pdf|jpg|jpeg|png)$)?[^.]*$">
-    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='AllowedFileNamesRegex']" />
+    <parameterEntry kind="XmlFile" scope="web\.config$" match="/configuration/appSettings/add[@key='AllowedFileNamesRegex']/@value" />
   </parameter>
 </parameters>
diff --git a/DOL.WHD.Section14c.Business/DOL.WHD.Section14c.Business.csproj b/DOL.WHD.Section14c.Business/DOL.WHD.Section14c.Business.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

diff --git a/DOL.WHD.Section14c.Common/DOL.WHD.Section14c.Common.csproj b/DOL.WHD.Section14c.Common/DOL.WHD.Section14c.Common.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj b/DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

diff --git a/DOL.WHD.Section14c.Domain/DOL.WHD.Section14c.Domain.csproj b/DOL.WHD.Section14c.Domain/DOL.WHD.Section14c.Domain.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

diff --git a/DOL.WHD.Section14c.Test/DOL.WHD.Section14c.Test.csproj b/DOL.WHD.Section14c.Test/DOL.WHD.Section14c.Test.csproj
@@ -25,6 +25,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +34,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

diff --git a/DOL.WHD.Section14c.Web/env.js b/DOL.WHD.Section14c.Web/env.js
@@ -2,7 +2,7 @@
     window.__env = window.__env || {};
 
     // base api url
-    window.__env.api_url = 'http://localhost:3334';
+    window.__env.api_url = 'https://localhost:44399';
 
     // Google reCaptcha Site Key
     window.__env.reCaptchaSiteKey = '6LeqeggUAAAAALC5zT4OHbDJk9gHNT0GGZbJMOnG';

diff --git a/DOL.WHD.Section14c.Web/webpack.config.js b/DOL.WHD.Section14c.Web/webpack.config.js
@@ -17,7 +17,8 @@ module.exports = {
     },
 	devServer: {
 		inline: true,
-		port: 3333
+		port: 3333,
+        https: true,
 	},
 	module: {
         preLoaders: [

diff --git a/README.md b/README.md
@@ -83,8 +83,10 @@ All configurations for the Web project are set in the env.js. This file is exclu
 
 | Setting | Description | Default   
 | --- | --- | ---
-api_url | Full URL of the REST API Service | http://localhost:3334 (Local develoment URL)
-reCaptchaSiteKey | reCaptcha Site Key | (Development Key with localhost enabled)
+api_url* | Full URL of the REST API Service | http://localhost:3334 (Local develoment URL)
+reCaptchaSiteKey* | reCaptcha Site Key | (Development Key with localhost enabled)
+
+\* Must be configured during deployment
 
 ### 2. DOL.WHD.Section14c.API.zip
 
@@ -94,16 +96,20 @@ The following are setup as WebDeploy parameters and can be set with command line
 
 | Setting | Description | Default   
 | --- | --- | ---
-ConnectionString | PostgreSQL database connection string | No Deployment Default, must be set.
-ReCaptchaVerfiyUrl | URL Application uses to verifu reCaptcha server-side | https://www.google.com/recaptcha/api/siteverify
-ReCaptchaSecretKey | reCaptcha Secret Key sent with the server-side verification.  If this key is not provided the server-side validation will be disabled. | No Deployment Default, must be set.
+ConnectionString* | PostgreSQL database connection string | No Deployment Default
+ReCaptchaVerfiyUrl* | URL Application uses to verifu reCaptcha server-side | https://www.google.com/recaptcha/api/siteverify
+ReCaptchaSecretKey* | reCaptcha Secret Key sent with the server-side verification.  If this key is not provided the server-side validation will be disabled. | No Deployment Default
+AttachmentRepositoryRootFolder* | File Path (Local or UNC path) where application attachments should be stored | No Deployment Default
 UserLockoutEnabledByDefault | Enables or Disabled user login attempt lockout | true
 DefaultAccountLockoutTimeSpan | Minutes to lockout user | 15
 MaxFailedAccessAttemptsBeforeLockout | Login attempts befer user is locked out | 3
+PasswordExpirationDays | Number of days before password must be changes | 90
 AccessTokenExpireTimeSpanMinutes | Token Expiration Minutes for Reset Password and Email Verification Links | 20160 (14 days, ASP.net Default)
-AttachmentRepositoryRootFolder | File Path (UNC path) where application attachments shoudl be stored | No Deployment Default, must be set.
 AllowedFileNamesRegex | Regex for allowed filenames | ^(.*\.(doc|docx|xls|xlsx|ppt|pptx|pdf)$)?[^.]*$
 
+\* Must be configured during deployment
+
+
 ### 3. DotNet.CoverageReport.zip
 
 This artifact contains static files of a ReportGenerator code coverage report for .Net.  This is a development artifact and is not needed for production.