summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-09-27 13:18:40 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2021-10-01 12:32:20 +0200
commite2fea447f29d276f025d99df638437ab7df89441 (patch)
tree04cc9841224dd4e97c68cf8a0b9bf49da4886671
parent7a2b3bb4bb84ff0091fa39f03d3c61d83f9a1e6c (diff)
client: rename client-key-pair and client-redirect-uri by dropping 'client-'
-rw-r--r--doc/disfluid.texi4
-rw-r--r--src/scm/webid-oidc/client.scm4
-rw-r--r--src/scm/webid-oidc/client/accounts.scm4
-rw-r--r--src/scm/webid-oidc/client/client.scm8
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/disfluid.texi b/doc/disfluid.texi
index 9e0f3fa..35e8e13 100644
--- a/doc/disfluid.texi
+++ b/doc/disfluid.texi
@@ -1619,8 +1619,8 @@ it by setting the guile parameter @code{authorization-state}.
@end deftp
@deftypefn {Generic method} uri client-id (@var{client} @code{<client>})
-@deftypefnx {Generic method} {key pair} client-key-pair (@var{client} @code{<client>})
-@deftypefnx {Generic method} uri client-redirect-uri (@var{client} @code{<client>})
+@deftypefnx {Generic method} {key pair} key-pair (@var{client} @code{<client>})
+@deftypefnx {Generic method} uri redirect-uri (@var{client} @code{<client>})
Slot accessors for @var{client}.
@end deftypefn
diff --git a/src/scm/webid-oidc/client.scm b/src/scm/webid-oidc/client.scm
index ab40a7c..6c1e368 100644
--- a/src/scm/webid-oidc/client.scm
+++ b/src/scm/webid-oidc/client.scm
@@ -47,8 +47,8 @@
(
(client:<client> . <client>)
(client:client-id . client-id)
- (client:client-key-pair . client-key-pair)
- (client:client-redirect-uri . client-redirect-uri)
+ (client:key-pair . key-pair)
+ (client:redirect-uri . redirect-uri)
(client:client . client)
(account:authorization-process . authorization-process)
diff --git a/src/scm/webid-oidc/client/accounts.scm b/src/scm/webid-oidc/client/accounts.scm
index 9546263..98d91a1 100644
--- a/src/scm/webid-oidc/client/accounts.scm
+++ b/src/scm/webid-oidc/client/accounts.scm
@@ -199,7 +199,7 @@
,(uri-encode value))
"=")))
`((client_id . ,(uri->string (client:client-id client)))
- (redirect_uri . ,(uri->string (client:client-redirect-uri client)))
+ (redirect_uri . ,(uri->string (client:redirect-uri client)))
,@(let ((state (authorization-state)))
(if state
`((state . ,state))
@@ -207,7 +207,7 @@
"&"))))
((authorization-process) authorization-uri #:issuer issuer))))
(unless key-pair
- (set! key-pair (client:client-key-pair client)))
+ (set! key-pair (client:key-pair client)))
(let ((dpop-proof
(issue <dpop-proof>
key-pair
diff --git a/src/scm/webid-oidc/client/client.scm b/src/scm/webid-oidc/client/client.scm
index 7c54cad..4f4a46e 100644
--- a/src/scm/webid-oidc/client/client.scm
+++ b/src/scm/webid-oidc/client/client.scm
@@ -48,8 +48,8 @@
(
<client>
client-id
- client-key-pair
- client-redirect-uri
+ key-pair
+ redirect-uri
client
)
@@ -59,8 +59,8 @@
(define-class <client> ()
(client-id #:init-keyword #:client-id #:getter client-id #:->sxml uri->string)
- (key-pair #:init-keyword #:key-pair #:getter client-key-pair)
- (redirect-uri #:init-keyword #:redirect-uri #:getter client-redirect-uri #:->sxml uri->string)
+ (key-pair #:init-keyword #:key-pair #:getter key-pair)
+ (redirect-uri #:init-keyword #:redirect-uri #:getter redirect-uri #:->sxml uri->string)
#:metaclass <plugin-class>
#:module-name '(webid-oidc client client))