websocket dep bump

Author: awb99

deps.edn

@@ -31,7 +31,7 @@
   ; pink-gorilla dependencies
   org.pinkgorilla/modular {:mvn/version "0.0.40"}
   org.pinkgorilla/permission {:mvn/version "0.0.15"}
-  org.pinkgorilla/websocket {:mvn/version "0.0.9"}}
+  org.pinkgorilla/websocket {:mvn/version "0.0.12"}}
 
  :aliases
  {:test {:extra-paths ["test"]

resources/ext/oauth2.edn

@@ -18,6 +18,13 @@
                          "save-token" {:post modular.oauth2.handler/handler-oauth2-save-wrapped}
                          ["redirect/" :provider] modular.oauth2.handler/handler-oauth2-redirect-wrapped  ;  either client OR server side
                          }}
+ 
+ ;:clj-services {:name "oauth2"
+ ;               :permission  nil
+ ;               :symbols [ta.studio.template/available-templates
+ ;                         ta.studio.template/get-options
+ ;                         ta.studio.subscription/subscribe-live
+ ;                         ta.studio.subscription/unsubscribe]}
  ;
  }
 

src/modular/oauth2.cljc

@@ -2,8 +2,6 @@
   (:require
    #?(: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.persist.protocol :refer [save loadr]])
    #?(:clj  [modular.oauth2.config :as config])
    #?(:clj  [modular.oauth2.local.handler])
    #?(:cljs [modular.oauth2.request])

src/modular/oauth2/config.cljs

@@ -3,5 +3,7 @@
 (def config
   (atom {:name "Webly" ; shown in popup-window
          }))
+
+
 (defn app-name []
   (:name @config))

src/modular/oauth2/local/function.clj

@@ -0,0 +1,49 @@
+(ns modular.oauth2.local.function
+   (:require
+    [cheshire.core :as json]
+    [taoensso.timbre :refer [debug debugf info infof error]]
+    [clj-jwt.core :refer [str->jwt]]
+    [modular.permission.user :refer [find-user-id-via-email]]
+    [modular.permission.session :refer [set-user!]]
+    [modular.oauth2.local.pass :refer [get-token]]
+    [modular.oauth2.token.info :refer [tokens-summary-map]]))
+
+  ; todo improve.
+; not used currently.
+
+(defn login-local
+  [{:as req :keys [event id ?data ring-req ?reply-fn send-fn uid]}]
+  (debugf ":login/local %s" ?data)
+  (let [{:keys [username password]} ?data
+        login-result (get-token username password)]
+    (info "login/local: " login-result " uid: " uid)
+    (when-let [user (:user login-result)]
+      (set-user! uid user))
+    (send-response req :login/local login-result)))
+
+(defmethod -event-msg-handler :login/oidc
+  [{:as req :keys [event id ?data ring-req ?reply-fn send-fn uid]}]
+  (debugf ":login/oidc %s" ?data)
+  (let [{:keys [id-token]} ?data
+        login-result (str->jwt id-token)
+        email (get-in login-result [:claims :email])]
+    (debug "login result oidc: " login-result " uid: " uid)
+    (infof "login/oidc email: %s uid: %s" email uid)
+    (if-let [user (find-user-id-via-email email)]
+      (let [user (name user)]
+        (set-user! uid user)
+        (send-response req
+                       :login/local {:user user :token ?data}))
+      (do
+        (error "no user found for oidc login with email: " email)
+        (send-response req
+                       :login/local {:error :user-not-found
+                                     :error-message (str "No user found for [" email "].")})))))
+
+(defmethod -event-msg-handler :tokens/summary
+  [{:as req :keys [event id ?data ring-req ?reply-fn send-fn uid]}]
+  (debugf ":tokens/summary %s" ?data)
+  (let [{:keys [providers]} ?data
+        summary (tokens-summary-map providers)]
+    (infof ":tokens providers: %s summary: %s" providers summary)
+    (send-response req :tokens/summary summary)))

src/modular/oauth2/local/handler.clj

@@ -3,10 +3,9 @@
    [cheshire.core :as json]
    [taoensso.timbre :refer [debug debugf info infof error]]
    [clj-jwt.core :refer [str->jwt]]
-   [modular.ws.core :refer [send-response]]
-   [modular.ws.msg-handler :refer [-event-msg-handler]]
    [modular.permission.user :refer [find-user-id-via-email]]
    [modular.permission.websocket :refer [set-user!]]
+   [modular.ws.msg-handler :refer [-event-msg-handler send-response]]
    [modular.oauth2.local.pass :refer [get-token]]
    [modular.oauth2.token.info :refer [tokens-summary-map]]))