Merge pull request #354 from binaryjanitor/integrate_pdf_service

Refactored service with local IIS deployment (to work around IIS Expr…
HTBox · Aug 5, 2019 · aa62e71 · aa62e71
2 parents 6c2962e + 075abcb
commit aa62e71
Show file tree

Hide file tree

Showing 10 changed files with 4,916 additions and 4,850 deletions.
diff --git a/src/MobileKidsId.PdfGenerationAppService/Controllers/JsonToPdfController.cs b/src/MobileKidsId.PdfGenerationAppService/Controllers/JsonToPdfController.cs
@@ -11,11 +11,12 @@ namespace MobileKidsId.PdfGenerationAppService.Controllers
 {   
     public class JsonToPdfController : ApiController
     {
-        /*Can test with local browser via http://localhost:[your locla IIS port]/api/JsonToPdf/GetMissingChildProfilePdf?missingChildJson=""*/
+        /*Can test with local browser via http://localhost:[your local IIS port]/api/JsonToPdf/GetMissingChildProfilePdf?missingChildJson=""*/
+        /* Not from GiveCamp 2019. This service works over a local IIS host when deployed using the Deploy Profile contained in settings. This is not ideal and will be replaced with a service Mock */ 
         [System.Web.Http.HttpGet]
         public ActionResult GetMissingChildProfilePdf(string missingChildJson)
         {
-            if(!string.IsNullOrWhiteSpace(missingChildJson))
+            if(string.IsNullOrWhiteSpace(missingChildJson))
             {
             missingChildJson = @"{
                             'FirstName': 'Jane',

diff --git a/src/MobileKidsId.PdfGenerationAppService/MobileKidsId.PdfGenerationAppService.csproj b/src/MobileKidsId.PdfGenerationAppService/MobileKidsId.PdfGenerationAppService.csproj
@@ -265,6 +265,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="packages.config" />
+    <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\MobileKidsIdPdfGenerationAppService20180805110039 - Web Deploy.pubxml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -289,7 +290,7 @@
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>61795</DevelopmentServerPort>
+          <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:61795/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>

diff --git a/src/MobileKidsIdApp/MobileKidsIdApp.Android/MobileKidsIdApp.Android.csproj b/src/MobileKidsIdApp/MobileKidsIdApp.Android/MobileKidsIdApp.Android.csproj
@@ -71,6 +71,7 @@
     <Compile Include="MainActivity.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\AndroidDownloader.cs" />
     <Compile Include="Services\ContactPicker.cs" />
     <Compile Include="Services\PhotoPicker.cs" />
     <Compile Include="Services\WebViewContentHelper.cs" />

diff --git a/src/MobileKidsIdApp/MobileKidsIdApp.Android/Properties/AndroidManifest.xml b/src/MobileKidsIdApp/MobileKidsIdApp.Android/Properties/AndroidManifest.xml
@@ -2,5 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.HumanitarianToolbox.KidsIdKit" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
 	<uses-permission android:name="android.permission.READ_CONTACTS" />
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<application android:label="Kids Id Kit"></application>
 </manifest>