diff options
Diffstat (limited to 'src/scm/webid-oidc/token-endpoint.scm')
| -rw-r--r-- | src/scm/webid-oidc/token-endpoint.scm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/scm/webid-oidc/token-endpoint.scm b/src/scm/webid-oidc/token-endpoint.scm index a10c843..53ff1cc 100644 --- a/src/scm/webid-oidc/token-endpoint.scm +++ b/src/scm/webid-oidc/token-endpoint.scm @@ -16,6 +16,7 @@ (define-module (webid-oidc token-endpoint) #:use-module (webid-oidc errors) + #:use-module (webid-oidc server endpoint) #:use-module (webid-oidc authorization-code) #:use-module (webid-oidc dpop-proof) #:use-module (webid-oidc jws) @@ -119,8 +120,8 @@ (xml->sxml (W_ (format #f "<p>The refresh token you sent is invalid, or it is already bound to another key.</p>"))) ((*TOP* ,p) p)) - ,@(if (message-for-the-user? error) - (user-message error) + ,@(if (user-message? error) + (list (user-message-sxml error)) '())))) port))))) ((invalid-authorization-code? error) @@ -145,8 +146,8 @@ (xml->sxml (W_ (format #f "<p>The authorization code is forged, or expired.</p>"))) ((*TOP* ,p) p)) - ,@(if (message-for-the-user? error) - (user-message error) + ,@(if (user-message? error) + (list (user-message-sxml error)) '())))) port))))) ;; Other bad request @@ -172,8 +173,8 @@ (xml->sxml (W_ (format #f "<p>The token request failed.</p>"))) ((*TOP* ,p) p)) - ,@(if (message-for-the-user? error) - (user-message error) + ,@(if (user-message? error) + (list (user-message-sxml error)) '())))) port))))))) thunk)))) @@ -231,7 +232,7 @@ (make-exception (make-unsupported-grant-type #f) (make-exception-with-message final-message) - (make-message-for-the-user final-user-message))))) + (make-user-message final-user-message))))) (receive (webid client-id) (case (string->symbol grant-type) ((authorization_code) @@ -249,7 +250,7 @@ (make-exception (make-no-authorization-code) (make-exception-with-message final-message) - (make-message-for-the-user final-user-message))))) + (make-user-message final-user-message))))) (with-exception-handler (lambda (error) (raise-exception @@ -274,7 +275,7 @@ (make-exception (make-no-refresh-token) (make-exception-with-message final-message) - (make-message-for-the-user final-user-message))))) + (make-user-message final-user-message))))) (refresh:with-refresh-token refresh-token (jwk dpop) @@ -293,7 +294,7 @@ (make-exception (make-unsupported-grant-type grant-type) (make-exception-with-message final-message) - (make-message-for-the-user final-user-message)))))) + (make-user-message final-user-message)))))) (let ((id-token (issue <id-token> issuer-key |