From bae1843f1a1d644fb3bd4f8c40b1dbb900aa3325 Mon Sep 17 00:00:00 2001 From: Vivien Kraus 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. --- src/scm/webid-oidc/authorization-endpoint.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/scm/webid-oidc/authorization-endpoint.scm') diff --git a/src/scm/webid-oidc/authorization-endpoint.scm b/src/scm/webid-oidc/authorization-endpoint.scm index 9ff994c..d5591b7 100644 --- a/src/scm/webid-oidc/authorization-endpoint.scm +++ b/src/scm/webid-oidc/authorization-endpoint.scm @@ -20,6 +20,7 @@ #:use-module (webid-oidc jwk) #:use-module (webid-oidc authorization-code) #:use-module (webid-oidc client-manifest) + #:use-module ((webid-oidc parameters) #:prefix p:) #:use-module (web uri) #:use-module (web client) #:use-module (web request) @@ -35,8 +36,7 @@ (define*-public (make-authorization-endpoint subject encrypted-password alg jwk validity #:key - (http-get http-get) - (current-time current-time)) + (http-get http-get)) (define (parse-arg x decode-plus-to-space?) (map (lambda (x) (uri-decode x @@ -90,16 +90,9 @@ (lambda (error) (error-application locale error)) (lambda () - (let* ((current-time (if (thunk? current-time) - (current-time) - current-time)) + (let* ((current-time ((p:current-date))) ;; current-date is a thunk parameter (current-sec - (cond ((date? current-time) - (time-second (date->time-utc current-time))) - ((time? current-time) - (time-second current-time)) - ((integer? current-time) - current-time))) + (time-second (date->time-utc current-time))) (exp-sec (+ current-sec validity)) (exp (time-utc->date (make-time time-utc 0 exp-sec))) (code (issue-authorization-code alg jwk exp subject client-id))) -- cgit v1.2.3