Restructure the client API

The client API had several problems:
- using records instead of GOOPS means that we aren’t flexible enough
to introduce accounts protected by a password, for a multi-user
application;
- saving the user database to disk means we can’t have a proper
immutable API;
- it was difficult to predict when the users database would change,
and inform the user interface about this change;
- it had two different ways to negociate an access token, one when we
had a refresh token and one when we did not;
- it was supposed to either use account objects or a subject / issuer
pair, now we only use account objects.

3 files changed, 610 insertions, 225 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d19a46f..e485ef5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,24 +15,26 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # List of source files which contain translatable strings.
+src/hash/libwebidoidc-hash.c
+src/jwk/generate-key.c
+src/jwk/libwebidoidc-jwk.c
 src/libwebidoidc.c
-src/random/random.c
-src/random/libwebidoidc-random.c
 src/random/generate-random.c
-src/jwk/libwebidoidc-jwk.c
-src/jwk/generate-key.c
-src/hash/libwebidoidc-hash.c
+src/random/libwebidoidc-random.c
+src/random/random.c
+src/scm/webid-oidc/ChangeLog
+src/scm/webid-oidc/Makefile.am
 src/scm/webid-oidc/access-token.scm
 src/scm/webid-oidc/authorization-code.scm
 src/scm/webid-oidc/authorization-endpoint.scm
-src/scm/webid-oidc/authorization-page.scm
 src/scm/webid-oidc/authorization-page-unsafe.scm
+src/scm/webid-oidc/authorization-page.scm
 src/scm/webid-oidc/cache.scm
 src/scm/webid-oidc/catalog.scm
-src/scm/webid-oidc/ChangeLog
-src/scm/webid-oidc/client/accounts.scm
 src/scm/webid-oidc/client-manifest.scm
 src/scm/webid-oidc/client.scm
+src/scm/webid-oidc/client/accounts.scm
+src/scm/webid-oidc/client/client.scm
 src/scm/webid-oidc/dpop-proof.scm
 src/scm/webid-oidc/errors.scm
 src/scm/webid-oidc/example-app.scm
@@ -43,7 +45,6 @@ src/scm/webid-oidc/identity-provider.scm
 src/scm/webid-oidc/jti.scm
 src/scm/webid-oidc/jwk.scm
 src/scm/webid-oidc/jws.scm
-src/scm/webid-oidc/Makefile.am
 src/scm/webid-oidc/offloading.scm
 src/scm/webid-oidc/oidc-configuration.scm
 src/scm/webid-oidc/oidc-id-token.scm
@@ -54,13 +55,13 @@ src/scm/webid-oidc/rdf-index.scm
 src/scm/webid-oidc/refresh-token.scm
 src/scm/webid-oidc/resource-server.scm
 src/scm/webid-oidc/reverse-proxy.scm
+src/scm/webid-oidc/serve.scm
 src/scm/webid-oidc/server/create.scm
 src/scm/webid-oidc/server/delete.scm
 src/scm/webid-oidc/server/log.scm
 src/scm/webid-oidc/server/precondition.scm
 src/scm/webid-oidc/server/read.scm
 src/scm/webid-oidc/server/update.scm
-src/scm/webid-oidc/serve.scm
 src/scm/webid-oidc/simulation.scm
 src/scm/webid-oidc/stubs.scm
 src/scm/webid-oidc/testing.scm
diff --git a/po/disfluid.pot b/po/disfluid.pot
index 700afde..00ee614 100644
--- a/po/disfluid.pot
+++ b/po/disfluid.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: disfluid SNAPSHOT\n"
 "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-09-13 20:29+0200\n"
+"POT-Creation-Date: 2021-09-14 16:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/jwk/generate-key.c:52
+#, c-format
+msgid "Usage: generate-key [NUMBER OF BITS | CURVE]\n"
+msgstr ""
+
 #: src/libwebidoidc.c:29
 msgid "This is the main function."
 msgstr ""
 
+#: src/random/generate-random.c:47
+#, c-format
+msgid "Usage: generate-random [NUMBER OF BYTES]\n"
+msgstr ""
+
 #: src/random/random.c:217
 #, c-format
 msgid "Could not set the global random generator up.\n"
@@ -112,16 +122,6 @@ msgid ""
 "webid_oidc_random_init first.\n"
 msgstr ""
 
-#: src/random/generate-random.c:47
-#, c-format
-msgid "Usage: generate-random [NUMBER OF BYTES]\n"
-msgstr ""
-
-#: src/jwk/generate-key.c:52
-#, c-format
-msgid "Usage: generate-key [NUMBER OF BITS | CURVE]\n"
-msgstr ""
-
 #: src/scm/webid-oidc/access-token.scm:72
 #, scheme-format
 msgid "this is not an access token, because it is not even a JWS: ~a"
@@ -407,61 +407,6 @@ msgstr ""
 msgid "Unsupported delegate catalog URI scheme: ~s\n"
 msgstr ""
 
-#: src/scm/webid-oidc/client/accounts.scm:410
-msgid "The refresh token has expired."
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:417
-#, scheme-format
-msgid "The token request failed with code ~s (~s)."
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:426
-msgid "The token response did not set the content type."
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:434
-msgid "The token endpoint did not respond in UTF-8."
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:446
-#, scheme-format
-msgid "The token response has content-type ~s, not application/json."
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:456
-msgid "The token response is not valid JSON."
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:469
-#, scheme-format
-msgid "The token response did not include an ID token: ~s"
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:477
-#, scheme-format
-msgid "The token response did not include an access token: ~s\n"
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:488
-#, scheme-format
-msgid "the ID token signature is invalid: ~a"
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:490
-msgid "the ID token signature is invalid"
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:508
-#, scheme-format
-msgid "the ID token delivered by the identity provider for ~s has ~s as webid"
-msgstr ""
-
-#: src/scm/webid-oidc/client/accounts.scm:517
-#, scheme-format
-msgid "The ID token delivered by the identity provider ~s is for issuer ~s."
-msgstr ""
-
 #: src/scm/webid-oidc/client-manifest.scm:111
 #, scheme-format
 msgid "this is not a client manifest: ~a"
@@ -532,6 +477,87 @@ msgstr ""
 msgid "the client manifest is dereferenced from ~s, but it pretends to be ~s"
 msgstr ""
 
+#: src/scm/webid-oidc/client/accounts.scm:254
+msgid "The refresh token has expired."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:261
+#, scheme-format
+msgid "The token request failed with code ~s (~s)."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:270
+msgid "The token response did not set the content type."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:278
+msgid "The token endpoint did not respond in UTF-8."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:290
+#, scheme-format
+msgid "The token response has content-type ~s, not application/json."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:300
+msgid "The token response is not valid JSON."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:314
+#, scheme-format
+msgid "The token response did not include an ID token: ~s"
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:322
+#, scheme-format
+msgid "The token response did not include an access token: ~s\n"
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:333
+#, scheme-format
+msgid "the ID token signature is invalid: ~a"
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:335
+msgid "the ID token signature is invalid"
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:353
+#, scheme-format
+msgid "the ID token delivered by the identity provider for ~s has ~s as webid"
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:363
+#, scheme-format
+msgid "The ID token delivered by the identity provider ~s is for issuer ~s."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:378
+msgid "The issuer is required."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:383
+msgid "The optional subject and required issuer should be strings or URI."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:398
+msgid "Cannot check the username and/or password."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:408
+msgid "The subject should be a string or URI."
+msgstr ""
+
+#: src/scm/webid-oidc/client/accounts.scm:422
+msgid "The issuer should be a string or URI."
+msgstr ""
+
+#: src/scm/webid-oidc/client/client.scm:87
+msgid ""
+"Client ID and redirect URIs should be URIs, and key pair should be a key "
+"pair.."
+msgstr ""
+
 #: src/scm/webid-oidc/dpop-proof.scm:91
 #, scheme-format
 msgid "this is not a DPoP proof, because it is not even a JWS: ~a"
@@ -644,63 +670,202 @@ msgstr ""
 msgid "cannot encode a DPoP proof"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:58
-msgid "Main menu:\n"
+#: src/scm/webid-oidc/example-app.scm:98
+#, scheme-format
+msgid "~a (issued by ~a): no interaction required"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:61
+#: src/scm/webid-oidc/example-app.scm:101
 #, scheme-format
-msgid "~a. Log in with ~a (issued by ~a): ~a\n"
+msgid "~a (issued by ~a): offline but accessible"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:66
-msgid "a new user"
+#: src/scm/webid-oidc/example-app.scm:104
+#, scheme-format
+msgid "~a (issued by ~a): online"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:69
-msgid "status|currently logged in"
+#: src/scm/webid-oidc/example-app.scm:107
+#, scheme-format
+msgid "~a (issued by ~a): inaccessible"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:120
+#, scheme-format
+msgid "Your choice ~a does not exist.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:71
-msgid "status|offline (but accessible)"
+#: src/scm/webid-oidc/example-app.scm:138
+msgid "Your choice is not a valid URI.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:72
-msgid "status|offline (inaccessible)"
+#: src/scm/webid-oidc/example-app.scm:147
+msgid "This is not a valid HTTP method.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:74
-msgid ""
-"Type a number to log in, prefix it with '-' to delete the account, or type + "
-"to create a new account.\n"
+#: src/scm/webid-oidc/example-app.scm:163
+msgid "This is not a valid value for this header.\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:83
+#: src/scm/webid-oidc/example-app.scm:201
+msgid "Nothing to undo.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:213
+msgid "Nothing to redo.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:273
+msgid "Example app command|add-account"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:275
+msgid "Example app command|choose-account"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:277
+msgid "Example app command|set-uri"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:279
+msgid "Example app command|set-method"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:281
+msgid "Example app command|view-headers"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:283
+msgid "Example app command|clear-headers"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:285
+msgid "Example app command|add-header"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:287
+msgid "Example app command|ok"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:289
+msgid "Example app command|undo"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:291
+msgid "Example app command|redo"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:301
 #, scheme-format
-msgid "Please visit: ~a\n"
+msgid "To log in on ~a, please visit: ~a\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:84
+#: src/scm/webid-oidc/example-app.scm:304
 msgid "Then, paste the authorization code you get:\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:98
+#: src/scm/webid-oidc/example-app.scm:322
 #, scheme-format
-msgid "I could not negociate an access token.  ~a"
+msgid ""
+"Account: ~a\n"
+"URI: ~a\n"
+"Method: ~a\n"
+"Headers: ~a\n"
+"\n"
+"Available commands:\n"
+"  - ~a: add an account\n"
+"  - ~a: change the account\n"
+"  - ~a: change the URI\n"
+"  - ~a: change the method\n"
+"  - ~a: view all headers\n"
+"  - ~a: clear all the headers\n"
+"  - ~a: add a new header\n"
+"  - ~a: perform the request.\n"
+"\n"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:341
+msgid "Account:|unset"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:345
+msgid "URI:|unset"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:349
+msgid "Method:|unset"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:352
+msgid "Headers:|none"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:356
+msgid "list separator|, "
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:366
+#, scheme-format
+msgid "You can undo your last command with \"~a\".\n"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:368
+#, scheme-format
+msgid "You can re-apply your last undone command with \"~a\".\n"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:369
+msgid "Readline prompt|Command: "
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:376
+#, scheme-format
+msgid "An error happened: ~a.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:388
+msgid "Please enter your identity provider: "
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:102
+#: src/scm/webid-oidc/example-app.scm:394
 msgid ""
-"The refresh token has expired, it is not possible to use that account "
-"offline.\n"
+"You don’t have other accounts available. Please add one with \"add-account"
+"\".\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:107
-msgid "Please enter an URI to GET:\n"
+#: src/scm/webid-oidc/example-app.scm:400
+#, scheme-format
+msgid "- ~a: ~a\n"
 msgstr ""
 
-#: src/scm/webid-oidc/example-app.scm:132
-msgid "Please type your identity provider:\n"
+#: src/scm/webid-oidc/example-app.scm:408
+#, scheme-format
+msgid "[1-~a] "
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:416
+msgid "Visit this URI: "
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:422
+msgid "Use this HTTP method [GET]: "
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:438
+msgid "Which header? "
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:441
+#, scheme-format
+msgid "Which header value for ~a? "
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:464
+msgid "Please define an account and the URI.\n"
+msgstr ""
+
+#: src/scm/webid-oidc/example-app.scm:471
+msgid "I don’t know that command.\n"
 msgstr ""
 
 #: src/scm/webid-oidc/fetch.scm:59
@@ -1917,6 +2082,10 @@ msgstr ""
 msgid "#:endpoint argument is not present or not an URI."
 msgstr ""
 
+#: src/scm/webid-oidc/serve.scm:76
+msgid "content negociation failed while serving a request"
+msgstr ""
+
 #: src/scm/webid-oidc/server/create.scm:85
 #, scheme-format
 msgid "only text/turtle is allowed for the target of a POST request, not ~s"
@@ -1936,10 +2105,6 @@ msgstr ""
 msgid "the auxiliary resource of type ~s at ~s is absent"
 msgstr ""
 
-#: src/scm/webid-oidc/serve.scm:76
-msgid "content negociation failed while serving a request"
-msgstr ""
-
 #: src/scm/webid-oidc/simulation.scm:130
 #, scheme-format
 msgid "invalid credentials: response ~s ~s"
diff --git a/po/fr.po b/po/fr.po
index eb3bd1e..87dc146 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: webid-oidc 0.0.0\n"
 "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-09-13 20:29+0200\n"
-"PO-Revision-Date: 2021-09-13 19:59+0200\n"
+"POT-Creation-Date: 2021-09-14 16:04+0200\n"
+"PO-Revision-Date: 2021-09-14 16:02+0200\n"
 "Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
 "Language-Team: French <vivien@planete-kraus.eu>\n"
 "Language: fr\n"
@@ -12,10 +12,20 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: src/jwk/generate-key.c:52
+#, c-format
+msgid "Usage: generate-key [NUMBER OF BITS | CURVE]\n"
+msgstr "Utilisation : generate-key [NOMBRE DE BITS | COURBE]\n"
+
 #: src/libwebidoidc.c:29
 msgid "This is the main function."
 msgstr "Ceci est la fonction principale."
 
+#: src/random/generate-random.c:47
+#, c-format
+msgid "Usage: generate-random [NUMBER OF BYTES]\n"
+msgstr "Utilisation : generate-random [NOMBRE D'OCTETS]\n"
+
 #: src/random/random.c:217
 #, c-format
 msgid "Could not set the global random generator up.\n"
@@ -116,16 +126,6 @@ msgstr ""
 "Le module aléatoire n'a pas été initialisé. Veuillez appeler "
 "webid_oidc_random_init d'abort.\n"
 
-#: src/random/generate-random.c:47
-#, c-format
-msgid "Usage: generate-random [NUMBER OF BYTES]\n"
-msgstr "Utilisation : generate-random [NOMBRE D'OCTETS]\n"
-
-#: src/jwk/generate-key.c:52
-#, c-format
-msgid "Usage: generate-key [NUMBER OF BITS | CURVE]\n"
-msgstr "Utilisation : generate-key [NOMBRE DE BITS | COURBE]\n"
-
 #: src/scm/webid-oidc/access-token.scm:72
 #, scheme-format
 msgid "this is not an access token, because it is not even a JWS: ~a"
@@ -421,64 +421,6 @@ msgstr "URI relative invalide"
 msgid "Unsupported delegate catalog URI scheme: ~s\n"
 msgstr "Schéma d’URI pour un catalogue délégé non supporté : ~s\n"
 
-#: src/scm/webid-oidc/client/accounts.scm:410
-msgid "The refresh token has expired."
-msgstr "le jeton de rafraîchissement a expiré."
-
-#: src/scm/webid-oidc/client/accounts.scm:417
-#, scheme-format
-msgid "The token request failed with code ~s (~s)."
-msgstr "La requête de jeton a échoué avec un code ~s (~s)."
-
-#: src/scm/webid-oidc/client/accounts.scm:426
-msgid "The token response did not set the content type."
-msgstr "Le jeton de réponse n’a pas défini de type de contenu."
-
-#: src/scm/webid-oidc/client/accounts.scm:434
-msgid "The token endpoint did not respond in UTF-8."
-msgstr "Le terminal de jetonn n’a pas répondu en UTF-8."
-
-#: src/scm/webid-oidc/client/accounts.scm:446
-#, scheme-format
-msgid "The token response has content-type ~s, not application/json."
-msgstr "La réponse de jeton a un type de contenu ~s, pas application/json."
-
-#: src/scm/webid-oidc/client/accounts.scm:456
-msgid "The token response is not valid JSON."
-msgstr "La réponse de jeton n’est pas un JSON valide."
-
-#: src/scm/webid-oidc/client/accounts.scm:469
-#, scheme-format
-msgid "The token response did not include an ID token: ~s"
-msgstr "La réponse de jeton n’a pas inclus de jeton d’ID : ~s"
-
-#: src/scm/webid-oidc/client/accounts.scm:477
-#, scheme-format
-msgid "The token response did not include an access token: ~s\n"
-msgstr "La réponse de jeton n’a pas inclus de jeton d’accès : ~s\n"
-
-#: src/scm/webid-oidc/client/accounts.scm:488
-#, scheme-format
-msgid "the ID token signature is invalid: ~a"
-msgstr "la signature du jeton d’ID est invalide : ~a"
-
-#: src/scm/webid-oidc/client/accounts.scm:490
-msgid "the ID token signature is invalid"
-msgstr "la signature du jeton d’ID est invalide"
-
-#: src/scm/webid-oidc/client/accounts.scm:508
-#, scheme-format
-msgid "the ID token delivered by the identity provider for ~s has ~s as webid"
-msgstr ""
-"le jeton d’ID délivré par le fournisseur d’identité pour ~s a ~s pour webid"
-
-#: src/scm/webid-oidc/client/accounts.scm:517
-#, scheme-format
-msgid "The ID token delivered by the identity provider ~s is for issuer ~s."
-msgstr ""
-"Le jeton d’ID délivré par le fournisseur d’identité ~s est pour l’émetteur "
-"~s."
-
 #: src/scm/webid-oidc/client-manifest.scm:111
 #, scheme-format
 msgid "this is not a client manifest: ~a"
@@ -555,6 +497,94 @@ msgstr "impossible de télécharger le manifeste client ~s"
 msgid "the client manifest is dereferenced from ~s, but it pretends to be ~s"
 msgstr "le manifeste client est déréférencé depuis ~s, mais il prétend être ~s"
 
+#: src/scm/webid-oidc/client/accounts.scm:254
+msgid "The refresh token has expired."
+msgstr "le jeton de rafraîchissement a expiré."
+
+#: src/scm/webid-oidc/client/accounts.scm:261
+#, scheme-format
+msgid "The token request failed with code ~s (~s)."
+msgstr "La requête de jeton a échoué avec un code ~s (~s)."
+
+#: src/scm/webid-oidc/client/accounts.scm:270
+msgid "The token response did not set the content type."
+msgstr "Le jeton de réponse n’a pas défini de type de contenu."
+
+#: src/scm/webid-oidc/client/accounts.scm:278
+msgid "The token endpoint did not respond in UTF-8."
+msgstr "Le terminal de jetonn n’a pas répondu en UTF-8."
+
+#: src/scm/webid-oidc/client/accounts.scm:290
+#, scheme-format
+msgid "The token response has content-type ~s, not application/json."
+msgstr "La réponse de jeton a un type de contenu ~s, pas application/json."
+
+#: src/scm/webid-oidc/client/accounts.scm:300
+msgid "The token response is not valid JSON."
+msgstr "La réponse de jeton n’est pas un JSON valide."
+
+#: src/scm/webid-oidc/client/accounts.scm:314
+#, scheme-format
+msgid "The token response did not include an ID token: ~s"
+msgstr "La réponse de jeton n’a pas inclus de jeton d’ID : ~s"
+
+#: src/scm/webid-oidc/client/accounts.scm:322
+#, scheme-format
+msgid "The token response did not include an access token: ~s\n"
+msgstr "La réponse de jeton n’a pas inclus de jeton d’accès : ~s\n"
+
+#: src/scm/webid-oidc/client/accounts.scm:333
+#, scheme-format
+msgid "the ID token signature is invalid: ~a"
+msgstr "la signature du jeton d’ID est invalide : ~a"
+
+#: src/scm/webid-oidc/client/accounts.scm:335
+msgid "the ID token signature is invalid"
+msgstr "la signature du jeton d’ID est invalide"
+
+#: src/scm/webid-oidc/client/accounts.scm:353
+#, scheme-format
+msgid "the ID token delivered by the identity provider for ~s has ~s as webid"
+msgstr ""
+"le jeton d’ID délivré par le fournisseur d’identité pour ~s a ~s pour webid"
+
+#: src/scm/webid-oidc/client/accounts.scm:363
+#, scheme-format
+msgid "The ID token delivered by the identity provider ~s is for issuer ~s."
+msgstr ""
+"Le jeton d’ID délivré par le fournisseur d’identité ~s est pour l’émetteur "
+"~s."
+
+#: src/scm/webid-oidc/client/accounts.scm:378
+msgid "The issuer is required."
+msgstr "L’émetteur est requis."
+
+#: src/scm/webid-oidc/client/accounts.scm:383
+msgid "The optional subject and required issuer should be strings or URI."
+msgstr ""
+"Le sujet optionnel et émetteur doivent être des chaînes de caractère ou des "
+"URIs."
+
+#: src/scm/webid-oidc/client/accounts.scm:398
+msgid "Cannot check the username and/or password."
+msgstr "Impossible de vérifier le nom d’utilisateur et/ou le mot de passe."
+
+#: src/scm/webid-oidc/client/accounts.scm:408
+msgid "The subject should be a string or URI."
+msgstr "Le sujet doit être une chaîne de caractères ou une URI."
+
+#: src/scm/webid-oidc/client/accounts.scm:422
+msgid "The issuer should be a string or URI."
+msgstr "L’émetteur doit être une chaîne de caractères ou une URI."
+
+#: src/scm/webid-oidc/client/client.scm:87
+msgid ""
+"Client ID and redirect URIs should be URIs, and key pair should be a key "
+"pair.."
+msgstr ""
+"L’ID de client et l’URI de redirection doivent être des URIs, et la paire de "
+"clés doit être une paire de clés."
+
 #: src/scm/webid-oidc/dpop-proof.scm:91
 #, scheme-format
 msgid "this is not a DPoP proof, because it is not even a JWS: ~a"
@@ -675,68 +705,220 @@ msgstr "impossible d’encoder la preuve DPoP : ~a"
 msgid "cannot encode a DPoP proof"
 msgstr "impossible d’encoder la preuve DPoP"
 
-#: src/scm/webid-oidc/example-app.scm:58
-msgid "Main menu:\n"
-msgstr "Menu principal :\n"
+#: src/scm/webid-oidc/example-app.scm:98
+#, scheme-format
+msgid "~a (issued by ~a): no interaction required"
+msgstr "~a (émis par ~a) : aucune interaction nécessaire"
 
-#: src/scm/webid-oidc/example-app.scm:61
+#: src/scm/webid-oidc/example-app.scm:101
 #, scheme-format
-msgid "~a. Log in with ~a (issued by ~a): ~a\n"
-msgstr "~a. Se connecter avec ~a (émis par ~a) : ~a\n"
+msgid "~a (issued by ~a): offline but accessible"
+msgstr "~a (émis par ~a) : hors ligne mais accessible"
 
-#: src/scm/webid-oidc/example-app.scm:66
-msgid "a new user"
-msgstr "un nouvel utilisateur"
+#: src/scm/webid-oidc/example-app.scm:104
+#, scheme-format
+msgid "~a (issued by ~a): online"
+msgstr "~a (émis par ~a) : en ligne"
 
-#: src/scm/webid-oidc/example-app.scm:69
-msgid "status|currently logged in"
-msgstr "actuellement connecté"
+#: src/scm/webid-oidc/example-app.scm:107
+#, scheme-format
+msgid "~a (issued by ~a): inaccessible"
+msgstr "~a (émis par ~a) : inaccessible"
 
-#: src/scm/webid-oidc/example-app.scm:71
-msgid "status|offline (but accessible)"
-msgstr "hors ligne (mais accessible)"
+#: src/scm/webid-oidc/example-app.scm:120
+#, scheme-format
+msgid "Your choice ~a does not exist.\n"
+msgstr "Votre choix, ~a, n’existe pas.\n"
 
-#: src/scm/webid-oidc/example-app.scm:72
-msgid "status|offline (inaccessible)"
-msgstr "hors ligne (inaccessible)"
+#: src/scm/webid-oidc/example-app.scm:138
+msgid "Your choice is not a valid URI.\n"
+msgstr "Votre choix doit être une URI valide.\n"
 
-#: src/scm/webid-oidc/example-app.scm:74
-msgid ""
-"Type a number to log in, prefix it with '-' to delete the account, or type + "
-"to create a new account.\n"
-msgstr ""
-"Entrez un nombre pour vous connecter, préfixez-le avec « - » pour supprimer "
-"le compte, ou tapez + pour créer un nouveau compte.\n"
+#: src/scm/webid-oidc/example-app.scm:147
+msgid "This is not a valid HTTP method.\n"
+msgstr "ce n’est pas une méthode HTTP valide.\n"
+
+#: src/scm/webid-oidc/example-app.scm:163
+msgid "This is not a valid value for this header.\n"
+msgstr "Ce n’est pas une valeur valide pour cet en-tête.\n"
+
+#: src/scm/webid-oidc/example-app.scm:201
+msgid "Nothing to undo.\n"
+msgstr "Rien à annuler.\n"
+
+#: src/scm/webid-oidc/example-app.scm:213
+msgid "Nothing to redo.\n"
+msgstr "Rien à refaire.\n"
+
+#: src/scm/webid-oidc/example-app.scm:273
+msgid "Example app command|add-account"
+msgstr "ajouter-compte"
+
+#: src/scm/webid-oidc/example-app.scm:275
+msgid "Example app command|choose-account"
+msgstr "choisir-compte"
+
+#: src/scm/webid-oidc/example-app.scm:277
+msgid "Example app command|set-uri"
+msgstr "définir-uri"
 
-#: src/scm/webid-oidc/example-app.scm:83
+#: src/scm/webid-oidc/example-app.scm:279
+msgid "Example app command|set-method"
+msgstr "définir-méthode"
+
+#: src/scm/webid-oidc/example-app.scm:281
+msgid "Example app command|view-headers"
+msgstr "voir-en-têtes"
+
+#: src/scm/webid-oidc/example-app.scm:283
+msgid "Example app command|clear-headers"
+msgstr "effacer-en-têtes"
+
+#: src/scm/webid-oidc/example-app.scm:285
+msgid "Example app command|add-header"
+msgstr "ajouter-en-tête"
+
+#: src/scm/webid-oidc/example-app.scm:287
+msgid "Example app command|ok"
+msgstr "ok"
+
+#: src/scm/webid-oidc/example-app.scm:289
+msgid "Example app command|undo"
+msgstr "annuler"
+
+#: src/scm/webid-oidc/example-app.scm:291
+msgid "Example app command|redo"
+msgstr "refaire"
+
+#: src/scm/webid-oidc/example-app.scm:301
 #, scheme-format
-msgid "Please visit: ~a\n"
-msgstr "Veuillez visiter : ~a\n"
+msgid "To log in on ~a, please visit: ~a\n"
+msgstr "Pour vous connecte avec ~a, veuillez visiter : ~a\n"
 
-#: src/scm/webid-oidc/example-app.scm:84
+#: src/scm/webid-oidc/example-app.scm:304
 msgid "Then, paste the authorization code you get:\n"
 msgstr "Ensuite, veuillez coller votre code d’autorisation :\n"
 
-#: src/scm/webid-oidc/example-app.scm:98
+#: src/scm/webid-oidc/example-app.scm:322
 #, scheme-format
-msgid "I could not negociate an access token.  ~a"
-msgstr "Je n’ai pas pu négocier de jeton d’accès.  ~a"
+msgid ""
+"Account: ~a\n"
+"URI: ~a\n"
+"Method: ~a\n"
+"Headers: ~a\n"
+"\n"
+"Available commands:\n"
+"  - ~a: add an account\n"
+"  - ~a: change the account\n"
+"  - ~a: change the URI\n"
+"  - ~a: change the method\n"
+"  - ~a: view all headers\n"
+"  - ~a: clear all the headers\n"
+"  - ~a: add a new header\n"
+"  - ~a: perform the request.\n"
+"\n"
+msgstr ""
+"Compte : ~a\n"
+"URI : ~a\n"
+"Méthode : ~a\n"
+"En-têtes : ~a\n"
+"\n"
+"Commandes disponibles :\n"
+"  - ~a : ajouter un compte\n"
+"  - ~a : changer de compte\n"
+"  - ~a : changer d’URI\n"
+"  - ~a : changer la méthode\n"
+"  - ~a : voir tous les en-têtes\n"
+"  - ~a : effacer tous les en-têtes\n"
+"  - ~a : ajouter des en-têtes\n"
+"  - ~a : effectuer la requête.\n"
+"\n"
+
+#: src/scm/webid-oidc/example-app.scm:341
+msgid "Account:|unset"
+msgstr "non défini"
+
+#: src/scm/webid-oidc/example-app.scm:345
+msgid "URI:|unset"
+msgstr "non défini"
+
+#: src/scm/webid-oidc/example-app.scm:349
+msgid "Method:|unset"
+msgstr "non définie"
+
+#: src/scm/webid-oidc/example-app.scm:352
+msgid "Headers:|none"
+msgstr "aucun"
+
+#: src/scm/webid-oidc/example-app.scm:356
+msgid "list separator|, "
+msgstr ", "
+
+#: src/scm/webid-oidc/example-app.scm:366
+#, scheme-format
+msgid "You can undo your last command with \"~a\".\n"
+msgstr "Vous pouvez annuler votre dernière commande avec « ~a ».\n"
+
+#: src/scm/webid-oidc/example-app.scm:368
+#, scheme-format
+msgid "You can re-apply your last undone command with \"~a\".\n"
+msgstr "Vous pouvez refaire votre dernière commande annulée avec « ~a ».\n"
+
+#: src/scm/webid-oidc/example-app.scm:369
+msgid "Readline prompt|Command: "
+msgstr "Commande : "
 
-#: src/scm/webid-oidc/example-app.scm:102
+#: src/scm/webid-oidc/example-app.scm:376
+#, scheme-format
+msgid "An error happened: ~a.\n"
+msgstr "Une erreur est survenue : ~a.\n"
+
+#: src/scm/webid-oidc/example-app.scm:388
+msgid "Please enter your identity provider: "
+msgstr "Veuillez entrer votre fournisseur d’identité : "
+
+#: src/scm/webid-oidc/example-app.scm:394
 msgid ""
-"The refresh token has expired, it is not possible to use that account "
-"offline.\n"
+"You don’t have other accounts available. Please add one with \"add-account"
+"\".\n"
 msgstr ""
-"Le jeton de rafraîchissement a expiré, il n’est pas possible d’utiliser ce "
-"compte hors ligne.\n"
+"Vous n’avez pas d’autre compte disponible. Veuillez en ajouter un avec "
+"« ajouter-compte ».\n"
 
-#: src/scm/webid-oidc/example-app.scm:107
-msgid "Please enter an URI to GET:\n"
-msgstr "Veuillez entrer un URI à requêter avec GET :\n"
+#: src/scm/webid-oidc/example-app.scm:400
+#, scheme-format
+msgid "- ~a: ~a\n"
+msgstr "- ~a : ~a\n"
+
+#: src/scm/webid-oidc/example-app.scm:408
+#, scheme-format
+msgid "[1-~a] "
+msgstr "[1-~a] "
+
+#: src/scm/webid-oidc/example-app.scm:416
+msgid "Visit this URI: "
+msgstr "Naviguer cette URI : "
+
+#: src/scm/webid-oidc/example-app.scm:422
+msgid "Use this HTTP method [GET]: "
+msgstr "Utiliser cette méthode HTTP [GET] : "
+
+#: src/scm/webid-oidc/example-app.scm:438
+msgid "Which header? "
+msgstr "Quel en-tête ? "
+
+#: src/scm/webid-oidc/example-app.scm:441
+#, scheme-format
+msgid "Which header value for ~a? "
+msgstr "Quelle valeur pour l’en-tête ~a ? "
 
-#: src/scm/webid-oidc/example-app.scm:132
-msgid "Please type your identity provider:\n"
-msgstr "Veuillez entrer votre serveur d’identité :\n"
+#: src/scm/webid-oidc/example-app.scm:464
+msgid "Please define an account and the URI.\n"
+msgstr "Veuillez définir un compte et une URI.\n"
+
+#: src/scm/webid-oidc/example-app.scm:471
+msgid "I don’t know that command.\n"
+msgstr "Je ne connais pas cette commande.\n"
 
 #: src/scm/webid-oidc/fetch.scm:59
 #, scheme-format
@@ -2231,6 +2413,10 @@ msgstr "Inacceptable"
 msgid "#:endpoint argument is not present or not an URI."
 msgstr "l’argument de #:endpoint n’est pas présent, ou pas une URI."
 
+#: src/scm/webid-oidc/serve.scm:76
+msgid "content negociation failed while serving a request"
+msgstr "la négociation de contenu a échoué pour le service d’une requête"
+
 #: src/scm/webid-oidc/server/create.scm:85
 #, scheme-format
 msgid "only text/turtle is allowed for the target of a POST request, not ~s"
@@ -2250,10 +2436,6 @@ msgstr "impossible de POSTer vers un chemin de ressource auxiliaire, ~s"
 msgid "the auxiliary resource of type ~s at ~s is absent"
 msgstr "la ressource auxiliaire de type ~s à ~s est absente"
 
-#: src/scm/webid-oidc/serve.scm:76
-msgid "content negociation failed while serving a request"
-msgstr "la négociation de contenu a échoué pour le service d’une requête"
-
 #: src/scm/webid-oidc/simulation.scm:130
 #, scheme-format
 msgid "invalid credentials: response ~s ~s"
@@ -2355,6 +2537,43 @@ msgstr ""
 "<p>Vous voulez utiliser <pre>~s</pre> comme type d’offre, mais ce n’est pas "
 "supporté.</p>"
 
+#, scheme-format
+#~ msgid "~s (issued by ~s)"
+#~ msgstr "~s (émis par ~s)"
+
+#~ msgid "Main menu:\n"
+#~ msgstr "Menu principal :\n"
+
+#~ msgid "a new user"
+#~ msgstr "un nouvel utilisateur"
+
+#~ msgid "status|currently logged in"
+#~ msgstr "actuellement connecté"
+
+#~ msgid "status|offline (inaccessible)"
+#~ msgstr "hors ligne (inaccessible)"
+
+#~ msgid ""
+#~ "Type a number to log in, prefix it with '-' to delete the account, or "
+#~ "type + to create a new account.\n"
+#~ msgstr ""
+#~ "Entrez un nombre pour vous connecter, préfixez-le avec « - » pour "
+#~ "supprimer le compte, ou tapez + pour créer un nouveau compte.\n"
+
+#, scheme-format
+#~ msgid "I could not negociate an access token.  ~a"
+#~ msgstr "Je n’ai pas pu négocier de jeton d’accès.  ~a"
+
+#~ msgid ""
+#~ "The refresh token has expired, it is not possible to use that account "
+#~ "offline.\n"
+#~ msgstr ""
+#~ "Le jeton de rafraîchissement a expiré, il n’est pas possible d’utiliser "
+#~ "ce compte hors ligne.\n"
+
+#~ msgid "Please enter an URI to GET:\n"
+#~ msgstr "Veuillez entrer un URI à requêter avec GET :\n"
+
 #~ msgid "status|not initialized yet"
 #~ msgstr "pas encore initialisé"