Switch to a more sensible error reporting system

1 files changed, 15 insertions, 16 deletions

diff --git a/tests/token-endpoint-issue.scm b/tests/token-endpoint-issue.scm
index 9438dfe..3b21f9b 100644
--- a/tests/token-endpoint-issue.scm
+++ b/tests/token-endpoint-issue.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
@@ -17,6 +17,7 @@
 (use-modules (webid-oidc token-endpoint)
              (webid-oidc authorization-code)
              (webid-oidc dpop-proof)
+             (webid-oidc access-token)
              (webid-oidc jwk)
              (webid-oidc jws)
              (webid-oidc jti)
@@ -42,16 +43,18 @@
    (define issuer (string->uri "https://issuer.token-endpoint-issue.scm"))
    (define validity 3600)
    (define authz
-     (issue-authorization-code
-      alg key
-      (time-utc->date (make-time time-utc 0 120))
-      subject
-      client))
+     (parameterize ((p:current-date 0))
+       (issue-authorization-code
+        key
+        #:alg alg
+        #:validity 120
+        #:webid subject
+        #:client-id client)))
    (define endpoint
      (make-token-endpoint
       (string->uri "https://token-endpoint-issue.scm/token")
       issuer alg key validity))
-   (receive (response response-body user error)
+   (receive (response response-body . _)
        ;; The code is fake!
        (let ((dpop
               (parameterize ((p:current-date 0))
@@ -72,7 +75,7 @@
             "grant_type=authorization_code&code=fake")))
      (unless (eq? (response-code response) 400)
        (exit 3))
-     (receive (response response-body user error)
+     (receive (response response-body . _)
          (let ((dpop
                 (parameterize ((p:current-date 10))
                   (issue-dpop-proof
@@ -106,12 +109,8 @@
                                            (lambda (h) key))))
              (unless access-token
                (exit 8))
-             (let ((access-token-cnf (assq-ref (jws-payload access-token)
-                                               'cnf)))
-               (unless access-token-cnf
+             (let ((access-token-cnf/jkt (access-token-cnf/jkt access-token)))
+               (unless access-token-cnf/jkt
                  (exit 9))
-               (let ((access-token-cnf/jkt (assq-ref access-token-cnf 'jkt)))
-                 (unless access-token-cnf/jkt
-                   (exit 10))
-                 (unless (string=? access-token-cnf/jkt (jkt client-key))
-                   (exit 11)))))))))))
+               (unless (string=? access-token-cnf/jkt (jkt client-key))
+                 (exit 10))))))))))