@ofidj/entry 3.17.0 → 3.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dom.d.ts +11 -1
- package/dom.js +52 -3
- package/index.d.ts +1 -1
- package/index.js +2 -2
- package/model.d.ts +11 -0
- package/model.js +24 -2
- package/package.json +1 -1
- package/server.d.ts +1 -0
- package/server.js +12 -5
- package/style.css +21 -18
package/dom.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type AccountState, type SigninShape, type VerificationState } from "./index.js";
|
|
1
|
+
import { type AccountState, type HistoryEntry, type SigninShape, type VerificationState } from "./index.js";
|
|
2
2
|
export declare const escape: (value: unknown) => string;
|
|
3
3
|
export declare function masthead(logo: string, title: string): string;
|
|
4
4
|
export declare function highlightCells(entries?: Array<{
|
|
@@ -61,3 +61,13 @@ export declare function passkeyRegistration(options: any): Promise<{
|
|
|
61
61
|
};
|
|
62
62
|
clientExtensionResults: {};
|
|
63
63
|
}>;
|
|
64
|
+
export declare function memberCard(options: {
|
|
65
|
+
consent: Record<string, unknown>;
|
|
66
|
+
history: HistoryEntry[];
|
|
67
|
+
agreementHref?: string;
|
|
68
|
+
owner?: boolean;
|
|
69
|
+
leaving?: boolean;
|
|
70
|
+
leaveScope?: string;
|
|
71
|
+
manageHref?: string;
|
|
72
|
+
}): string;
|
|
73
|
+
export declare function bindMemberHistory(root: ParentNode): void;
|
package/dom.js
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
// screen nests signin-trust inside its inner div and the interaction screen
|
|
10
10
|
// makes it a sibling, so a single shell builder would have had to change one of
|
|
11
11
|
// them. That is a decision, not a move.
|
|
12
|
-
import { accountModel, agreementModel, credentialsModel, emailDividerLabel, passkeyDoorModel, providerEntryModel, returnNoticeModel, signInHint, verificationWaitModel, walletDoorModel, } from "./index.js";
|
|
12
|
+
import { accountModel, agreementModel, credentialsModel, emailDividerLabel, historyLine, optionalPurposes, passkeyDoorModel, providerEntryModel, returnNoticeModel, signInHint, verificationWaitModel, walletDoorModel, } from "./index.js";
|
|
13
13
|
export const escape = (value) => String(value ?? "").replace(/[&<>"']/g, (char) => ({ "&": "&", "<": "<", ">": ">", '"': """, "'": "'" })[char]);
|
|
14
14
|
const attribute = (name, value) => value === undefined || value === false || value === ""
|
|
15
15
|
? ""
|
|
@@ -59,7 +59,7 @@ export function credentialFields(state, options = {}) {
|
|
|
59
59
|
return (passkey +
|
|
60
60
|
`<label for="email">${escape(model.email.label)}</label><input id="email" type="email" value="${escape(model.email.value)}" placeholder="${escape(model.email.placeholder)}" autocomplete="username">` +
|
|
61
61
|
`<div class="field-head"><label for="password">${escape(model.password.label)}</label><a href="${escape(model.forgot.href)}">${escape(model.forgot.label)}</a></div>` +
|
|
62
|
-
`<div class="password-field"><input id="password" type="password" value="${escape(model.password.value)}"
|
|
62
|
+
`<div class="password-field"><input id="password" type="password" value="${escape(model.password.value)}" ${attribute("placeholder", model.password.placeholder)} autocomplete="current-password"><button type="button" id="reveal" aria-controls="password">${escape(model.reveal.label)}</button></div>` +
|
|
63
63
|
`<button class="primary" type="submit" name="entry" value="credentials">${escape(model.submit.label)}</button>` +
|
|
64
64
|
`<button class="secondary" type="submit" name="signup" value="true">${escape(model.signup.label)}</button>`);
|
|
65
65
|
}
|
|
@@ -373,4 +373,53 @@ export async function passkeyRegistration(options) {
|
|
|
373
373
|
clientExtensionResults: {},
|
|
374
374
|
};
|
|
375
375
|
}
|
|
376
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dom.js","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"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"}
|
|
376
|
+
// The member card every generated app draws on its account screen, the shell
|
|
377
|
+
// and the Studio Notes starter alike: the agreement with its ground (a link to
|
|
378
|
+
// the version accepted), each optional choice as a switch that says On or Off,
|
|
379
|
+
// then History, Export and the way out — the same reading as Fidj's GDPR card.
|
|
380
|
+
export function memberCard(options) {
|
|
381
|
+
const { consent, history } = options;
|
|
382
|
+
const version = String(consent.termsVersion || "");
|
|
383
|
+
const agreementRow = consent.terms
|
|
384
|
+
? `<div class="member-row"><div><strong>Service agreement</strong>${options.agreementHref && version
|
|
385
|
+
? `<a class="basis" href="${escape(options.agreementHref)}" target="_blank" rel="noopener noreferrer">Contract · agreement ${escape(version)} ↗</a>`
|
|
386
|
+
: '<span class="basis">Contract</span>'}</div><small class="nosw">Part of the service. To stop it, leave the app.</small></div>`
|
|
387
|
+
: '<div class="member-row"><div><strong>Service agreement</strong><small>Not accepted yet — accept it or leave the app.</small></div><button id="accept-terms" class="primary">Accept</button></div>';
|
|
388
|
+
const choices = optionalPurposes
|
|
389
|
+
.map((purpose) => `<label class="member-row" for="purpose-${purpose.key}"><div><strong>${escape(purpose.title)}</strong><small>${escape(purpose.description)}</small><span class="basis consent">Consent</span></div><span class="switch"><input type="checkbox" role="switch" id="purpose-${purpose.key}" data-purpose="${purpose.key}"${consent[purpose.key] ? " checked" : ""}><span class="switch-state" aria-hidden="true">${consent[purpose.key] ? "On" : "Off"}</span></span></label>`)
|
|
390
|
+
.join("");
|
|
391
|
+
const entries = history.length
|
|
392
|
+
? history
|
|
393
|
+
.slice()
|
|
394
|
+
.reverse()
|
|
395
|
+
.map((entry) => {
|
|
396
|
+
const line = historyLine(entry);
|
|
397
|
+
return `<p><time>${escape(line.when)}</time> · ${escape(line.what)}</p>`;
|
|
398
|
+
})
|
|
399
|
+
.join("")
|
|
400
|
+
: "<p>No changes yet.</p>";
|
|
401
|
+
const leave = options.owner
|
|
402
|
+
? "<small>You own this app: hand it over or delete it on Fidj before leaving.</small>"
|
|
403
|
+
: options.leaving
|
|
404
|
+
? `<div role="alertdialog" aria-labelledby="leave-title"><p id="leave-title">${escape(options.leaveScope || "Your membership and what this app holds for you will be erased. Your other apps remain available.")}</p><button id="confirm-leave" class="danger">Leave & erase</button><button id="cancel-leave">Keep my membership</button></div>`
|
|
405
|
+
: '<button id="leave" class="danger">Leave & erase</button>';
|
|
406
|
+
// History is a button beside Export, as on Fidj's console, rather than a
|
|
407
|
+
// native disclosure triangle; `bindMemberHistory` opens and closes it.
|
|
408
|
+
return `<h2>Your membership</h2><div class="member-rows">${agreementRow}${choices}</div>
|
|
409
|
+
<div id="member-history" class="member-history" hidden>${entries}</div>
|
|
410
|
+
<div class="member-actions"><button type="button" id="history-toggle" aria-expanded="false" aria-controls="member-history">History</button><button id="export">Export</button>${leave}</div>${options.manageHref
|
|
411
|
+
? `<p class="leaving"><a href="${escape(options.manageHref)}" target="_blank" rel="noopener noreferrer">Open Fidj to manage every app you use ↗</a></p>`
|
|
412
|
+
: ""}`;
|
|
413
|
+
}
|
|
414
|
+
// Opens and closes the member card's history. A card drawn again starts closed.
|
|
415
|
+
export function bindMemberHistory(root) {
|
|
416
|
+
const toggle = root.querySelector("#history-toggle");
|
|
417
|
+
const list = root.querySelector("#member-history");
|
|
418
|
+
if (!toggle || !list)
|
|
419
|
+
return;
|
|
420
|
+
toggle.onclick = () => {
|
|
421
|
+
list.hidden = !list.hidden;
|
|
422
|
+
toggle.setAttribute("aria-expanded", String(!list.hidden));
|
|
423
|
+
};
|
|
424
|
+
}
|
|
425
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dom.js","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"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"}
|
package/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { agreementRequired, agreementFromRefusal, verificationPending, signInErrorMessage, acceptance, providerEntryModel, agreementModel, verificationWaitModel, accountModel, credentialsModel, passkeyDoorModel, emailDividerLabel, walletDoorModel, returnNoticeModel, pollVerification, formatDate, optionalPurposes, type SigninShape, type EntryControl, type ProviderEntryModel, type AgreementModel, type VerificationState, type VerificationWaitModel, type AccountState, type AccountField, type AccountModel, type CredentialsModel, } from "./model.js";
|
|
1
|
+
export { agreementRequired, agreementFromRefusal, verificationPending, signInErrorMessage, acceptance, providerEntryModel, agreementModel, verificationWaitModel, accountModel, credentialsModel, passkeyDoorModel, emailDividerLabel, walletDoorModel, returnNoticeModel, pollVerification, formatDate, optionalPurposes, historyLine, type HistoryEntry, type SigninShape, type EntryControl, type ProviderEntryModel, type AgreementModel, type VerificationState, type VerificationWaitModel, type AccountState, type AccountField, type AccountModel, type CredentialsModel, } from "./model.js";
|
|
2
2
|
export { signInHint, rememberSignIn, forgetSignIn } from "./remembered.js";
|
package/index.js
CHANGED
|
@@ -11,6 +11,6 @@
|
|
|
11
11
|
// Two subpaths carry what cannot be pure:
|
|
12
12
|
// @ofidj/entry/dom the HTML renderer and the helpers that drive a document
|
|
13
13
|
// @ofidj/entry/window the Fidj window and the answer it relays back
|
|
14
|
-
export { agreementRequired, agreementFromRefusal, verificationPending, signInErrorMessage, acceptance, providerEntryModel, agreementModel, verificationWaitModel, accountModel, credentialsModel, passkeyDoorModel, emailDividerLabel, walletDoorModel, returnNoticeModel, pollVerification, formatDate, optionalPurposes, } from "./model.js";
|
|
14
|
+
export { agreementRequired, agreementFromRefusal, verificationPending, signInErrorMessage, acceptance, providerEntryModel, agreementModel, verificationWaitModel, accountModel, credentialsModel, passkeyDoorModel, emailDividerLabel, walletDoorModel, returnNoticeModel, pollVerification, formatDate, optionalPurposes, historyLine, } from "./model.js";
|
|
15
15
|
export { signInHint, rememberSignIn, forgetSignIn } from "./remembered.js";
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsbUVBQW1FO0FBQ25FLEVBQUU7QUFDRixnRkFBZ0Y7QUFDaEYsNkVBQTZFO0FBQzdFLCtFQUErRTtBQUMvRSxnRkFBZ0Y7QUFDaEYsOEVBQThFO0FBQzlFLDZFQUE2RTtBQUM3RSxrRUFBa0U7QUFDbEUsRUFBRTtBQUNGLDBDQUEwQztBQUMxQyxpRkFBaUY7QUFDakYsdUVBQXVFO0FBQ3ZFLE9BQU8sRUFDTCxpQkFBaUIsRUFDakIsb0JBQW9CLEVBQ3BCLG1CQUFtQixFQUNuQixrQkFBa0IsRUFDbEIsVUFBVSxFQUNWLGtCQUFrQixFQUNsQixjQUFjLEVBQ2QscUJBQXFCLEVBQ3JCLFlBQVksRUFDWixnQkFBZ0IsRUFDaEIsZ0JBQWdCLEVBQ2hCLGlCQUFpQixFQUNqQixlQUFlLEVBQ2YsaUJBQWlCLEVBQ2pCLGdCQUFnQixFQUNoQixVQUFVLEVBQ1YsZ0JBQWdCLEVBQ2hCLFdBQVcsR0FZWixNQUFNLFlBQVksQ0FBQztBQUNwQixPQUFPLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQyJ9
|
package/model.d.ts
CHANGED
|
@@ -141,3 +141,14 @@ export declare const optionalPurposes: ReadonlyArray<{
|
|
|
141
141
|
title: string;
|
|
142
142
|
description: string;
|
|
143
143
|
}>;
|
|
144
|
+
export type HistoryEntry = {
|
|
145
|
+
type: string;
|
|
146
|
+
granted: boolean;
|
|
147
|
+
changedAt?: string | Date;
|
|
148
|
+
source?: string;
|
|
149
|
+
cguVersion?: string;
|
|
150
|
+
};
|
|
151
|
+
export declare function historyLine(entry: HistoryEntry): {
|
|
152
|
+
when: string;
|
|
153
|
+
what: string;
|
|
154
|
+
};
|
package/model.js
CHANGED
|
@@ -361,7 +361,8 @@ export function credentialsModel(state) {
|
|
|
361
361
|
type: "password",
|
|
362
362
|
autocomplete: "current-password",
|
|
363
363
|
value: state.password,
|
|
364
|
-
|
|
364
|
+
// No row of dots: it only restates that the field is masked.
|
|
365
|
+
placeholder: "",
|
|
365
366
|
},
|
|
366
367
|
forgot: { href: "#/forgot", label: "Forgot?" },
|
|
367
368
|
reveal: { id: "reveal", kind: "quiet", label: "Show" },
|
|
@@ -472,4 +473,25 @@ export const optionalPurposes = [
|
|
|
472
473
|
description: "Allow additional data beyond the essential service.",
|
|
473
474
|
},
|
|
474
475
|
];
|
|
475
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
|
476
|
+
// One line of a consent history, the same on Fidj's console and in every
|
|
477
|
+
// generated app. A choice is named by the title its switch carries, so the
|
|
478
|
+
// person reads back what they pressed. The source (profile, signup…) is an
|
|
479
|
+
// internal id of the screen that wrote the record: it tells a reader nothing
|
|
480
|
+
// they can act on, so it is not shown.
|
|
481
|
+
export function historyLine(entry) {
|
|
482
|
+
const when = formatDate(entry.changedAt, "datetime");
|
|
483
|
+
if (entry.type === "terms")
|
|
484
|
+
return {
|
|
485
|
+
when,
|
|
486
|
+
what: entry.granted
|
|
487
|
+
? `Service agreement accepted${entry.cguVersion ? ` · version ${entry.cguVersion}` : ""}`
|
|
488
|
+
: "Service agreement withdrawn",
|
|
489
|
+
};
|
|
490
|
+
const title = optionalPurposes.find((purpose) => purpose.key === entry.type)?.title ??
|
|
491
|
+
entry.type.charAt(0).toUpperCase() + entry.type.slice(1);
|
|
492
|
+
return {
|
|
493
|
+
when,
|
|
494
|
+
what: `${title} — ${entry.granted ? "turned on" : "turned off"}`,
|
|
495
|
+
};
|
|
496
|
+
}
|
|
497
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ofidj/entry",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.18.1",
|
|
4
4
|
"description": "The Fidj entry: sign-in, account recovery, the service agreement and the design system, shared verbatim by Fidj, the generated apps and the console.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
package/server.d.ts
CHANGED
|
@@ -24,6 +24,7 @@ export type OidcInteractionPage = {
|
|
|
24
24
|
options: unknown;
|
|
25
25
|
};
|
|
26
26
|
logoSrc?: string;
|
|
27
|
+
agreementAccepted?: boolean;
|
|
27
28
|
};
|
|
28
29
|
export declare const oidcInteractionScript = "(() => {\n const bindPasswordReveal = (root) => {\n root.querySelectorAll(\"button[aria-controls]\").forEach((button) => {\n const field = root.querySelector(\"#\" + button.getAttribute(\"aria-controls\"));\n if (!field) return;\n button.addEventListener(\"click\", () => {\n const hidden = field.type === \"password\";\n field.type = hidden ? \"text\" : \"password\";\n button.textContent = hidden ? \"Hide\" : \"Show\";\n });\n });\n };\n const bindAgreement = (root) => {\n const checkbox = root.querySelector('input[name=\"terms\"]');\n const submit = root.querySelector('button[value=\"continue\"]');\n if (!checkbox || !submit) return;\n const update = () => { submit.disabled = !checkbox.checked; };\n checkbox.addEventListener(\"change\", update);\n update();\n };\n // The passkey ceremony, on a page that may not fetch: the options came with\n // the page, the answer leaves with the form.\n const fromB64url = (value) => {\n const base64 = value.replace(/-/g, \"+\").replace(/_/g, \"/\");\n const bytes = atob(base64 + \"===\".slice((base64.length + 3) % 4));\n return Uint8Array.from(bytes, (c) => c.charCodeAt(0)).buffer;\n };\n const toB64url = (buffer) =>\n btoa(String.fromCharCode(...new Uint8Array(buffer))).replace(/\\+/g, \"-\").replace(/\\//g, \"_\").replace(/=+$/, \"\");\n const bindPasskey = (root) => {\n const button = root.querySelector('button[value=\"passkey\"][data-passkey-options]');\n if (!button) return;\n if (!window.PublicKeyCredential || !navigator.credentials) {\n button.hidden = true;\n return;\n }\n button.addEventListener(\"click\", async (event) => {\n event.preventDefault();\n const form = button.form;\n const options = JSON.parse(button.dataset.passkeyOptions);\n const publicKey = {\n ...options,\n challenge: fromB64url(options.challenge),\n allowCredentials: (options.allowCredentials || []).map((c) => ({ ...c, id: fromB64url(c.id) })),\n };\n try {\n const credential = await navigator.credentials.get({ publicKey });\n const r = credential.response;\n form.querySelector('input[name=\"passkey\"]').value = JSON.stringify({\n id: credential.id,\n rawId: toB64url(credential.rawId),\n type: credential.type,\n response: {\n clientDataJSON: toB64url(r.clientDataJSON),\n authenticatorData: toB64url(r.authenticatorData),\n signature: toB64url(r.signature),\n userHandle: r.userHandle ? toB64url(r.userHandle) : undefined,\n },\n clientExtensionResults: {},\n });\n const action = document.createElement(\"input\");\n action.type = \"hidden\";\n action.name = \"action\";\n action.value = \"passkey\";\n form.append(action);\n form.querySelectorAll(\"[required]\").forEach((field) => field.removeAttribute(\"required\"));\n form.submit();\n } catch (e) {\n // Cancelled or refused by the device: the email form is still there.\n }\n });\n };\n bindPasswordReveal(document);\n bindPasskey(document);\n bindAgreement(document);\n})();";
|
|
29
30
|
export declare const oidcInteractionStyles = ".oidc-page,.oidc-page *{box-sizing:border-box}.oidc-page{width:min(100%,560px);max-width:none;padding:0;font:15px/1.5 \"IBM Plex Sans\",system-ui,-apple-system,sans-serif;color:#14110f;text-align:left;min-height:calc(100vh - 48px);margin:0 auto;overflow:hidden;border:1px solid #e4ded7;border-radius:2px;background:#ffffff}.oidc-page .oidc-brand{display:flex;align-items:center;gap:14px;padding:16px 28px;background:#14110f;color:#fbfaf8}.oidc-page .oidc-brand img{width:36px;height:36px}.oidc-page .oidc-brand p{margin:0;font-family:\"Instrument Serif\",Georgia,\"Times New Roman\",serif;font-size:20px;font-weight:400;line-height:1.1}.oidc-page section{padding:30px 32px 36px}.oidc-page section>p{line-height:1.5;color:#4a4540}.oidc-page form{margin-top:20px}.oidc-page label{display:block;margin:18px 0 7px;font-family:\"IBM Plex Mono\",ui-monospace,SFMono-Regular,monospace;font-size:11px;letter-spacing:.1em;text-transform:uppercase;color:#6b655f}.oidc-page input,.oidc-page button{width:100%;padding:12px 14px;border:1px solid #dfd9d2;border-radius:2px;font:inherit;background:#ffffff;color:#14110f}.oidc-page input:focus{outline:none;border-color:#14110f}.oidc-page button{margin-top:12px;background:#14110f;border-color:#14110f;color:#fbfaf8;cursor:pointer;font-weight:600}.oidc-page .secondary{background:transparent;border-color:#dfd9d2;color:#14110f;font-weight:500}.oidc-page .cancel{border-color:transparent;background:transparent;color:#6b655f;font-weight:500}.oidc-page .notice{margin:0 0 4px;padding:12px 14px;border:1px solid #e8d9d6;border-left:3px solid #b8352c;background:#fdf7f6;color:#8c2a22;border-radius:2px}.oidc-page .return{margin:0;font-size:13px;color:#6b655f}.oidc-page .field-head,.oidc-page .password-field{display:flex;align-items:flex-end;gap:12px}.oidc-page .field-head{justify-content:space-between}.oidc-page .field-head label{margin-bottom:7px}.oidc-page .field-link{font-size:13px;color:#6b655f}.oidc-page .password-field input{flex:1}.oidc-page .password-field button{width:auto;margin-top:0;background:transparent;border-color:#dfd9d2;color:#14110f;font-weight:500}.oidc-page .account-picker{display:grid;grid-template-columns:40px minmax(0,1fr) 24px;align-items:center;gap:12px;padding:12px 14px;border:1px solid #e4ded7;border-radius:2px;background:#f5f1ec}.oidc-page .account-avatar{display:grid;width:40px;height:40px;place-items:center;border-radius:50%;background:#14110f;color:#fbfaf8;font-size:16px;font-weight:600}.oidc-page .account-copy{display:flex;min-width:0;flex-direction:column;gap:2px}.oidc-page .account-copy small{font-size:12px;color:#6b655f}.oidc-page .account-email{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.oidc-page .account-check{font-size:18px;font-weight:600}.oidc-page .permission-title{margin:22px 0 8px;font-family:\"IBM Plex Mono\",ui-monospace,SFMono-Regular,monospace;font-size:11px;letter-spacing:.1em;text-transform:uppercase;color:#6b655f}.oidc-page .permission-list{margin:0;padding:10px 14px 10px 32px;border:1px solid #e4ded7;border-radius:2px}.oidc-page .permission-list li{padding:3px 0}.oidc-page .account-switch{text-align:left}.oidc-page .agreement-choice{display:flex;align-items:flex-start;gap:10px;margin:20px 0 8px}.oidc-page .agreement-choice input{width:auto;accent-color:#14110f}.oidc-page .fineprint{margin:6px 0;font-size:13px;color:#6b655f}.oidc-page a{color:#14110f;text-decoration:underline;text-decoration-color:#dfd9d2;text-underline-offset:3px}@media(max-width:700px){.oidc-page{min-height:100vh;border:0}.oidc-page .oidc-brand{padding:14px 20px}.oidc-page section{padding:24px 20px 30px}.oidc-page section>h1{font-size:28px}}.oidc-page .divider{display:flex;align-items:center;gap:12px;margin:20px 0 0;font-family:\"IBM Plex Mono\",ui-monospace,SFMono-Regular,monospace;font-size:11px;letter-spacing:.1em;text-transform:uppercase;color:#6b655f}.oidc-page .divider::before,.oidc-page .divider::after{content:\"\";flex:1;height:1px;background:#e4ded7}.oidc-page button:disabled{opacity:.45;cursor:not-allowed}.oidc-page .agreement-choice a{font-weight:600}.oidc-page.oidc-page :is(h1,p,small,strong,a,li,span,input,button){letter-spacing:normal;text-transform:none;text-wrap:wrap}.oidc-page.oidc-page :is(p,small,strong,a,li,span,input,button){font-family:inherit}.oidc-page.oidc-page{margin:0 auto;max-width:none;padding:0}.oidc-page.oidc-page :is(h1,li,strong){color:inherit}.oidc-page.oidc-page label:not(.agreement-choice){font-family:\"IBM Plex Mono\",ui-monospace,SFMono-Regular,monospace;font-size:11px;letter-spacing:.1em;text-transform:uppercase;color:#6b655f;margin:18px 0 7px}.oidc-page.oidc-page .agreement-choice{margin:20px 0 8px;font-family:inherit;font-size:14px;letter-spacing:normal;text-transform:none;color:#14110f}.oidc-page.oidc-page h1{font-family:\"Instrument Serif\",Georgia,\"Times New Roman\",serif;font-weight:400;font-size:32px;line-height:1.1;margin:0 0 10px;color:#14110f}.oidc-page.oidc-page .fineprint,.oidc-page.oidc-page .return,.oidc-page.oidc-page .field-link{color:#6b655f}";
|
package/server.js
CHANGED
|
@@ -103,10 +103,17 @@ const consentFields = (page) => {
|
|
|
103
103
|
const identity = page.recognisedEmail
|
|
104
104
|
? `<div class="account-picker"><span class="account-avatar" aria-hidden="true">${escape(initial)}</span><span class="account-copy"><small>Signed in with Fidj</small><strong class="account-email">${escape(page.recognisedEmail)}</strong></span><span class="account-check" aria-hidden="true">✓</span></div>`
|
|
105
105
|
: "";
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
106
|
+
// Already on file at this version: stated, with its link, and nothing to
|
|
107
|
+
// tick — the screen then asks only which account.
|
|
108
|
+
const onFile = page.agreementAccepted && page.agreement
|
|
109
|
+
? `<p class="fineprint">You accepted the ${page.agreementHref ? `<a class="agreement-document" href="${escape(page.agreementHref)}" target="_blank" rel="noopener noreferrer">service agreement · version ${escape(page.agreement.version)} ↗</a>` : `service agreement · version ${escape(page.agreement.version)}`}.</p>`
|
|
110
|
+
: "";
|
|
111
|
+
const agreementChoice = onFile
|
|
112
|
+
? onFile
|
|
113
|
+
: page.agreement && page.agreementHref
|
|
114
|
+
? `<label class="agreement-choice"><input type="checkbox" name="terms" value="true" required> <span>I accept the <a class="agreement-document" href="${escape(page.agreementHref)}" target="_blank" rel="noopener noreferrer">service agreement · version ${escape(page.agreement.version)} ↗</a></span></label>`
|
|
115
|
+
: `<label class="agreement-choice"><input type="checkbox" name="terms" value="true" required> ${escape(agreement.checkboxLabel)}</label>`;
|
|
116
|
+
return `${identity}<p class="permission-title">${escape(page.appTitle)} will receive:</p><ul class="permission-list">${(page.scopes || []).map((scope) => `<li>${escape(scope)}</li>`).join("")}</ul>${agreementChoice}<button name="action" value="continue"${onFile ? "" : " disabled"}>Allow and continue</button><button class="secondary account-switch" name="action" value="switch" formnovalidate>Use another account</button><button class="cancel" name="action" value="cancel" formnovalidate>Cancel</button>`;
|
|
110
117
|
};
|
|
111
118
|
function interactionCopy(page) {
|
|
112
119
|
const waiting = page.mode === "waiting";
|
|
@@ -143,4 +150,4 @@ export function oidcInteractionPage(page) {
|
|
|
143
150
|
: '<script src="/oidc/assets/entry.js" defer></script>';
|
|
144
151
|
return `<!doctype html><html lang="en"><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>${copy.title} · Fidj</title><style>${documentStyles}${oidcInteractionStyles}</style><main>${oidcInteractionMarkup(page)}</main>${script}</html>`;
|
|
145
152
|
}
|
|
146
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
153
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsY0FBYyxFQUNkLGdCQUFnQixFQUNoQixpQkFBaUIsRUFDakIsZ0JBQWdCLEVBQ2hCLGlCQUFpQixHQUNsQixNQUFNLFlBQVksQ0FBQztBQUNwQixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBK0JsQyxNQUFNLENBQUMsTUFBTSxxQkFBcUIsR0FBRzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O01BMkUvQixDQUFDO0FBRVAsMkVBQTJFO0FBQzNFLDRFQUE0RTtBQUM1RSwyRUFBMkU7QUFDM0UscUNBQXFDO0FBQ3JDLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLGs1SkFBazVKLENBQUM7QUFDeDdKLE1BQU0sY0FBYyxHQUFHLHdGQUF3RixDQUFDO0FBRWhILE1BQU0sV0FBVyxHQUFHLENBQUMsSUFBeUIsRUFBRSxFQUFFLENBQ2hELElBQUksQ0FBQyxPQUFPO0lBQ1YsQ0FBQyxDQUFDLGdEQUFnRCxNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLDJCQUEyQixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDLG9CQUFvQixNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLDZEQUE2RCxNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsMkVBQTJFLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxhQUFhO0lBQ2xaLENBQUMsQ0FBQyxFQUFFLENBQUM7QUFFVCxNQUFNLFdBQVcsR0FBRyxDQUFDLElBQXlCLEVBQUUsRUFBRTtJQUNoRCxNQUFNLEtBQUssR0FBRyxnQkFBZ0IsQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUUsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUMxRSxPQUFPLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxzQkFBc0IsTUFBTSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLDhEQUE4RCxNQUFNLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsb0ZBQW9GLE1BQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxXQUFXLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLCtCQUErQixNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsa0xBQWtMLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyw4SkFBOEosSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsb0hBQW9ILENBQUMsQ0FBQyxDQUFDLEVBQUUsdUZBQXVGLENBQUM7QUFDaCtCLENBQUMsQ0FBQztBQUVGLE1BQU0sVUFBVSxHQUFHLENBQUMsSUFBeUIsRUFBRSxFQUFFO0lBQy9DLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNO1FBQ3ZCLENBQUMsQ0FBQyx1RUFBdUU7UUFDekUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNO1lBQ1gsQ0FBQyxDQUFDLHFEQUFxRDtZQUN2RCxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQ1QsT0FBTyxxSEFBcUgsS0FBSyxDQUFDLENBQUMsQ0FBQyx3QkFBd0IsS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsa09BQWtPLENBQUM7QUFDalosQ0FBQyxDQUFDO0FBRUYsTUFBTSxhQUFhLEdBQUcsQ0FBQyxJQUF5QixFQUFFLEVBQUU7SUFDbEQsTUFBTSxTQUFTLEdBQUcsY0FBYyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUN0RSxNQUFNLE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQyxlQUFlLElBQUksR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQzdFLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxlQUFlO1FBQ25DLENBQUMsQ0FBQywrRUFBK0UsTUFBTSxDQUFDLE9BQU8sQ0FBQyxxR0FBcUcsTUFBTSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsK0VBQStFO1FBQ2hULENBQUMsQ0FBQyxFQUFFLENBQUM7SUFDUCx5RUFBeUU7SUFDekUsa0RBQWtEO0lBQ2xELE1BQU0sTUFBTSxHQUNWLElBQUksQ0FBQyxpQkFBaUIsSUFBSSxJQUFJLENBQUMsU0FBUztRQUN0QyxDQUFDLENBQUMseUNBQXlDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLHVDQUF1QyxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQywyRUFBMkUsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsK0JBQStCLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxFQUFFLE9BQU87UUFDM1QsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUNULE1BQU0sZUFBZSxHQUFHLE1BQU07UUFDNUIsQ0FBQyxDQUFDLE1BQU07UUFDUixDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFJLENBQUMsYUFBYTtZQUNwQyxDQUFDLENBQUMscUpBQXFKLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLDJFQUEyRSxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsdUJBQXVCO1lBQ2pULENBQUMsQ0FBQyw4RkFBOEYsTUFBTSxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsVUFBVSxDQUFDO0lBQzlJLE9BQU8sR0FBRyxRQUFRLCtCQUErQixNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxpREFBaUQsQ0FBQyxJQUFJLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsT0FBTyxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxlQUFlLHlDQUF5QyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxpT0FBaU8sQ0FBQztBQUM1ZixDQUFDLENBQUM7QUFFRixTQUFTLGVBQWUsQ0FBQyxJQUF5QjtJQUNoRCxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsSUFBSSxLQUFLLFNBQVMsQ0FBQztJQUN4QyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsSUFBSSxLQUFLLE9BQU8sQ0FBQztJQUNwQyxPQUFPO1FBQ0wsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxXQUFXO1FBQ3JFLE9BQU8sRUFBRSxPQUFPO1lBQ2QsQ0FBQyxDQUFDLGtCQUFrQjtZQUNwQixDQUFDLENBQUMsS0FBSztnQkFDTCxDQUFDLENBQUMsK0NBQStDLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUc7Z0JBQ3pFLENBQUMsQ0FBQyxlQUFlLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7UUFDNUMsSUFBSSxFQUFFLE9BQU87WUFDWCxDQUFDLENBQUMsNkVBQTZFLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVk7WUFDcEgsQ0FBQyxDQUFDLEVBQUU7UUFDTixNQUFNLEVBQUUsT0FBTztZQUNiLENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDO1lBQ2xCLENBQUMsQ0FBQyxLQUFLO2dCQUNMLENBQUMsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO2dCQUNuQixDQUFDLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQztLQUMxQixDQUFDO0FBQ0osQ0FBQztBQUVELDRFQUE0RTtBQUM1RSwwRUFBMEU7QUFDMUUsK0RBQStEO0FBQy9ELE1BQU0sVUFBVSxxQkFBcUIsQ0FBQyxJQUF5QjtJQUM3RCxNQUFNLElBQUksR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkMsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksS0FBSyxTQUFTLENBQUM7SUFDeEMsT0FBTywrREFBK0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLElBQUksdUJBQXVCLENBQUMsbUdBQW1HLElBQUksQ0FBQyxPQUFPLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsSUFBSSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUscUJBQXFCLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsT0FBTyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLGtDQUFrQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLGdEQUFnRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyw2Q0FBNkMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsTUFBTSxVQUFVLElBQUksQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxxRUFBcUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxrQkFBa0IsQ0FBQztBQUNsc0IsQ0FBQztBQUVELE1BQU0sVUFBVSxtQkFBbUIsQ0FBQyxJQUF5QjtJQUMzRCxNQUFNLElBQUksR0FBRyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbkMsTUFBTSxNQUFNLEdBQ1YsSUFBSSxDQUFDLElBQUksS0FBSyxTQUFTO1FBQ3JCLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLHFEQUFxRCxDQUFDO0lBQzVELE9BQU8sbUlBQW1JLElBQUksQ0FBQyxLQUFLLHlCQUF5QixjQUFjLEdBQUcscUJBQXFCLGlCQUFpQixxQkFBcUIsQ0FBQyxJQUFJLENBQUMsVUFBVSxNQUFNLFNBQVMsQ0FBQztBQUMzUixDQUFDIn0=
|
package/style.css
CHANGED
|
@@ -760,7 +760,10 @@ body.has-module {
|
|
|
760
760
|
gap: 32px;
|
|
761
761
|
padding: 36px 24px 32px;
|
|
762
762
|
}
|
|
763
|
+
/* On a phone the form is what somebody came for; the app's hero follows it
|
|
764
|
+
* rather than filling the first screen. */
|
|
763
765
|
.signin-form {
|
|
766
|
+
order: -1;
|
|
764
767
|
padding: 36px 24px 32px;
|
|
765
768
|
}
|
|
766
769
|
.signin-description {
|
|
@@ -780,8 +783,9 @@ body.has-module {
|
|
|
780
783
|
.public-content h1 {
|
|
781
784
|
font-size: clamp(2rem, 5vw, 3.5rem);
|
|
782
785
|
}
|
|
786
|
+
/* As wide as the app's content: the profile is a page of the app, not a
|
|
787
|
+
* narrower card floating in it. */
|
|
783
788
|
.content-account {
|
|
784
|
-
max-width: 680px;
|
|
785
789
|
margin: 2rem auto;
|
|
786
790
|
}
|
|
787
791
|
.profile-summary {
|
|
@@ -1110,21 +1114,19 @@ button.quiet {
|
|
|
1110
1114
|
|
|
1111
1115
|
/* The Fidj door.
|
|
1112
1116
|
*
|
|
1113
|
-
*
|
|
1114
|
-
*
|
|
1115
|
-
*
|
|
1116
|
-
* and
|
|
1117
|
-
* screen wears it, which is what makes it read as the way in rather than as one
|
|
1118
|
-
* option among several. */
|
|
1117
|
+
* It is the entry's primary, and Fidj's primary is ink — on the console and
|
|
1118
|
+
* in every app. It used to wear the accent, which made "Continue as …" the one
|
|
1119
|
+
* red button in a product whose every other way forward is ink. Being first
|
|
1120
|
+
* and full width is what makes it the way in. */
|
|
1119
1121
|
.primary.fidj-entry {
|
|
1120
|
-
background: var(--fidj-
|
|
1121
|
-
border-color: var(--fidj-
|
|
1122
|
-
color: var(--fidj-
|
|
1122
|
+
background: var(--fidj-ink);
|
|
1123
|
+
border-color: var(--fidj-ink);
|
|
1124
|
+
color: var(--fidj-paper);
|
|
1123
1125
|
margin-top: 0;
|
|
1124
1126
|
}
|
|
1125
1127
|
.primary.fidj-entry:hover:not(:disabled) {
|
|
1126
|
-
background: var(--fidj-
|
|
1127
|
-
border-color: var(--fidj-
|
|
1128
|
+
background: var(--fidj-ink-raised);
|
|
1129
|
+
border-color: var(--fidj-ink-raised);
|
|
1128
1130
|
}
|
|
1129
1131
|
/* While the Fidj window is open, the door is no longer the way in — it is the
|
|
1130
1132
|
* way back to the window doing the work. So it reads as a state rather than an
|
|
@@ -1311,7 +1313,8 @@ button.quiet {
|
|
|
1311
1313
|
background: var(--fidj-surface);
|
|
1312
1314
|
margin: 12px 0 16px;
|
|
1313
1315
|
}
|
|
1314
|
-
.member-row
|
|
1316
|
+
.member-row,
|
|
1317
|
+
.member-rows .member-row {
|
|
1315
1318
|
display: flex;
|
|
1316
1319
|
align-items: center;
|
|
1317
1320
|
justify-content: space-between;
|
|
@@ -1338,6 +1341,11 @@ button.quiet {
|
|
|
1338
1341
|
color: var(--fidj-text-faint);
|
|
1339
1342
|
font-size: 12.5px;
|
|
1340
1343
|
}
|
|
1344
|
+
.member-row > button {
|
|
1345
|
+
flex: none;
|
|
1346
|
+
width: auto;
|
|
1347
|
+
margin: 0;
|
|
1348
|
+
}
|
|
1341
1349
|
.member-row .nosw {
|
|
1342
1350
|
max-width: 190px;
|
|
1343
1351
|
text-align: right;
|
|
@@ -1407,11 +1415,6 @@ input[role="switch"]:focus-visible {
|
|
|
1407
1415
|
font-size: 13px;
|
|
1408
1416
|
color: var(--fidj-text-muted);
|
|
1409
1417
|
}
|
|
1410
|
-
.member-history summary {
|
|
1411
|
-
cursor: pointer;
|
|
1412
|
-
font-weight: 500;
|
|
1413
|
-
color: var(--fidj-text);
|
|
1414
|
-
}
|
|
1415
1418
|
.member-history p {
|
|
1416
1419
|
margin: 6px 0;
|
|
1417
1420
|
}
|