Switch to a more sensible error reporting system

1 files changed, 8 insertions, 9 deletions

diff --git a/tests/oidc-configuration.scm b/tests/oidc-configuration.scm
index f7b3bbc..983c0f7 100644
--- a/tests/oidc-configuration.scm
+++ b/tests/oidc-configuration.scm
@@ -1,4 +1,4 @@
-;; webid-oidc, implementation of the Solid specification
+;; disfluid, implementation of the Solid specification
 ;; Copyright (C) 2020, 2021  Vivien Kraus
 
 ;; This program is free software: you can redistribute it and/or modify
@@ -112,7 +112,8 @@
   \"code_challenge_methods_supported\": [
     \"plain\",
     \"S256\"
-  ]
+  ],
+  \"solid_oidc_supported\": \"https://solidproject.org/TR/solid-oidc\"
 }"))
       (else (exit 2))))
    (define cache-http-get
@@ -128,18 +129,16 @@
      (exit 3))
    (unless (jwks? jwks)
      (exit 4))
-   (let ((my-oidc (make-oidc-configuration
-                   "https://example.com/keys"
-                   "https://example.com/authorize"
-                   "https://example.com/token")))
+   (let ((my-oidc `((jwks_uri . "https://example.com/keys")
+                    (authorization_endpoint . "https://example.com/authorize")
+                    (token_endpoint . "https://example.com/token")
+                    (solid_oidc_supported . "https://solidproject.org/TR/solid-oidc"))))
      (receive (response response-body)
          (serve-oidc-configuration (time-utc->date (make-time time-utc 0 3600))
                                    my-oidc)
        (unless (eqv? (car (response-content-type response)) 'application/json)
          (exit 5))
-       (let ((parsed (stubs:json-string->scm response-body)))
-         (unless (oidc-configuration? parsed)
-           (exit 6))
+       (let ((parsed (the-oidc-configuration (stubs:json-string->scm response-body))))
          (unless (equal? (assq-ref parsed 'jwks_uri)
                          "https://example.com/keys")
            (exit 7))