[BUG] Auth Groups block incoming requests with valid auth (#30)

Apodini · Apr 22, 2020 · cf6108b · cf6108b
1 parent e7f1397
commit cf6108b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,5 +1,5 @@
 branches: [master]
-name-template: '$NEXT_PATCH_VERSION 🌈'
+name-template: '$NEXT_PATCH_VERSION 🦅'
 tag-template: '$NEXT_PATCH_VERSION'
 categories:
   - title: '🚀 Features'

diff --git a/Sources/Corvus/Endpoints/Groups/BasicAuthGroup.swift b/Sources/Corvus/Endpoints/Groups/BasicAuthGroup.swift
@@ -43,8 +43,8 @@ public struct BasicAuthGroup<T: CorvusModelAuthenticatable>: Endpoint {
         )
 
         let guardedRoutesBuilder = groupedRoutesBuilder.grouped([
-            T.guardMiddleware(),
-            T.authenticator()
+            T.authenticator(),
+            T.guardMiddleware()
         ])
 
         content.register(to: guardedRoutesBuilder)

diff --git a/Sources/Corvus/Endpoints/Groups/BearerAuthGroup.swift b/Sources/Corvus/Endpoints/Groups/BearerAuthGroup.swift
@@ -43,8 +43,8 @@ public struct BearerAuthGroup<T: CorvusModelTokenAuthenticatable>: Endpoint {
         )
 
         let guardedRoutesBuilder = groupedRoutesBuilder.grouped([
-            T.User.guardMiddleware(),
-            T.authenticator()
+            T.authenticator(),
+            T.User.guardMiddleware()
         ])
 
         content.register(to: guardedRoutesBuilder)

diff --git a/Sources/Corvus/Endpoints/Login.swift b/Sources/Corvus/Endpoints/Login.swift
@@ -43,7 +43,8 @@ Endpoint where T.User: CorvusModelAuthenticatable {
     /// about the HTTP route leading to the current component.
     public func register(to routes: RoutesBuilder) {
         let guardedRoutesBuilder = routes.grouped(
-            T.User.authenticator()
+            T.User.authenticator(),
+            T.User.guardMiddleware()
         )
 
         guardedRoutesBuilder.post(path, use: handler)