webly 0.9 fixes

Author: awb99

.gitignore

@@ -32,4 +32,4 @@ karma.conf.js
 package.json
 package-lock.json
 shadow-cljs.edn
-goldly_bindings_generated.cljs
+.gorilla

demo/deps.edn

@@ -3,13 +3,12 @@
          "target/webly"]
 
  :deps {org.clojure/clojure    {:mvn/version "1.11.3"}
-        org.pinkgorilla/webly {:mvn/version "0.8.707"}
+        org.pinkgorilla/webly {:mvn/version "0.9.716"}
         org.pinkgorilla/ui-tailwind {:mvn/version "0.1.8"}
-        org.pinkgorilla/websocket {:mvn/version "0.0.23"} ; more up to date than in webly
         org.pinkgorilla/oauth2 {:local/root "../" :deps/manifest :deps}
         nrepl/nrepl {:mvn/version "1.2.0"}}
 
- :aliases {:npm-install {:exec-fn webly.app.app/webly-build
+ :aliases {:npm-install {:exec-fn webly.spa/webly-build
                          :exec-args {:config [{}]
                                      :profile "npm-install"}}
            :demo {:exec-fn modular.system/start!

demo/resources/demo-services.edn

@@ -1,10 +1,11 @@
 {:modular (modular.system/modular-env)  ; {:profile "jetty"  :config ["demo.edn" "secrets.edn"]}
  ;:secrets #include "secrets.edn" ;; externalised and usually "mounted" as a docker/kubernetes secret
  :components
- {:config {:start (modular.config/load-config! (:config #ref [:modular]))}
+ {:config1 {:start (modular.config/load-config! (:config #ref [:modular]))}
+  :config {:start (deref (clip/ref :config1))}
 
   :timbre {:start (modular.log/timbre-config!
-                   (:timbre/clj (deref (clip/ref :config))))}
+                   (:timbre/clj (clip/ref :config)))}
 
   :exts {:start (extension/discover)}
 
@@ -33,14 +34,14 @@
 
   :oauth2 {:start (token.oauth2.service/start-oauth2-service
                    {:clj (clip/ref :clj-service)
-                    :providers (:oauth2 (:token (deref (clip/ref :config))))
-                    :store-path ".webly/tokenstore"
+                    :providers (:oauth2 (:token (clip/ref :config)))
+                    :store-path ".gorilla/tokenstore"
                     :store-role nil ; #{}
                     })}
 
-  :webly {:start (webly.app.app/start-webly
-                  (clip/ref :exts)
-                  (deref (clip/ref :config))
+  :webly {:start (webly.spa/start-webly
+                  {:exts (clip/ref :exts)}
+                  (clip/ref :config)
                   (:profile #ref [:modular]))
           :stop (webly.app.app/stop-webly this)}
 

deps.edn

@@ -8,8 +8,7 @@
   reagent/reagent {:mvn/version "1.1.1"} ; https://github.com/reagent-project/reagent
   com.cemerick/url {:mvn/version "0.1.1"}  ; url query-strings
   cljs-ajax/cljs-ajax {:mvn/version "0.8.4"} ; needed for re-frame/http-fx
-  ;simplevalue/letsencrypt {:git/url "https://github.com/SimpleValue/sv.letsencrypt.git"
-  ;                         :sha "8b1a85846acaaa37a58b054f2372d8fde0663b75"}
+  babashka/fs {:mvn/version "0.5.22"} ; create dir
 
   ;; JWT / auth deps
   buddy/buddy-core {:mvn/version "1.10.1"}
@@ -24,7 +23,7 @@
   ; clj-oauth/clj-oauth {:mvn/version "1.5.2"}; copied over from REST
   ; pink-gorilla dependencies
   org.pinkgorilla/modular {:mvn/version "0.2.61"} ; for edn saving (with time formats encoding added)
-  org.pinkgorilla/clj-service {:mvn/version "0.4.21"} ; brings permission + websocket
+  org.pinkgorilla/clj-service {:mvn/version "0.4.22"} ; brings permission + websocket
   }
 
  :aliases

resources/ext/oauth2.edn

@@ -12,19 +12,29 @@
                     token.identity.ui {'user-icon-with-login token.identity.ui/user-icon-with-login
                                        'show-login-dialog  token.identity.ui/show-login-dialog}}
  ; run 
- :api-routes {; oauth redirect is stateless,
+  
+ :web/routes [; oauth redirect is stateless,
               ; all other endpoints are implemented via clj-service which can be started at runtime 
               ; if the service gets started.
-              "oauth2/" {;["start/" :provider] {:get modular.oauth2.handler/handler-oauth2-start-wrapped}
+              ["/api/oauth2/"
+               ["redirect/:provider" {;Path Param: :provider will be extracted and passed to user-handler under :path-params.
+                                      :handler  token.oauth2.handler.redirect/handler-oauth2-redirect ;  either client OR server side
+                                      :middleware [; this was ws-wrap
+                                                   ;webserver.middleware.api/wrap-api-handler
+                                                   [ring.middleware.defaults/wrap-defaults ring.middleware.defaults/site-defaults] 
+                                                   ring.middleware.keyword-params/wrap-keyword-params
+                                                   ring.middleware.params/wrap-params] 
+                                      }]
+               ;["start/" :provider] {:get modular.oauth2.handler/handler-oauth2-start-wrapped}
                          ;"token"  {:get modular.oauth2.handler/token-handler-wrapped}
                              ;  ["redirect/" :provider] {:get :oauth2/redirect}
                          ;"save-token" {:post modular.oauth2.handler/handler-oauth2-save-wrapped}
-                         ["redirect/" :provider] token.oauth2.handler/handler-oauth2-redirect-wrapped  ;  either client OR server side
-                         }}
+               ]]
 
-:cljs-service {;:config-fn webly.spa.service/cljs-config-simple
-               :start-fn token.identity.user/init-user!
-               :default-config {}}
+
+ :cljs-service {;:config-fn webly.spa.service/cljs-config-simple
+                :start-fn token.identity.user/init-user!
+                :default-config {}}
 
 
  }

TODO.md src-unused/TODO.md

@@ -1,6 +1,6 @@
 { 
 ; creds (set them in creds.edn resource)
- :oauth2 {:token-path ".webly/tokenstore/"
+ :oauth2 {:token-path ".gorilla/tokenstore/"
           :github {;https://docs.github.com/en/rest/reference/permissions-required-for-github-apps
                    :token-prefix "token "}
           :google {:token-prefix "Bearer "}

src-unused/config.edn

@@ -21,7 +21,8 @@
         qp (:query-params req)]
     (debug "oauth2/authorize-response: params:" p)
     (debug "oauth2/authorize-response: query-params:" qp)
-    (let [provider (get-in req [:route-params :provider])
+    (let [;provider (get-in req [:route-params :provider]) ; bidi style
+          provider (get-in req [:path-params :provider]) ; reitit style
           res (response/content-type {:status 200
                                       :body (page-oauth2-redirect provider)}
                                      "text/html")]

src/token/oauth2/handler.clj src-unused/handler.clj

@@ -1,19 +1,15 @@
 (ns token.oauth2.store
   (:require
    [taoensso.timbre :as timbre :refer [info]]
-   [clojure.java.io :as io]
+   [babashka.fs :as fs]
    [clj-service.core :refer [expose-functions]]
    [modular.persist.protocol :refer [save loadr]]
    [modular.persist.edn] ; side effects to be able to save edn files
    [token.oauth2.token :refer [sanitize-token]]))
 
-(defn- ensure-directory [path]
-  (when-not (.exists (io/file path))
-    (.mkdir (java.io.File. path))))
-
 (defn create-store [{:keys [store-path clj store-role] :as this}]
   ;(println "token store: " path)
-  (ensure-directory store-path)
+  (fs/create-dirs store-path)
   (when clj
     (info "exposing oauth2-store service permission: " store-role " .. ")
     (expose-functions clj