Use guile parameters

With parameters, the API does not need to care about the directory
where to load files and how to get the time.

1 files changed, 23 insertions, 25 deletions

diff --git a/tests/dpop-proof-invalid-ath.scm b/tests/dpop-proof-invalid-ath.scm
index e802ffe..90cd168 100644
--- a/tests/dpop-proof-invalid-ath.scm
+++ b/tests/dpop-proof-invalid-ath.scm
@@ -16,11 +16,11 @@
 
 (use-modules (webid-oidc dpop-proof)
              (webid-oidc access-token)
-             (webid-oidc jti)
              (webid-oidc jwk)
              (webid-oidc testing)
              (webid-oidc errors)
              ((webid-oidc stubs) #:prefix stubs:)
+             ((webid-oidc parameters) #:prefix p:)
              (web uri)
              (srfi srfi-19)
              (web response))
@@ -31,25 +31,24 @@
    (define jwk (generate-key #:n-size 2048))
    (define idp-key (generate-key #:n-size 2048))
    (define cnf (jkt jwk))
-   (define blacklist (make-jti-list))
    (define access-token
-     (issue-access-token
-      idp-key
-      #:alg 'RS256
-      #:webid "https://data.provider/subject"
-      #:iss "https://identity.provider"
-      #:iat 10
-      #:exp 3610
-      #:client-key jwk
-      #:client-id "https://client"))
+     (parameterize ((p:current-date 10))
+       (issue-access-token
+        idp-key
+        #:alg 'RS256
+        #:webid "https://data.provider/subject"
+        #:iss "https://identity.provider"
+        #:validity 3600
+        #:client-key jwk
+        #:client-id "https://client")))
    (define proof
-     (issue-dpop-proof
-      jwk
-      #:alg 'RS256
-      #:htm 'GET
-      #:htu (string->uri "https://example.com/res?query")
-      #:iat (time-utc->date (make-time time-utc 0 0))
-      #:access-token "aaaaaaaaaaaaaaa"))
+     (parameterize ((p:current-date 0))
+       (issue-dpop-proof
+        jwk
+        #:alg 'RS256
+        #:htm 'GET
+        #:htu (string->uri "https://example.com/res?query")
+        #:access-token "aaaaaaaaaaaaaaa")))
    (with-exception-handler
        (lambda (error)
          (let ((cause
@@ -61,13 +60,12 @@
                         (equal? (dpop-invalid-access-token-hash-access-token cause) access-token))
              (exit 1))))
      (lambda ()
-       (dpop-proof-decode (time-utc->date (make-time time-utc 0 10))
-                          blacklist
-                          'GET
-                          (string->uri "https://example.com/res?query")
-                          proof
-                          cnf
-                          #:access-token access-token)
+       (parameterize ((p:current-date 10))
+         (dpop-proof-decode 'GET
+                            (string->uri "https://example.com/res?query")
+                            proof
+                            cnf
+                            #:access-token access-token))
        (exit 2))
      #:unwind? #t
      #:unwind-for-type &cannot-decode-dpop-proof)))