Merge branch 'dev/Invisible'

.gitignore

@@ -383,3 +383,5 @@ MigrationBackup/
 TestSite/App_Data/umbraco.licensing.log.txt
 
 TestSite/App_Data/Models/
+
+.idea/

Builds/NuGet/UmbracoForms.uCaptcha.nuspec

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+  <metadata>
+    <id>AaronSadler.uCaptcha</id>
+    <version>1.0.0</version>
+    <title>UmbracoForms.uCaptcha</title>
+    <authors>Aaron Sadler</authors>
+    <owners>Aaron Sadler</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/AaronSadlerUK/UmbracoForms.uCaptcha</projectUrl>
+    <icon>uCaptcha-logo.png</icon>
+    <summary>A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha</summary>
+    <description>A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha</description>
+    <releaseNotes><![CDATA[1.0.0 Initial release]]></releaseNotes>
+    <copyright>Copyright 2020</copyright>
+    <tags>umbraco, umbraco-cms, hCaptcha, umbraco-forms, reCaptcha</tags>
+	<dependencies>
+	  <group targetFramework=".NETFramework4.7.2">
+		  <dependency id="UmbracoForms" version="8.4.1" />
+		  <dependency id="UmbracoForms.Core" version="8.4.1" />
+		  <dependency id="UmbracoCms" version="8.6.1" />
+	  </group>
+    </dependencies>
+  </metadata>
+      <files>
+      <file src="..\..\UmbracoForms.uCaptcha\bin\Release\UmbracoForms.uCaptcha.dll" target="lib\net472" />
+      <file src="..\..\UmbracoForms.uCaptcha\Views\Partials\Forms\Fieldtypes\Fieldtype.uCaptcha.cshtml" target="content\Views\Partials\Forms\Fieldtypes\" />
+      <file src="..\..\UmbracoForms.uCaptcha\Views\Partials\Forms\Themes\default\Fieldtypes\Fieldtype.uCaptcha.cshtml" target="content\Views\Partials\Forms\Themes\default\Fieldtypes\" />
+      <file src="..\..\UmbracoForms.uCaptcha\App_Plugins\UmbracoForms.uCaptcha\" target="content\App_Plugins\UmbracoForms.uCaptcha\" />
+      <file src="..\uCaptcha-logo.png"/>
+    </files>
+</package>

Builds/package.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<umbPackage>
+  <info>
+    <package>
+      <name>UmbracoForms.uCaptcha</name>
+      <version>1.0.1</version>
+      <iconUrl></iconUrl>
+      <licence url="https://opensource.org/licenses/MIT">MIT</licence>
+      <url>https://github.com/AaronSadlerUK/UmbracoForms.uCaptcha</url>
+      <requirements type="strict">
+        <major>8</major>
+        <minor>6</minor>
+        <patch>0</patch>
+      </requirements>
+    </package>
+    <author>
+      <name>Aaron Sadler</name>
+      <website>https://aaronsadler.dev</website>
+    </author>
+    <readme><![CDATA[A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha.]]></readme>
+  </info>
+  <files>
+    <folder path="../UmbracoForms.uCaptcha/App_Plugins/UmbracoForms.uCaptcha" orgPath="App_Plugins/UmbracoForms.uCaptcha" /> 
+    <file path="../UmbracoForms.uCaptcha/bin/Release/UmbracoForms.uCaptcha.dll" orgPath="bin/UmbracoForms.uCaptcha.dll" />
+    <file path="../UmbracoForms.uCaptcha/Views/Partials/Forms/Themes/default/Fieldtypes/Fieldtype.uCaptcha.cshtml" orgPath="Views/Partials/Forms/Themes/default/Fieldtypes/Fieldtype.uCaptcha.cshtml" />
+    <file path="../UmbracoForms.uCaptcha/Views/Partials/Forms/Fieldtypes/Fieldtype.uCaptcha.cshtml" orgPath="Views/Partials/Forms/Fieldtypes/Fieldtype.uCaptcha.cshtml" />
+	</files>
+  <Actions />
+  <control />
+  <DocumentTypes />
+  <Templates />
+  <Stylesheets />
+  <Macros />
+  <DictionaryItems />
+  <Languages />
+  <DataTypes />
+</umbPackage>

README.md

@@ -1,34 +1,46 @@
-# UmbracoForms.hCaptcha
+# UmbracoForms.uCaptcha
 
-An alternative captcha solution
+A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha.
 
 ## Getting started
 
 This package is supported on Umbraco 8.6+ and Umbraco Forms 8.4.1+.
 
 ### Installation
 
-UmbracoForms.hCaptcha is available from [Our Umbraco](https://our.umbraco.com/packages/website-utilities/umbracoformshcaptcha/), [NuGet](https://www.nuget.org/packages/AaronSadler.HCaptcha/) or as a manual download directly from GitHub.
-
-#### Our Umbraco repository
-You can find a downloadable package, along with a discussion forum for this package, on the [Our Umbraco](https://our.umbraco.com/packages/website-utilities/umbracoformshcaptcha/) site.
+UmbracoForms.uCaptcha is available from [Our Umbraco](https://our.umbraco.com/packages/website-utilities/umbracoformsucaptcha/), [NuGet](https://www.nuget.org/packages/AaronSadler.uCaptcha) or as a manual download directly from GitHub.
 
 ## Usage
 
-**Pre-Release**
+This package adds both hCaptcha or reCaptcha to Umbraco Forms, configurable by the AppSettings in the Web.Config.
 
-This package adds hCaptcha to Umbraco Forms.
+It has the ability to choose from the traditional checkbox or invisible options.
 
 This is tested with **Umbraco V8.6.1** and **Umbraco Forms 8.4.1**
 
 You can see a demo of it in action here:
 [https://aaronsadler.uk/contact/](https://aaronsadler.uk/contact/)
 
-You will need to add the following keys to your Web.Config:
+
+## Getting Started
+
+Before you begin you will need to get your API keys from your preferred provider, you can get these from the links below:
+
+[hCaptcha](https://hCaptcha.com/?r=0d16470cad8d)
+
+[reCaptcha](https://www.google.com/recaptcha/about/)
+
+You will need to add the following AppSettings to your `Web.Config`
 
     <add key="hCaptchaSiteKey" value="YOUR SITE KEY" />
     <add key="hCaptchaSecretKey" value="YOUR SECRET KEY" />
 
+To select the provider you will need to add the following AppSetting to your `Web.Config`
+
+    <add key="uCaptchaProvider" value="PROVIDER" />
+
+The choices are either `hCaptcha` or `reCaptcha`
+
 ### Contribution guidelines
 
 To raise a new bug, create an issue on the GitHub repository. To fix a bug or add new features, fork the repository and send a pull request with your changes. Feel free to add ideas to the repository's issues list if you would to discuss anything related to the package.

TestSite/App_Data/UmbracoForms/Data/forms/3c79e444-6f33-4207-943f-afde26c3a531.json → TestSite/App_Data/UmbracoForms/Data/forms/b2fdb0f0-ed9d-4694-ba55-f309d9b8ba94.json

@@ -1,26 +1,26 @@
 {
-  "name": "Test form",
-  "created": "2020-05-05T17:30:15.1235713+01:00",
+  "name": "New Test Form",
+  "created": "2020-10-03T09:15:04.2988209+01:00",
   "pages": [
     {
       "fieldSets": [
         {
           "caption": null,
           "sortOrder": 0,
-          "id": "00000000-0000-0000-0000-000000000000",
+          "id": "81d2ea3b-88c7-48ea-80f1-7f9ec9223ac0",
           "page": "00000000-0000-0000-0000-000000000000",
           "containers": [
             {
               "caption": null,
               "width": 12,
               "fields": [
                 {
-                  "caption": "Name",
+                  "caption": "Text Box",
                   "tooltip": null,
                   "placeholder": null,
                   "cssClass": null,
-                  "alias": "name",
-                  "id": "f6718dda-0e45-48f9-bf8f-ecfe8a500a9e",
+                  "alias": "textBox",
+                  "id": "4dde9e08-e7e4-49cd-c1f5-9e28b8c7b0bf",
                   "fieldTypeId": "3f92e01b-29e2-4a30-bf33-9df5580ed52c",
                   "prevalueSourceId": "00000000-0000-0000-0000-000000000000",
                   "dataSourceFieldKey": null,
@@ -29,20 +29,26 @@
                   "regex": null,
                   "requiredErrorMessage": null,
                   "invalidErrorMessage": null,
-                  "condition": null,
+                  "condition": {
+                    "id": "00000000-0000-0000-0000-000000000000",
+                    "enabled": false,
+                    "actionType": "Show",
+                    "logicType": "All",
+                    "rules": []
+                  },
                   "settings": {
                     "DefaultValue": "",
                     "Placeholder": ""
                   },
                   "preValues": []
                 },
                 {
-                  "caption": "hCaptcha",
+                  "caption": "uCaptcha",
                   "tooltip": null,
                   "placeholder": null,
                   "cssClass": null,
-                  "alias": "hCaptcha",
-                  "id": "0b775828-85f2-44ca-de74-d5b9f5a971fd",
+                  "alias": "uCaptcha",
+                  "id": "34bff5dc-52e7-4b4c-d08a-62e73eb10ebd",
                   "fieldTypeId": "76fc6a38-4517-4fea-b928-9ff20c626adb",
                   "prevalueSourceId": "00000000-0000-0000-0000-000000000000",
                   "dataSourceFieldKey": null,
@@ -59,9 +65,11 @@
                     "rules": []
                   },
                   "settings": {
+                    "ShowLabel": "False",
                     "Theme": "light",
                     "Size": "normal",
-                    "ErrorMessage": ""
+                    "reCaptchaBadgePosition": "bottomleft",
+                    "ErrorMessage": "Different Message"
                   },
                   "preValues": []
                 }
@@ -71,13 +79,13 @@
           "condition": null
         }
       ],
-      "caption": "Test form",
+      "caption": null,
       "sortOrder": 0,
       "id": "00000000-0000-0000-0000-000000000000",
       "form": "00000000-0000-0000-0000-000000000000"
     }
   ],
-  "id": "3c79e444-6f33-4207-943f-afde26c3a531",
+  "id": "b2fdb0f0-ed9d-4694-ba55-f309d9b8ba94",
   "fieldIndicationType": "MarkMandatoryFields",
   "indicator": "*",
   "showValidationSummary": false,
@@ -92,9 +100,11 @@
   "cssClass": null,
   "disableDefaultStylesheet": false,
   "useClientDependency": false,
-  "workflows": [],
+  "workflows": [
+    "1c42a1d4-f847-4f6b-9c04-883baa234e9d"
+  ],
   "datasource": null,
   "submitLabel": "Submit",
   "nextLabel": "Next",
-  "prevLabel": "Prev"
+  "prevLabel": "Previous"
 }

TestSite/App_Data/UmbracoForms/Data/workflows/1c42a1d4-f847-4f6b-9c04-883baa234e9d.json

@@ -0,0 +1,17 @@
+{
+  "id": "1c42a1d4-f847-4f6b-9c04-883baa234e9d",
+  "name": "Send template email to [email protected]",
+  "form": "b2fdb0f0-ed9d-4694-ba55-f309d9b8ba94",
+  "active": true,
+  "includeSensitiveData": "False",
+  "workflowTypeId": "17c61629-d984-4e86-b43b-a8407b3efea9",
+  "executesOn": "Submitted",
+  "settings": {
+    "Email": "[email protected]",
+    "SenderEmail": "",
+    "Subject": "The Form '{form_name}' was submitted",
+    "RazorViewFilePath": "Forms/Emails/Example-Template.cshtml",
+    "Attachment": ""
+  },
+  "sortOrder": 1
+}