OIDC configuration: use GOOPS and document it

1 files changed, 25 insertions, 22 deletions

diff --git a/tests/resource-server.scm b/tests/resource-server.scm
index a8032b1..89df999 100644
--- a/tests/resource-server.scm
+++ b/tests/resource-server.scm
@@ -14,23 +14,25 @@
 ;; You should have received a copy of the GNU Affero General Public License
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-(use-modules (webid-oidc provider-confirmation)
-             (webid-oidc jti)
-             (webid-oidc jwk)
-             (webid-oidc jws)
-             (webid-oidc oidc-configuration)
-             (webid-oidc access-token)
-             (webid-oidc dpop-proof)
-             (webid-oidc resource-server)
-             (webid-oidc testing)
-             ((webid-oidc parameters) #:prefix p:)
-             (web uri)
-             (web request)
-             (srfi srfi-19)
-             (web response)
-             (ice-9 optargs)
-             (ice-9 receive)
-             (oop goops))
+(define-module (tests resource-server)
+  #:use-module (webid-oidc provider-confirmation)
+  #:use-module (webid-oidc jti)
+  #:use-module (webid-oidc jwk)
+  #:use-module (webid-oidc jws)
+  #:use-module (webid-oidc oidc-configuration)
+  #:use-module (webid-oidc access-token)
+  #:use-module (webid-oidc dpop-proof)
+  #:use-module (webid-oidc resource-server)
+  #:use-module (webid-oidc testing)
+  #:use-module ((webid-oidc parameters) #:prefix p:)
+  #:use-module (web uri)
+  #:use-module (web request)
+  #:use-module (srfi srfi-19)
+  #:use-module (web response)
+  #:use-module (ice-9 optargs)
+  #:use-module (ice-9 receive)
+  #:use-module (oop goops)
+  #:duplicates (merge-generics))
 
 (with-test-environment
  "resource-server"
@@ -40,10 +42,11 @@
    (define jwks (make <jwks> #:keys (list idp-key)))
    (define jwks-uri (string->uri "https://identity.provider/keys"))
    (define oidc-config
-     `((jwks_uri . ,(uri->string jwks-uri))
-       (authorization_endpoint . "https://identity.provider/authorize")
-       (token_endpoint . "https://identity.provider/token")
-       (solid_oidc_supported . "https://solidproject.org/TR/solid-oidc")))
+     (make <oidc-configuration>
+       #:jwks-uri jwks-uri
+       #:authorization-endpoint "https://identity.provider/authorize"
+       #:token-endpoint "https://identity.provider/token"
+       #:solid-oidc-supported "https://solidproject.org/TR/solid-oidc"))
    (define oidc-config-uri
      (string->uri
       "https://identity.provider/.well-known/openid-configuration"))
@@ -51,7 +54,7 @@
    (define* (http-get uri #:key (headers '()))
      (define exp (time-utc->date (make-time time-utc 0 3600)))
      (cond ((equal? uri oidc-config-uri)
-            (serve-oidc-configuration exp oidc-config))
+            (serve oidc-config exp))
            ((equal? uri jwks-uri)
             (serve jwks exp))
            (else (exit 1))))