config tuning

Author: awb99

deps.edn

@@ -30,11 +30,11 @@
   clj-oauth/clj-oauth {:mvn/version "1.5.2"}; copied over from REST
 
   ; pink-gorilla dependencies
-  org.pinkgorilla/modular {:mvn/version "0.0.39"}
+  org.pinkgorilla/modular {:mvn/version "0.0.40"}
   org.pinkgorilla/permission {:mvn/version "0.0.15"}
   ; TODO: move frontend->somewhere else.
   ;modular/frontend {:local/root "../frontend" :deps/manifest :deps}
-  org.pinkgorilla/websocket {:mvn/version "0.0.8"}}
+  org.pinkgorilla/websocket {:mvn/version "0.0.9"}}
 
 
  :aliases

resources/ext/oauth2.edn

@@ -15,6 +15,7 @@
                    modular.oauth2.local.handler
                    modular.oauth2 ; side-effects
                    ]
+  
  :api-routes {"oauth2/" {["start/" :provider] {:get modular.oauth2.handler/handler-oauth2-start-wrapped}
                          "token"  {:get modular.oauth2.handler/token-handler-wrapped}
                              ;  ["redirect/" :provider] {:get :oauth2/redirect}

src/modular/oauth2.cljc

@@ -3,8 +3,8 @@
    #?(:clj  [taoensso.timbre :refer [debug info warn error]])
    #?(:cljs [taoensso.timbre :refer-macros [debug info warn error]])
    #?(:clj  [nano-id.core :refer [nano-id]])
-   #?(:clj  [modular.config :as config])
    #?(:clj  [modular.persist.protocol :refer [save loadr]])
+   #?(:clj  [modular.oauth2.config :as config])
    #?(:clj  [modular.oauth2.local.handler])
    #?(:cljs [modular.oauth2.request])
    #?(:cljs [modular.oauth2.user.subscriptions])
@@ -16,14 +16,14 @@
 
 #?(:clj
    (defn get-config-server [server-profile-kw]
-     (config/get-in-config [:oauth2 :server server-profile-kw])))
+     (config/get-config-server server-profile-kw)))
 
 #?(:clj
    (defn get-config-user
      ([]
       (get-config-user :default))
      ([user-id-kw]
-      (config/get-in-config [:oauth2 :user user-id-kw])))
+      (config/get-config-user user-id-kw)))
 
 ;
    )

src/modular/oauth2/config.clj

@@ -35,6 +35,17 @@
 ;; modular.oauth2.authorize.start-handler
 ;; modular.oauth2.middleware
 
+(defn get-config-server [server-profile-kw]
+  (get-in-config [:oauth2 :server server-profile-kw]))
+
+
+ (defn get-config-user
+  ([]
+   (get-config-user :default))
+  ([user-id-kw]
+   (get-in-config [:oauth2 :user user-id-kw])))
+
+
 (defn entire-config []
   @config-atom)