From dda67af5cce467fa797c52708f544d44325b857d Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 30 Jun 2023 12:04:03 +0200
Subject: [PATCH] :sparkles: Update oidc impl with latest buddy-sign
 improvements

---
 backend/src/app/auth/oidc.clj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/app/auth/oidc.clj b/backend/src/app/auth/oidc.clj
index 36cf0afe9..41e3c6355 100644
--- a/backend/src/app/auth/oidc.clj
+++ b/backend/src/app/auth/oidc.clj
@@ -25,8 +25,7 @@
    [app.tokens :as tokens]
    [app.util.json :as json]
    [app.util.time :as dt]
-   [buddy.core.keys :as keys]
-   [buddy.sign.jws :as jws]
+   [buddy.sign.jwk :as jwk]
    [buddy.sign.jwt :as jwt]
    [clojure.set :as set]
    [clojure.spec.alpha :as s]
@@ -109,7 +108,7 @@
 (defn- process-oidc-jwks
   [keys]
   (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)
                 (do
                   (l/warn :hint "unable to create public key"
@@ -392,7 +391,7 @@
 (defn- get-user-info
   [{:keys [provider]} tdata]
   (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")
                        (:client-secret provider)
                        (get-in provider [:jwks kid]))]