From bae1843f1a1d644fb3bd4f8c40b1dbb900aa3325 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 1 Aug 2021 14:51:28 +0200
Subject: 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.
---
 tests/dpop-proof-valid-ath.scm | 48 ++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

(limited to 'tests/dpop-proof-valid-ath.scm')

diff --git a/tests/dpop-proof-valid-ath.scm b/tests/dpop-proof-valid-ath.scm
index 259190f..1e15e17 100644
--- a/tests/dpop-proof-valid-ath.scm
+++ b/tests/dpop-proof-valid-ath.scm
@@ -16,9 +16,9 @@
 
 (use-modules (webid-oidc dpop-proof)
              (webid-oidc access-token)
-             (webid-oidc jti)
              (webid-oidc jwk)
              (webid-oidc testing)
+             ((webid-oidc parameters) #:prefix p:)
              (web uri)
              (srfi srfi-19)
              (web response))
@@ -29,32 +29,30 @@
    (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#frag")
-      #:iat (time-utc->date (make-time time-utc 0 0))
-      #:access-token access-token))
+     (parameterize ((p:current-date 0))
+       (issue-dpop-proof
+        jwk
+        #:alg 'RS256
+        #:htm 'GET
+        #:htu (string->uri "https://example.com/res#frag")
+        #:access-token access-token)))
    (define decoded
-     (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)))
    (unless decoded
      (exit 1))))
-- 
cgit v1.2.3