Merge pull request #18 from skelpo/develop

JWTMiddleware 0.8.0
skelpo · Jul 9, 2018 · 22f07b9 · 22f07b9
2 parents 4060163 + 70ade0a
commit 22f07b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/Sources/App/Configuration/configure.swift b/Sources/App/Configuration/configure.swift
@@ -67,8 +67,7 @@ public func configure(
     else {
         throw MySQLError(
             identifier: "missingEnvVars",
-            reason: "One or more expected environment variables are missing: DATABASE_HOSTNAME, DATABASE_USER, DATABASE_DB",
-            source: .capture()
+            reason: "One or more expected environment variables are missing: DATABASE_HOSTNAME, DATABASE_USER, DATABASE_DB"
         )
     }
     let config = MySQLDatabaseConfig(
@@ -84,8 +83,8 @@ public func configure(
 
     /// Configure migrations
     var migrations = MigrationConfig()
-    migrations.add(model: Attribute.self, database: .mysql)
     migrations.add(model: User.self, database: .mysql)
+    migrations.add(model: Attribute.self, database: .mysql)
     services.register(migrations)
 
     let jwt = JWTDataConfig()

diff --git a/Sources/App/Controllers/AdminController.swift b/Sources/App/Controllers/AdminController.swift
@@ -14,14 +14,7 @@ final class AdminController: RouteCollection {
         // Create a route-group that only allows
         // admin users to access the endpoint.
         let admin = router.grouped(
-            RouteRestrictionMiddleware<UserStatus, Payload, User>(
-                restrictions: [
-                    RouteRestriction.init(.GET, at: "users", allowed: [.admin]),
-                    RouteRestriction.init(at: "users", User.parameter, allowed: [.admin]),
-                    RouteRestriction.init(.PATCH, at: "attributes", Attribute.parameter, allowed: [.admin])
-                ],
-                parameters: [User.routingSlug: User.resolveParameter, Attribute.routingSlug: Attribute.resolveParameter]
-            ),
+            PermissionsMiddleware<UserStatus, Payload>(allowed: [.admin]),
             JWTVerificationMiddleware()
         )
 

diff --git a/Sources/App/Controllers/AuthController.swift b/Sources/App/Controllers/AuthController.swift
@@ -11,20 +11,16 @@ import JWT
 /// A route controller that handles user authentication with JWT.
 final class AuthController: RouteCollection {
     func boot(router: Router) throws {
-        let restrictions = openRegistration ? [] : [RouteRestriction<UserStatus>(.POST, at: any, "users", "register", allowed: [.admin])]
 
-        let auth = router.grouped(any, "users").grouped(
-            RouteRestrictionMiddleware<UserStatus, Payload, User>(
-                restrictions: restrictions,
-                parameters: [User.routingSlug: User.resolveParameter]
-            )
-        )
+        let auth = router.grouped(any, "users")
+        let restricted = auth.grouped(PermissionsMiddleware<UserStatus, Payload>(allowed: [.admin]))
         let protected = auth.grouped(JWTAuthenticatableMiddleware<User>())
 
-        auth.post(User.self, at: "register", use: register)
         auth.post("newPassword", use: newPassword)
         auth.post("accessToken", use: refreshAccessToken)
 
+        restricted.post(User.self, at: "register", use: register)
+
         protected.post("login", use: login)
         protected.get("status", use: status)