demo using only webly

Author: awb99

TODO.md

@@ -4,7 +4,6 @@
 
 - https://docs.github.com/en/rest/reference/users
 
-https://rapidapi.com/category/Finance
 
 # links
 

demo/deps.edn

@@ -3,43 +3,30 @@
          "target/webly"]
 
  :deps {org.clojure/clojure    {:mvn/version "1.11.1"}
-        org.pinkgorilla/goldly {:mvn/version "0.4.621"}
+        org.pinkgorilla/webly {:mvn/version "0.5.655"}
         org.pinkgorilla/ui-tailwind {:mvn/version "0.0.5"}
-        org.pinkgorilla/ui-repl {:mvn/version "0.0.72"}
         org.pinkgorilla/oauth2 {:local/root "../" :deps/manifest :deps}
         }
 
 
- :aliases {:demo
-           {:extra-deps {nrepl/nrepl {:mvn/version "0.9.0"}
-                         cider/cider-nrepl {:mvn/version "0.28.3"}}
-            :exec-fn modular.system/start!
-            :exec-args {:profile "jetty"
-                        :config ["webly/config.edn"
-                                 "goldly/config.edn"
-                                 "oauth2/config.edn" ; oauth2 endpoints
-                                 "demo-config.edn" 
-                                 "/home/florian/repo/myLinux/myvault/goldly/oauth2-localhost.edn" ; oauth2 secrets
-                                 ]
-                        :services "demo-services.edn" #_"goldly/services.edn"}}
-
-           :npm-install
-           {:exec-fn goldly.app.build/goldly-build
-            :exec-args {:profile "npm-install"}}
-
-           :compile
-           {:exec-fn goldly.app.build/goldly-build
-            :exec-args {:profile "compile2"}}
-
-           :run 
-           {:exec-fn modular.system/start!
-            :exec-args {:config ["webly/config.edn"
-                                 "goldly/config.edn"
-                                 "oauth2/config.edn"
-                                 "demo-config.edn" ; oauth2 endpoints
-                                 "/home/florian/repo/myLinux/myvault/goldly/oauth2-localhost.edn" ; oauth2 secrets
-                                 ]
-                        :services "demo-run.edn"}}
+ :aliases {:webly {:exec-fn webly.app.app/webly-build
+                   :exec-args {:config [{}]
+                               :profile "npm-install"}}
+           
+           :npm-install {:exec-args {:profile "npm-install"}}
+           :compile {:exec-args {:profile "compile2"}}
+           :release {:exec-args {:profile "release"}}
+           :release-adv {:exec-args {:profile "release-adv"}}
+           :static {:exec-args {:profile "static"}}
+           :ci {:exec-args {:profile "ci"}}
+                      
+           :run {:exec-fn modular.system/start!
+                 :exec-args {:profile "jetty"
+                              :config ["oauth2/config.edn" ; oauth2 endpoints
+                                       "demo-config.edn"
+                                       "/home/florian/repo/myLinux/myvault/goldly/oauth2-localhost.edn" ; oauth2 secrets
+                                      ]
+                             :services "demo-services.edn"}}
 
            ;; token info
            :token-info-xero {:exec-args {:run demo.token/token-info

demo/resources/demo-config.edn

@@ -1,15 +1,4 @@
- {:goldly {; build
-           :lazy true
-            ; run
-           :autoload-cljs-dir [] 
-           ; it should not be necessary to define routes, as
-           ; we use the extension system here.  
-           ; todo: fix this bug in goldly.
-           :routes {:app {;"" demo.page.main/main-page
-                          }
-                    :api {}}}
-  
-  :users {:demo {:roles #{:logistic}
+ {:users {:demo {:roles #{:logistic}
                 :password "a231498f6c1f441aa98482ea0b224ffa" ; "1234"
                 :email ["[email protected]"]}
          :boss {:roles #{:logistic :supervisor :accounting}

demo/resources/demo-run.edn

@@ -6,26 +6,13 @@
   :timbre {:start (modular.log/timbre-config!
                    (:timbre/clj (deref (clip/ref :config))))}
 
-  ; goldly service returns {:ns-clj :webly           ; this are used to start clj-require and webly
-  ;                         :ws-watch :cljs-watch}   ; this is used when stopping goldly
-  :goldly {:start (goldly.app.run/start-goldly
-                   (deref (clip/ref :config))
-                   (:profile #ref [:modular]))
-           :stop (goldly.app.run/stop-goldly this)
-           ;:post-start (goldly-docs/print-version)
-           }
-  
-  ; load the :ns-clj defined by the user
-  :ns-require {:start (modular.require/require-namespaces
-                       (:ns-clj (deref (clip/ref :config))))}
 
   :webly {:start (webly.app.app/start-webly
-                  (:webly (clip/ref :goldly)) ; use webly config generated by goldly.
-                  (:profile #ref [:modular]))
-          :stop (webly.app.app/stop-webly this)}
+                (deref (clip/ref :config))
+                (:profile #ref [:modular]))
+        :stop (webly.app.app/stop-webly this)}
+
 
-  :nrepl {:start (nrepl.server/start-server :bind "0.0.0.0" :port 9100)
-          :stop (.close this)}
 
 ;
   }}

demo/resources/demo-services.edn

@@ -1,9 +1,7 @@
 {:name "demo"
- :cljs-routes  {"" demo.page.oauth2/page-oauth2
-                }
- :sci-cljs-ns [demo.page.oauth2
-               demo.helper.ui
-               demo.helper.oauth2]
-
- 
-}
+ ; build
+ :lazy true
+ :cljs-namespace [demo.page.oauth2]
+ :cljs-ns-bindings {'demo.page.oauth2 {'page-oauth2 demo.page.oauth2/page-oauth2}}
+ ; run
+ :cljs-routes  {"" demo.page.oauth2/page-oauth2}}

demo/resources/ext/demo.edn

@@ -10,6 +10,9 @@
 ;; OAUTH
 (defn demo-oauth []
   [block2 "oauth2"
+   [:h1 "users"]
+   [:p "user: florian pwd: 1234"]
+   [:p "user: boss pwd: 1234"]
    [user-login]
    [:div.border.border-blue-500.border-2.border-round ; .overflow-scroll
     [provider-status-grid [:google :github :xero :woo :wordpress
@@ -19,4 +22,6 @@
 (defn page-oauth2 [_]
   [:div.w-full.h-full
    [link-fn #(rf/dispatch [:login/dialog]) "login"]
-   [demo-oauth]])
+   [demo-oauth]])
+
+

demo/src/demo/page/oauth2.cljs

@@ -28,26 +28,13 @@
   clj-jwt/clj-jwt {:mvn/version "0.1.1"}; https://github.com/liquidz/clj-jwt
   ring-oauth2/ring-oauth2 {:mvn/version "0.1.5"}
   clj-oauth/clj-oauth {:mvn/version "1.5.2"}; copied over from REST
-
   ; pink-gorilla dependencies
   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.9"}}
 
-
  :aliases
- {:outdated {:extra-deps {com.github.liquidz/antq {:mvn/version "RELEASE"}}
-             :main-opts ["-m" "antq.core"]}
-
-  :nrepl {:extra-deps {nrepl/nrepl {:mvn/version "0.9.0"}
-                       cider/cider-nrepl {:mvn/version "0.28.3"}
-                       ;cider/nrepl {:mvn/version "0.3.0"}
-                       }
-          :main-opts  ["-m" "nrepl.cmdline"]}
-
-  :test {:extra-paths ["test"]
+ {:test {:extra-paths ["test"]
          :extra-deps {io.github.cognitect-labs/test-runner {:git/url "https://github.com/cognitect-labs/test-runner.git"
                                                             :sha "cc75980b43011773162b485f46f939dc5fba91e4"}}
          :main-opts ["-m" "cognitect.test-runner"]

deps.edn

@@ -10,11 +10,6 @@
                     'modular.oauth2.user.view {'user-login modular.oauth2.user.view/user-login}
                     'modular.oauth2.token.ui {'provider-status-grid modular.oauth2.token.ui/provider-status-grid}}
  ; run 
- :autoload-clj-ns [; websocket handler dont have (yet) a extension loader 
-                   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}

resources/ext/oauth2.edn

@@ -5,13 +5,13 @@
    [modular.oauth2.config :refer [entire-config]]
    [modular.oauth2.provider :refer [url-authorize]]))
 
-(defn handler-oauth2-start 
+(defn handler-oauth2-start
   "this handler is opened in a browser-popup window.
    It redirects to the oauth2 start url of the provider"
   [req]
   #_(info "oauth2/authorize-start: "
-        "params:" (:params req)
-        "query-params:" (:query-params req))
+          "params:" (:params req)
+          "query-params:" (:query-params req))
   ;(info "oauth2/authorize-start: req:" req)
   (let [{:keys [scheme server-name server-port uri]} req
         current-url (get-in req [:query-params "current-url"])

src/modular/oauth2/authorize/start_handler.clj

@@ -1,5 +1,5 @@
 (ns modular.oauth2.config
-  (:require 
+  (:require
    [modular.config :refer [get-in-config config-atom]]))
 
 ;; this config is here, so that we do not use modular.config in many different places.
@@ -8,11 +8,9 @@
 (defn token-path []
   (get-in-config [:oauth2 :token-path]))
 
-
 (defn provider-config [config provider]
   (get-in config [:oauth2 provider]))
 
-
 ;; local auth (username/password)
 
 (defn local-token-secret []
@@ -26,7 +24,6 @@
 (defn token-prefix [provider]
   (get-in-config [:oauth2 provider :token-prefix]))
 
-
 ;; full config
 ;; TODO: needs to be refactored
 ;; used in: 
@@ -38,24 +35,18 @@
 (defn get-config-server [server-profile-kw]
   (get-in-config [:oauth2 :server server-profile-kw]))
 
-
- (defn get-config-user
+(defn get-config-user
   ([]
    (get-config-user :default))
   ([user-id-kw]
    (get-in-config [:oauth2 :user user-id-kw])))
 
-
 (defn entire-config []
   @config-atom)
 
-
-
-
-(comment 
+(comment
   (token-path)
-  
-  
- ; 
+
+; 
   )
 

src/modular/oauth2/config.clj

@@ -1,12 +1,7 @@
 (ns modular.oauth2.config)
 
-
-
-(def config 
+(def config
   (atom {:name "Webly" ; shown in popup-window
-         
          }))
-
-
 (defn app-name []
   (:name @config))

src/modular/oauth2/config.cljs

@@ -10,7 +10,7 @@
 ; now
 
 (defn now-instant []
- (t/now))
+  (t/now))
 
 (defn add-seconds [dt n]
   (t/>> dt (t/new-duration n :seconds)))
@@ -21,9 +21,9 @@
 (comment
   (now-instant)
   (-> (now-instant) (add-seconds 1800))
-  
+
   (t/> (-> (now-instant) (add-minutes -1))
        (now-instant))
 
  ; 
-) 
+  )

src/modular/oauth2/date.cljc

@@ -5,7 +5,10 @@
    [modular.oauth2.authorize.start-handler :refer [handler-oauth2-start]]
    [modular.oauth2.authorize.redirect-handler :refer [handler-oauth2-redirect]]
    [modular.oauth2.authorize.token-handler :refer [token-handler]]
-   [modular.oauth2.token.save-handler :refer [handler-oauth2-save]]))
+   [modular.oauth2.token.save-handler :refer [handler-oauth2-save]]
+   [modular.oauth2.local.handler] ; side effects
+   [modular.oauth2] ; side effects
+   ))
 
 ; wrapping not needed and fucks up the redirection
 

src/modular/oauth2/handler.clj

@@ -7,8 +7,7 @@
    [buddy.sign.jwt :as jwt]
    ;[no.nsd.clj-jwt :as clj-jwt]
    [modular.permission.user :refer [get-user]]
-   [modular.oauth2.config :refer [local-token-secret user-list]]
-   ))
+   [modular.oauth2.config :refer [local-token-secret user-list]]))
 
 (defn pwd-hash [pwd]
   (-> (hash/blake2b-128 pwd)

src/modular/oauth2/local/pass.clj

@@ -7,8 +7,7 @@
    [ring.middleware.oauth2 :refer [wrap-oauth2]]
    [modular.writer :refer [write-status]]
    [modular.oauth2.provider :refer [ring-oauth2-config]]
-   [modular.oauth2.config :refer [entire-config]]
-   ))
+   [modular.oauth2.config :refer [entire-config]]))
 
 ; https://github.com/weavejester/ring-oauth2 
 

src/modular/oauth2/middleware.clj

@@ -9,7 +9,6 @@
 ; https://sellercentral.amazon.com/s
 ; https://sellingpartnerapi-na.amazon.com
 
-
 ; Amazon Vendor Central has a new, modern Selling Partner API (SP-API). The new API supports both sellers and vendors alike within a unified platform. Seller Central has had API access under the Amazon Marketplace Web Service (MWS) umbrella for years.
 ; IAM ARN. This is the identifier for the AWS IAM user we created in the last post (it should look something like arn:aws:iam::012345678987:user/sp-api…and no, that's not my real info ;)
 ; Again, go to Partner Network > Develop Apps, then open the dropdown next to the Edit button for your app and select Authorize. This will bring you to the authorization page, where you can generate a Login with Amazon (LWA) refresh token. This token lasts a long time, and will be used to generate new API access tokens (which expire quickly). Save the LWA refresh token somewhere—you're going to need it! Note that from the Develop Apps page, you can click View to see your LWA credentials…you'll need those too.

src/modular/oauth2/provider/amazon.cljc

@@ -11,7 +11,6 @@
                  :email))]
     id))
 
-
 (comment
   (require '[modular.oauth2.token.store :refer [load-token]])
     ; providers that have oidc