dep bumps

pink-gorilla · Jul 1, 2024 · 97988d0 · 97988d0
1 parent 33914db
commit 97988d0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/demo/deps.edn b/demo/deps.edn
@@ -2,8 +2,8 @@
          "resources"
          "target/webly"]
 
- :deps {org.clojure/clojure    {:mvn/version "1.11.1"}
-        org.pinkgorilla/webly {:mvn/version "0.6.692"}
+ :deps {org.clojure/clojure    {:mvn/version "1.11.3"}
+        org.pinkgorilla/webly {:mvn/version "0.7.693"}
         org.pinkgorilla/ui-tailwind {:mvn/version "0.1.8"}
         org.pinkgorilla/oauth2 {:local/root "../" :deps/manifest :deps}
         nrepl/nrepl {:mvn/version "1.2.0"}}

diff --git a/demo/resources/demo-services.edn b/demo/resources/demo-services.edn
@@ -26,32 +26,11 @@
                         (clip/ref :permission)
                         (clip/ref :exts))}
 
-  #_:identity/local #_{:start (token.identity.local/start-local-identity
-                               {:permission (clip/ref :permission)
-                                :clj (clip/ref :clj-service)
-                                :secret "AbHzj834ri9"})}
-
-  #_:identity/oidc #_{:start (token.identity.oidc/start-oidc-identity
-                              {:permission (clip/ref :permission)
-                               :clj (clip/ref :clj-service)})}
-
   :identity {:start (token.identity.service/start-identity-service
                      {:permission (clip/ref :permission)
                       :clj (clip/ref :clj-service)
                       :secret "AbHzj834ri9"})}
 
-  #_:oauth2/token-store #_{:start (token.oauth2.store/create-store {:clj (clip/ref :clj-service)
-                                                                    :store-path ".webly/tokenstore"
-                                                                    :store-role nil ; #{}
-                                                                    })}
-
-  #_:oauth2 #_{:start (token.oauth2.core/start-oauth2-providers
-                       {:clj (clip/ref :clj-service)
-                        :store (clip/ref :oauth2/token-store)
-                        :providers (:oauth2 (:token (deref (clip/ref :config))))
-                    ;:providers {:google {:client-id "" :client-secret ""}}
-                        })}
-
   :oauth2 {:start (token.oauth2.service/start-oauth2-service
                    {:clj (clip/ref :clj-service)
                     :providers (:oauth2 (:token (deref (clip/ref :config))))
@@ -60,7 +39,6 @@
                     :store-role nil ; #{}
                     })}
 
-
   :webly {:start (webly.app.app/start-webly
                   (clip/ref :exts)
                   (deref (clip/ref :config))

diff --git a/demo/resources/dev-services.edn b/demo/resources/dev-services.edn
@@ -0,0 +1,31 @@
+{: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
+ {
+
+  ; a list of services that in demo-serivces are bundled.
+  ; useful for debugging (currently not used)
+
+  :identity/local {:start (token.identity.local/start-local-identity
+                           {:permission (clip/ref :permission)
+                            :clj (clip/ref :clj-service)
+                            :secret "AbHzj834ri9"})}
+
+  :identity/oidc {:start (token.identity.oidc/start-oidc-identity
+                          {:permission (clip/ref :permission)
+                           :clj (clip/ref :clj-service)})}
+
+  :oauth2/token-store {:start (token.oauth2.store/create-store {:clj (clip/ref :clj-service)
+                                                                :store-path ".webly/tokenstore"
+                                                                :store-role nil ; #{}
+                                                                })}
+
+  :oauth2 {:start (token.oauth2.core/start-oauth2-providers
+                   {:clj (clip/ref :clj-service)
+                    :store (clip/ref :oauth2/token-store)
+                    :providers (:oauth2 (:token (deref (clip/ref :config))))
+                      ;:providers {:google {:client-id "" :client-secret ""}}
+                    })}
+
+;
+  }}
diff --git a/deps.edn b/deps.edn
@@ -26,8 +26,7 @@
   ; clj-oauth/clj-oauth {:mvn/version "1.5.2"}; copied over from REST
   ; pink-gorilla dependencies
   org.pinkgorilla/modular {:mvn/version "0.2.56"} ; for edn saving (with time formats encoding added)
-  org.pinkgorilla/clj-service {:mvn/version "0.3.18"} ; brings permission + websocket
-  org.pinkgorilla/permission {:mvn/version "0.2.19"} ; force higher version of permission (clj-service is outdated)
+  org.pinkgorilla/clj-service {:mvn/version "0.3.20"} ; brings permission + websocket
   }
 
  :aliases