Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-10 09:08:31 -05:00
Code Issues Activity

✨ Update oidc impl with latest buddy-sign improvements

Browse source
This commit is contained in:
Andrey Antukh 2023-06-30 12:04:03 +02:00
parent cadcc1607d
commit dda67af5cc
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
backend/src/app/auth/oidc.clj
View file

@ -25,8 +25,7 @@
[app.tokens :as tokens] [app.tokens :as tokens]
[app.util.json :as json] [app.util.json :as json]
[app.util.time :as dt] [app.util.time :as dt]
[buddy.core.keys :as keys] [buddy.sign.jwk :as jwk]
[buddy.sign.jws :as jws]
[buddy.sign.jwt :as jwt] [buddy.sign.jwt :as jwt]
[clojure.set :as set] [clojure.set :as set]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
@ -109,7 +108,7 @@
(defn- process-oidc-jwks (defn- process-oidc-jwks
[keys] [keys]
(reduce (fn [result {:keys [kid] :as kdata}] (reduce (fn [result {:keys [kid] :as kdata}]
(let [pkey (ex/try! (keys/jwk->public-key kdata))] (let [pkey (ex/try! (jwk/public-key kdata))]
(if (ex/exception? pkey) (if (ex/exception? pkey)
(do (do
(l/warn :hint "unable to create public key" (l/warn :hint "unable to create public key"
@ -392,7 +391,7 @@
(defn- get-user-info (defn- get-user-info
[{:keys [provider]} tdata] [{:keys [provider]} tdata]
(try (try
(let [{:keys [kid alg] :as theader} (jws/decode-header (:token/id tdata))] (let [{:keys [kid alg] :as theader} (jwt/decode-header (:token/id tdata))]
(when-let [key (if (str/starts-with? (name alg) "hs") (when-let [key (if (str/starts-with? (name alg) "hs")
(:client-secret provider) (:client-secret provider)
(get-in provider [:jwks kid]))] (get-in provider [:jwks kid]))]