@ofidj/generator-fidj 1.0.6 → 1.0.7
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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export function agreementMarkup() {
|
|
2
|
-
return `<div class="signin-agreement"><label class="agreement-choice"><input id="service-agreement" type="checkbox" aria-required="true" disabled><span id="agreement-label">I accept the service agreement for this app.</span></label><button type="button" id="read-agreement" disabled>Read service agreement</button><p id="agreement-status" class="fineprint" role="status">Loading service agreement…</p></div><dialog id="agreement-dialog" aria-labelledby="agreement-heading"><h2 id="agreement-heading">Service agreement</h2><p id="agreement-version"></p><p id="agreement-text"></p><button type="button" id="close-agreement">Close agreement</button></dialog>`;
|
|
2
|
+
return `<div class="signin-agreement"><label class="agreement-choice"><input id="service-agreement" type="checkbox" aria-required="true" disabled><span id="agreement-label">I accept the service agreement for this app.</span></label><button type="button" id="read-agreement" disabled>Read service agreement</button><p id="agreement-status" class="fineprint" role="status">Loading service agreement…</p><button type="button" id="retry-agreement" hidden>Retry</button></div><dialog id="agreement-dialog" aria-labelledby="agreement-heading"><h2 id="agreement-heading">Service agreement</h2><p id="agreement-version"></p><p id="agreement-text"></p><button type="button" id="close-agreement">Close agreement</button></dialog>`;
|
|
3
3
|
}
|
|
4
4
|
|
|
5
5
|
export function acceptedAgreement(form: HTMLFormElement) {
|
|
@@ -24,6 +24,7 @@ export async function bindAgreement(form: HTMLFormElement | null, title: string,
|
|
|
24
24
|
const read = form.querySelector<HTMLButtonElement>("#read-agreement")!;
|
|
25
25
|
const dialog = form.querySelector<HTMLDialogElement>("#agreement-dialog")!;
|
|
26
26
|
const status = form.querySelector<HTMLElement>("#agreement-status")!;
|
|
27
|
+
const retry = form.querySelector<HTMLButtonElement>("#retry-agreement")!;
|
|
27
28
|
const submitButtons = form.querySelectorAll<HTMLButtonElement>('button[type="submit"]');
|
|
28
29
|
const update = () => submitButtons.forEach(button => { button.disabled = checkbox.disabled; });
|
|
29
30
|
form.querySelector("#agreement-label")!.textContent = `I accept the service agreement for ${title}.`;
|
|
@@ -31,21 +32,31 @@ export async function bindAgreement(form: HTMLFormElement | null, title: string,
|
|
|
31
32
|
checkbox.addEventListener("change", update);
|
|
32
33
|
read.addEventListener("click", () => dialog.showModal());
|
|
33
34
|
form.querySelector("#close-agreement")!.addEventListener("click", () => dialog.close());
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
35
|
+
const load = async () => {
|
|
36
|
+
retry.hidden = true;
|
|
37
|
+
status.textContent = "Loading service agreement…";
|
|
38
|
+
try {
|
|
39
|
+
const response = await fetch(`${endpoint}/apps/${encodeURIComponent(appId)}`, {signal: AbortSignal.timeout(10000)});
|
|
40
|
+
if (!response.ok) throw new Error(response.status === 404 ? "missing" : "unreachable");
|
|
41
|
+
const agreement = (await response.json()).app?.agreement;
|
|
42
|
+
if (!agreement || typeof agreement.version !== "string" || !agreement.version || typeof agreement.text !== "string" || !agreement.text) throw new Error("missing");
|
|
43
|
+
if (!form.isConnected) return;
|
|
44
|
+
checkbox.dataset.version = agreement.version;
|
|
45
|
+
checkbox.disabled = false;
|
|
46
|
+
checkbox.checked = checked;
|
|
47
|
+
read.disabled = false;
|
|
48
|
+
dialog.querySelector("#agreement-version")!.textContent = `Version ${agreement.version}`;
|
|
49
|
+
dialog.querySelector("#agreement-text")!.textContent = agreement.text;
|
|
50
|
+
status.textContent = "Required to sign in. Optional data choices stay separate.";
|
|
51
|
+
update();
|
|
52
|
+
} catch (error) {
|
|
53
|
+
if (!form.isConnected) return;
|
|
54
|
+
status.textContent = error instanceof Error && error.message === "missing"
|
|
55
|
+
? "This app has no service agreement available."
|
|
56
|
+
: "We cannot reach Fidj right now. Try again.";
|
|
57
|
+
retry.hidden = false;
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
retry.addEventListener("click", load);
|
|
61
|
+
await load();
|
|
51
62
|
}
|