feature: Email argument type (#433)

* feature: Email argument type

* bugfix: Fix error if additional links is null

internal/executor/arguments.go

@@ -6,6 +6,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"errors"
+	"net/mail"
 	"net/url"
 	"regexp"
 	"strings"
@@ -137,10 +138,13 @@ func typecheckChoiceEntity(value string, arg *config.ActionArgument) error {
 // TypeSafetyCheck checks argument values match a specific type. The types are
 // defined in typecheckRegex, and, you guessed it, uses regex to check for allowed
 // characters.
+//gocyclo:ignore
 func TypeSafetyCheck(name string, value string, argumentType string) error {
 	switch argumentType {
 	case "password":
 		return nil
+	case "email":
+		return typeSafetyCheckEmail(name, value)
 	case "url":
 		return typeSafetyCheckUrl(name, value)
 	case "datetime":
@@ -150,6 +154,18 @@ func TypeSafetyCheck(name string, value string, argumentType string) error {
 	return typeSafetyCheckRegex(name, value, argumentType)
 }
 
+func typeSafetyCheckEmail(name string, value string) error {
+	_, err := mail.ParseAddress(value)
+
+	log.Errorf("Email check: %v, %v", err, value)
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func typeSafetyCheckDatetime(name string, value string) error {
 	_, err := time.Parse("2006-01-02T15:04:05", value)
 

webui.dev/js/ArgumentForm.js

@@ -120,54 +120,61 @@ class ArgumentForm extends window.HTMLElement {
       for (const choice of arg.choices) {
         domEl.appendChild(this.createSelectOption(choice))
       }
-    } else if (arg.type === 'confirmation') {
-      this.domBtnStart.disabled = true
-
-      domEl = document.createElement('input')
-      domEl.setAttribute('type', 'checkbox')
-      domEl.onchange = () => {
-        this.domBtnStart.disabled = false
-        domEl.disabled = true
-      }
-    } else if (arg.type === 'datetime') {
-      domEl = document.createElement('input')
-      domEl.setAttribute('type', 'datetime-local')
-      domEl.setAttribute('step', '1')
-    } else if (arg.type === 'password') {
-      domEl = document.createElement('input')
-      domEl.setAttribute('type', 'password')
     } else {
-      domEl = document.createElement('input')
+      switch (arg.type) {
+        case 'confirmation':
+          this.domBtnStart.disabled = true
 
-      if (arg.type.startsWith('regex:')) {
+          domEl = document.createElement('input')
-        domEl.setAttribute('pattern', arg.type.replace('regex:', ''))
+          domEl.setAttribute('type', 'checkbox')
-      }
+          domEl.onchange = () => {
-
+            this.domBtnStart.disabled = false
-      domEl.onchange = () => {
+            domEl.disabled = true
-        const validateArgumentTypeArgs = {
-          value: domEl.value,
-          type: arg.type
-        }
-
-        window.fetch(window.restBaseUrl + 'ValidateArgumentType', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json'
-          },
-          body: JSON.stringify(validateArgumentTypeArgs)
-        }).then((res) => {
-          if (res.ok) {
-            return res.json()
-          } else {
-            throw new Error(res.statusText)
           }
-        }).then((json) => {
+          break
-          if (json.valid) {
+        case 'datetime':
-            domEl.setCustomValidity('')
+          domEl = document.createElement('input')
-          } else {
+          domEl.setAttribute('type', 'datetime-local')
-            domEl.setCustomValidity(json.description)
+          domEl.setAttribute('step', '1')
+          break
+        case 'password':
+        case 'email':
+          domEl = document.createElement('input')
+          domEl.setAttribute('type', arg.type)
+          break
+        default:
+          domEl = document.createElement('input')
+
+          if (arg.type.startsWith('regex:')) {
+            domEl.setAttribute('pattern', arg.type.replace('regex:', ''))
+          }
+
+          domEl.onchange = () => {
+            const validateArgumentTypeArgs = {
+              value: domEl.value,
+              type: arg.type
+            }
+
+            window.fetch(window.restBaseUrl + 'ValidateArgumentType', {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json'
+              },
+              body: JSON.stringify(validateArgumentTypeArgs)
+            }).then((res) => {
+              if (res.ok) {
+                return res.json()
+              } else {
+                throw new Error(res.statusText)
+              }
+            }).then((json) => {
+              if (json.valid) {
+                domEl.setCustomValidity('')
+              } else {
+                domEl.setCustomValidity(json.description)
+              }
+            })
           }
-        })
       }
     }
 

webui.dev/main.js

@@ -134,7 +134,7 @@ function processWebuiSettingsJson (settings) {
 }
 
 function processAdditionaLinks (links) {
-  if (links === undefined) {
+  if (links === null) {
     return
   }