Merge pull request #62 from nodes-vapor/hotfix/reset-failure-redirects

steffendsommer · web-flow · commit 2a15814c4ace · 2017-06-12T05:57:56.000+02:00
fixes incorrect redirect from failed password resets
diff --git a/Sources/AdminPanel/Controllers/LoginController.swift b/Sources/AdminPanel/Controllers/LoginController.swift
@@ -112,11 +112,11 @@ public final class LoginController {
         }
         
         if(password != passwordRepeat) {
-            return Response(redirect: "admin/login/reset" + tokenStr).flash(.error, "Passwords did not match")
+            return Response(redirect: "/admin/login/reset/" + tokenStr).flash(.error, "Passwords did not match")
         }
         
         if !password.passes(Count.min(8)) {
-            return Response(redirect: "admin/login/reset" + tokenStr).flash(.error, "Passwords did not match requirement")
+            return Response(redirect: "/admin/login/reset/" + tokenStr).flash(.error, "Passwords did not match requirement")
         }
         
         guard var backendUser = try BackendUser.query().filter("email", email).first() else {

Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,11 @@ public final class LoginController {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if(password != passwordRepeat) {`
`115`		`- return Response(redirect: "admin/login/reset" + tokenStr).flash(.error, "Passwords did not match")`
	`115`	`+ return Response(redirect: "/admin/login/reset/" + tokenStr).flash(.error, "Passwords did not match")`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if !password.passes(Count.min(8)) {`
`119`		`- return Response(redirect: "admin/login/reset" + tokenStr).flash(.error, "Passwords did not match requirement")`
	`119`	`+ return Response(redirect: "/admin/login/reset/" + tokenStr).flash(.error, "Passwords did not match requirement")`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`guard var backendUser = try BackendUser.query().filter("email", email).first() else {`