Merge pull request #139 from nodes-vapor/feature/fix-unique-email-val…

…idation Prevent overwriting uniqueness validation
ml-archive · Sep 23, 2019 · ffa792b · ffa792b
2 parents db7274a + 4738d14
commit ffa792b
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/Sources/AdminPanel/Models/AdminPanelUser/Extensions/AdminPanelUser+Submittable.swift b/Sources/AdminPanel/Models/AdminPanelUser/Extensions/AdminPanelUser+Submittable.swift
@@ -5,18 +5,19 @@ import Validation
 import Vapor
 
 extension AdminPanelUser: Submittable {
-    public static func makeFields(
+    public static func makeAdditionalFields(
         for submission: Submission?,
         given user: AdminPanelUser?
     ) throws -> [Field] {
-        guard let submission = submission else { return [] }
         return try [
             Field(
                 keyPath: \.email,
                 instance: submission,
-                label: "Email address",
+                label: "Email",
+                validators: [.email],
                 asyncValidators: [{ req, _ in
-                    validateThat(
+                    guard let submission = submission else { return req.future([]) }
+                    return validateThat(
                         only: user,
                         has: submission.email,
                         for: \.email,
@@ -77,12 +78,6 @@ extension AdminPanelUser: Submittable {
                     label: "Title",
                     validators: [.count(...191)]
                 ),
-                Field(
-                    keyPath: \.email,
-                    instance: instance,
-                    label: "Email",
-                    validators: [.email]
-                ),
                 Field(
                     keyPath: \.role,
                     instance: instance,