compose routes to add authentication separately

Author: zerokarmaleft

project.clj

@@ -45,7 +45,7 @@
                  ;; Internationalization
                  [com.taoensso/tower        "2.0.1"]]
 
-  :ring {:handler patronage.handler/app-handler
+  :ring {:handler patronage.handler/auth-app-handler
          :init    patronage.handler/init
          :destroy patronage.handler/destroy}
 

src/patronage/handler.clj

@@ -4,10 +4,10 @@
             [compojure.core              :refer :all]
             [compojure.handler           :as    handler]
             [compojure.route             :as    route]
-            [patronage.auth              :refer :all]
+            [patronage.auth.github       :refer :all]
             [patronage.models.logging    :as    logging]
             [patronage.models.migrations :as    migrations]
-            [patronage.routes.api        :refer [api-routes]]
+            [patronage.routes.api        :refer [api-v1-routes]]
             [ragtime.core                :refer [migrate-all]]
             [ring.util.response          :as    response]
             [taoensso.timbre             :as    timbre]))
@@ -40,10 +40,12 @@
   []
   (timbre/info "patronage is shutting down..."))
 
-(def app-handler (-> (routes api-routes
-                             auth-routes
+(def app-handler (-> (routes api-v1-routes
                              app-routes)
-                     (friend/requires-scheme-with-proxy :https)
-                     (friend/authenticate {:allow-anon? true
-                                           :workflows   [github-workflow]})
                      handler/site))
+
+(def auth-app-handler (-> app-handler
+                          (friend/requires-scheme-with-proxy :https)
+                          (friend/authenticate
+                           {:allow-anon? true
+                            :workflows   [github-workflow]})))

src/patronage/repl.clj

@@ -15,7 +15,7 @@
   ;; server is forced to re-resolve the symbol in the var rather than
   ;; having its own copy. When the root binding changes, the server
   ;; picks it up without having to restart.
-  (-> #'app-handler
+  (-> #'auth-app-handler
     ;; Makes static assets in $PROJECT_DIR/resources/public/ available.
     (wrap-file "resources")
     ;; Content-Type, Content-Length, and Last Modified headers for files in body

src/patronage/routes/api.clj

@@ -57,6 +57,9 @@
 
 (defroutes api-routes
   (ANY ["/bids/:id" :id #".*"] [id]
-       (friend/authenticated (bid id)))
+       (bid id))
   (ANY "/bids" []
-       (friend/authenticated bids)))
+       bids))
+
+(defroutes api-v1-routes
+  (context "/api/v1" [] (friend/authorize #{::user} api-routes)))

test/patronage/auth_test.clj test/patronage/auth/github_test.clj

@@ -1,10 +1,10 @@
-(ns patronage.auth-test
-  (:require [clojure.test      :refer [deftest
-                                       is
-                                       testing]]
-            [patronage.auth    :refer [auth-routes
-                                       github-workflow]]
-            [ring.mock.request :refer [request]]))
+(ns patronage.auth.github-test
+  (:require [clojure.test          :refer [deftest
+                                           is
+                                           testing]]
+            [patronage.auth.github :refer [auth-routes
+                                           github-workflow]]
+            [ring.mock.request     :refer [request]]))
 
 (deftest test-auth-handler
   (let [base-url "https://localhost:3443"]