@gerege-systems/eid-mongolia-sdk 0.19.0 → 0.20.0
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/README.md +53 -1
- package/dist/button.cjs +71 -8
- package/dist/button.d.cts +15 -1
- package/dist/button.d.ts +15 -1
- package/dist/button.js +71 -8
- package/dist/chunk-ARITEQLS.js +1955 -0
- package/dist/{chunk-6M7VPMJU.js → chunk-HLSFSIWP.js} +55 -13
- package/dist/convert.js +3 -1
- package/dist/fetch-BjfH46q9.d.cts +12 -0
- package/dist/fetch-BjfH46q9.d.ts +12 -0
- package/dist/index.cjs +46 -16
- package/dist/index.d.cts +5 -4
- package/dist/index.d.ts +5 -4
- package/dist/index.js +7 -6
- package/dist/pades.cjs +25 -13
- package/dist/pades.d.cts +1 -11
- package/dist/pades.d.ts +1 -11
- package/dist/pades.js +24 -1925
- package/dist/validate.cjs +5540 -0
- package/dist/validate.d.cts +98 -0
- package/dist/validate.d.ts +98 -0
- package/dist/validate.js +3462 -0
- package/package.json +9 -3
package/README.md
CHANGED
|
@@ -162,7 +162,28 @@ app.use("/auth/eid", express.json(), async (req, res) => {
|
|
|
162
162
|
|
|
163
163
|
`label`, `icon`, `variant`, `aria-label`, `lang` өөрчлөгдөхөд товч шууд шинэчлэгдэнэ. `icon="none"` ба текстгүй
|
|
164
164
|
(`variant="icon"` эсвэл `label=""`) хослол нь хоосон товч болохгүй — анхдагч текст харагдаж, console-д нэг удаа анхааруулна.
|
|
165
|
-
Үйл явдал: `eid-login-success`, `eid-login-error` (
|
|
165
|
+
Үйл явдал: `eid-login-success`, `eid-login-error` (доор).
|
|
166
|
+
|
|
167
|
+
**`eid-login-error`** (0.20.0) — start амжилтгүй болох эсвэл нэвтрэлт амжилтгүй дуусах бүрд (`bubbles: true`,
|
|
168
|
+
`composed: true` — shadow DOM-оос гадагш). `detail`:
|
|
169
|
+
|
|
170
|
+
| Талбар | Утга |
|
|
171
|
+
|---|---|
|
|
172
|
+
| `error` | код эсвэл төрөл (`EXPIRED`, `USER_REFUSED…`, `VALIDATION` …) — өмнөх хувилбартай ижил |
|
|
173
|
+
| `status` | start-ийн HTTP статус; сүлжээний алдаанд `0`; poll-ийн алдаанд `null` |
|
|
174
|
+
| `code` | хариуны `error`/`code`, эсвэл `HTTP_<статус>` / `NETWORK` |
|
|
175
|
+
| `retryAfter` | `Retry-After` (секунд) эсвэл `null` |
|
|
176
|
+
|
|
177
|
+
429 / 503 (`{"error":"busy"}`) үед товч «Систем завгүй — N сек дараа дахин оролдоно уу» / "Service busy — try again in N s"
|
|
178
|
+
гэж `Retry-After`-оор (анхдагч 30 с) тоолж, дуустал «Дахин оролдох» (push маягтад «Мэдэгдэл илгээх») идэвхгүй байна.
|
|
179
|
+
|
|
180
|
+
```js
|
|
181
|
+
document.querySelector("eid-login-button").addEventListener("eid-login-error", (e) => {
|
|
182
|
+
const { status, code, retryAfter } = e.detail;
|
|
183
|
+
if (status === 429 || status === 503) console.warn(`eID busy (${code}), retry in ${retryAfter ?? 30}s`);
|
|
184
|
+
});
|
|
185
|
+
```
|
|
186
|
+
|
|
166
187
|
Гадны хамааралгүй (QR encoder дотроо), цонх нь focus trap, Esc, `aria-live` төлөвтэй.
|
|
167
188
|
|
|
168
189
|
**Дизайн, theme.** Дизайн нь eID нэвтрэх хуудсынх (лого, өнгө). Фонт нь хуудаснаас өвлөгдөнө (товч, цонх, input бүгд).
|
|
@@ -723,6 +744,37 @@ if (info.enabled) {
|
|
|
723
744
|
401 → `AuthenticationError`, 403 (SIGN эрхгүй, IP/mTLS) → `ForbiddenError`. Квот: RP тутам цагт 30 / өдөрт 200 хүсэлт,
|
|
724
745
|
хүлээн авагч тутам өдөрт 10 имэйл (бодит утгыг `shareInfo().quota`-аас). Хугацаа анхдагч 150 с (`timeoutMs`).
|
|
725
746
|
|
|
747
|
+
## 3g. Гарын үсэгтэй PDF шалгах — `@gerege-systems/eid-mongolia-sdk/validate` (0.20.0)
|
|
748
|
+
|
|
749
|
+
PDF-ийг **хөтөч эсвэл Node дотор** шалгана — файл хаашаа ч илгээгдэхгүй. CA-ийн нийтийн шалгагчийн (`/v3/validate/pdf`,
|
|
750
|
+
Go SDK `pades.ValidatePDF`) дүрэм, ижил JSON тайлан (snake_case); conformance багц нь гурвууланд нэг.
|
|
751
|
+
|
|
752
|
+
```ts
|
|
753
|
+
import { validatePdf, ValidatePdfError } from "@gerege-systems/eid-mongolia-sdk/validate";
|
|
754
|
+
|
|
755
|
+
try {
|
|
756
|
+
const rep = await validatePdf(new Uint8Array(await file.arrayBuffer())); // анхдагч: үндэсний Root CA, онлайн цуцлалт
|
|
757
|
+
rep.indication; // "valid" | "invalid" | "indeterminate"
|
|
758
|
+
for (const s of rep.signatures) {
|
|
759
|
+
s.signer_name; s.signing_time; s.signature_level; s.certificate_level; s.problems; s.visible; s.key_medium;
|
|
760
|
+
}
|
|
761
|
+
} catch (e) {
|
|
762
|
+
if (e instanceof ValidatePdfError) e.code; // PDF_NO_SIGNATURE | PDF_INVALID | PDF_TOO_LARGE | PDF_TOO_MANY_SIGNATURES
|
|
763
|
+
}
|
|
764
|
+
```
|
|
765
|
+
|
|
766
|
+
- Шалгалт: ByteRange (завсар нь яг `/Contents`) ба messageDigest, CMS гарын үсэг (WebCrypto), signingCertificateV2,
|
|
767
|
+
гинж (үндэсний 01 → 02/03 → 04/05), KU/EKU, хугацаа (цагийн тэмдгийн цагт), RFC 3161 токен, гарын үсгийн ДАРААХ revision
|
|
768
|
+
(eID-ийн гарын үсэг/LTV-ээс өөр бүх өөрчлөлт → `modified_after_signing`), харагдах гарын үсэг (APPEARANCE_SPEC §5), `ltv`,
|
|
769
|
+
`certificate_level` (qcStatements: QUALIFIED/QSCD, бусад ADVANCED).
|
|
770
|
+
- Цуцлалт (eID-ийн 04/05-аас гарсан гэрчилгээнд): онлайн — AIA OCSP, эс бөгөөс CDP CRL (`fetch` + AbortSignal; хөтөчид
|
|
771
|
+
`http://ocsp.|crl.eidmongolia.mn` → https, CORS `*`); хариугүй эсвэл `offline: true` бол баримтын DSS. Аль нь ч үгүй →
|
|
772
|
+
`revocation_unavailable`. Сүлжээгээр зөвхөн гэрчилгээний serial (OCSP хүсэлт) явна.
|
|
773
|
+
- Options: `roots`, `intermediates`, `issuers` (DER, тест), `time`, `offline`, `fetch`, `signal`.
|
|
774
|
+
- `key_medium` — гэрчилгээнээс л: qcStatements-тэй иргэний SIGN → `phone`, бусад `unknown` (CA өөрийн бүртгэлээс `token`
|
|
775
|
+
ч тогтооно). `session_id`, `doc_id`, `on_behalf_of_*` нь CA-ийн бүртгэлээс — локал тайланд байхгүй.
|
|
776
|
+
- Хөтчийн bundle (минифай): ~245 KB, gzip ~134 KB (`npm run size:validate`, хязгаар 300 KB).
|
|
777
|
+
|
|
726
778
|
## 4. QR ба ижил төхөөрөмж — device link v3
|
|
727
779
|
|
|
728
780
|
Иргэн өөр төхөөрөмжийн дэлгэц дээрх **QR**-ийг утсаараа уншина, эсвэл RP-ийн сайт/аппыг eID апптай **ижил
|
package/dist/button.cjs
CHANGED
|
@@ -426,7 +426,8 @@ var T = {
|
|
|
426
426
|
retry: "\u0414\u0430\u0445\u0438\u043D \u043E\u0440\u043E\u043B\u0434\u043E\u0445",
|
|
427
427
|
success: "\u0410\u043C\u0436\u0438\u043B\u0442\u0442\u0430\u0439 \u043D\u044D\u0432\u0442\u044D\u0440\u043B\u044D\u044D",
|
|
428
428
|
sent: (vc) => `\u041C\u044D\u0434\u044D\u0433\u0434\u044D\u043B \u0438\u043B\u0433\u044D\u044D\u043B\u044D\u044D. \u0423\u0442\u0441\u0430\u043D \u0434\u044D\u044D\u0440\u0445 \u043A\u043E\u0434 ${vc.split("").join(" ")}`,
|
|
429
|
-
minutes: (n) => `${n} \u043C\u0438\u043D\u0443\u0442 \u04AF\u043B\u0434\u043B\u044D\u044D
|
|
429
|
+
minutes: (n) => `${n} \u043C\u0438\u043D\u0443\u0442 \u04AF\u043B\u0434\u043B\u044D\u044D`,
|
|
430
|
+
busy: (n) => `\u0421\u0438\u0441\u0442\u0435\u043C \u0437\u0430\u0432\u0433\u04AF\u0439 \u2014 ${n} \u0441\u0435\u043A \u0434\u0430\u0440\u0430\u0430 \u0434\u0430\u0445\u0438\u043D \u043E\u0440\u043E\u043B\u0434\u043E\u043D\u043E \u0443\u0443`
|
|
430
431
|
},
|
|
431
432
|
en: {
|
|
432
433
|
button: "Log in with eID",
|
|
@@ -464,9 +465,25 @@ var T = {
|
|
|
464
465
|
retry: "Try again",
|
|
465
466
|
success: "Logged in",
|
|
466
467
|
sent: (vc) => `Notification sent. Code on your phone ${vc.split("").join(" ")}`,
|
|
467
|
-
minutes: (n) => `${n} minute${n === 1 ? "" : "s"} left
|
|
468
|
+
minutes: (n) => `${n} minute${n === 1 ? "" : "s"} left`,
|
|
469
|
+
busy: (n) => `Service busy \u2014 try again in ${n} s`
|
|
468
470
|
}
|
|
469
471
|
};
|
|
472
|
+
var BUSY_DEFAULT_S = 30;
|
|
473
|
+
function retryAfterOf(r) {
|
|
474
|
+
const v = r.headers.get("Retry-After")?.trim();
|
|
475
|
+
if (!v) return null;
|
|
476
|
+
if (/^\d+$/.test(v)) return Number(v);
|
|
477
|
+
const t = Date.parse(v);
|
|
478
|
+
return Number.isNaN(t) ? null : Math.max(0, Math.ceil((t - Date.now()) / 1e3));
|
|
479
|
+
}
|
|
480
|
+
async function startErrorOf(r, body) {
|
|
481
|
+
if (!r) return { error: "NETWORK", status: 0, code: "NETWORK", retryAfter: null };
|
|
482
|
+
const b = body ?? await r.json().catch(() => ({}));
|
|
483
|
+
const c = typeof b.error === "string" ? b.error : typeof b.code === "string" ? b.code : `HTTP_${r.status}`;
|
|
484
|
+
return { error: c, status: r.status, code: c, retryAfter: retryAfterOf(r) };
|
|
485
|
+
}
|
|
486
|
+
var isBusy = (d) => d.status === 429 || d.status === 503;
|
|
470
487
|
var EID_COLOR_TOKENS = [
|
|
471
488
|
["bg", "hsl(0 0% 100%)", "hsl(229 50% 6%)"],
|
|
472
489
|
["bg-subtle", "hsl(210 40% 98%)", "hsl(222 47% 9%)"],
|
|
@@ -800,13 +817,14 @@ var EidLoginButton = class extends Base {
|
|
|
800
817
|
body: JSON.stringify({ ...body, lang: this.attr("lang") === "en" ? "en" : "mn" })
|
|
801
818
|
});
|
|
802
819
|
} catch {
|
|
803
|
-
if (gen === this.gen && body.mode === "qr") this.end("unavailable");
|
|
820
|
+
if (gen === this.gen && body.mode === "qr") void startErrorOf(null).then((d) => this.end("unavailable", d));
|
|
804
821
|
return null;
|
|
805
822
|
}
|
|
806
823
|
if (gen !== this.gen) return null;
|
|
807
824
|
if (body.mode === "push") return r;
|
|
808
825
|
if (!r.ok) {
|
|
809
|
-
|
|
826
|
+
const d = await startErrorOf(r);
|
|
827
|
+
if (gen === this.gen) this.end(isBusy(d) ? "busy" : "unavailable", d);
|
|
810
828
|
return null;
|
|
811
829
|
}
|
|
812
830
|
const s = await r.json();
|
|
@@ -958,10 +976,18 @@ var EidLoginButton = class extends Base {
|
|
|
958
976
|
void this.begin(gen, { mode: "push", idCode: input.value.replace(/\s+/g, "").toUpperCase() }).then(async (r) => {
|
|
959
977
|
if (gen !== this.gen) return;
|
|
960
978
|
busy(false);
|
|
961
|
-
if (!r)
|
|
979
|
+
if (!r) {
|
|
980
|
+
this.emitError(await startErrorOf(null));
|
|
981
|
+
return setErr(t.pushFailed);
|
|
982
|
+
}
|
|
962
983
|
const b = await r.json().catch(() => ({}));
|
|
963
984
|
if (r.ok && b.vc) return this.showWait(b);
|
|
964
|
-
|
|
985
|
+
const d = await startErrorOf(r, b);
|
|
986
|
+
this.emitError(d);
|
|
987
|
+
if (isBusy(d)) {
|
|
988
|
+
btn.disabled = true;
|
|
989
|
+
return this.countdown(gen, d.retryAfter ?? BUSY_DEFAULT_S, (n) => setErr(n > 0 ? t.busy(n) : ""), () => btn.disabled = false);
|
|
990
|
+
}
|
|
965
991
|
if (r.status === 400) return setErr(t.idBad);
|
|
966
992
|
setErr(t.pushFailed);
|
|
967
993
|
});
|
|
@@ -1039,12 +1065,37 @@ var EidLoginButton = class extends Base {
|
|
|
1039
1065
|
const to = s.redirect ?? this.getAttribute("success-url");
|
|
1040
1066
|
if (go && to) this.navigate(to);
|
|
1041
1067
|
}
|
|
1068
|
+
emitError(detail) {
|
|
1069
|
+
this.dispatchEvent(new CustomEvent("eid-login-error", { detail, bubbles: true, composed: true }));
|
|
1070
|
+
}
|
|
1071
|
+
/** n секундээс 0 хүртэл секунд тутам show(n); 0 болоход done(). Цонх хаагдвал (gen өөрчлөгдвөл) зогсоно. */
|
|
1072
|
+
countdown(gen, n, show, done) {
|
|
1073
|
+
clearInterval(this.tick);
|
|
1074
|
+
show(n);
|
|
1075
|
+
if (n <= 0) return done();
|
|
1076
|
+
this.tick = setInterval(() => {
|
|
1077
|
+
if (gen !== this.gen) return clearInterval(this.tick);
|
|
1078
|
+
n--;
|
|
1079
|
+
show(n);
|
|
1080
|
+
if (n <= 0) {
|
|
1081
|
+
clearInterval(this.tick);
|
|
1082
|
+
done();
|
|
1083
|
+
}
|
|
1084
|
+
}, 1e3);
|
|
1085
|
+
}
|
|
1042
1086
|
end(kind, error) {
|
|
1043
1087
|
clearTimeout(this.timer);
|
|
1044
1088
|
clearInterval(this.tick);
|
|
1045
1089
|
this.gen++;
|
|
1046
1090
|
const t = this.t;
|
|
1047
|
-
const titles = {
|
|
1091
|
+
const titles = {
|
|
1092
|
+
expired: t.expiredTitle,
|
|
1093
|
+
refused: t.refusedTitle,
|
|
1094
|
+
failed: t.failedTitle,
|
|
1095
|
+
unavailable: t.failedTitle,
|
|
1096
|
+
busy: t.failedTitle,
|
|
1097
|
+
callback: t.callbackTitle
|
|
1098
|
+
};
|
|
1048
1099
|
const c = el("div", { class: "end", role: "alert" });
|
|
1049
1100
|
const h = el("h2", { tabindex: "-1" }, titles[kind]);
|
|
1050
1101
|
c.append(h);
|
|
@@ -1054,8 +1105,20 @@ var EidLoginButton = class extends Base {
|
|
|
1054
1105
|
if (kind !== "callback") {
|
|
1055
1106
|
const retry = el("button", { type: "button", class: "btn btn-primary" }, t.retry);
|
|
1056
1107
|
retry.addEventListener("click", () => this.open());
|
|
1108
|
+
if (kind === "busy") {
|
|
1109
|
+
const msg = el("p", { class: "text busy", role: "status" });
|
|
1110
|
+
c.append(msg);
|
|
1111
|
+
retry.disabled = true;
|
|
1112
|
+
const d = error;
|
|
1113
|
+
this.countdown(this.gen, d.retryAfter ?? BUSY_DEFAULT_S, (n) => msg.textContent = n > 0 ? t.busy(n) : "", () => {
|
|
1114
|
+
retry.disabled = false;
|
|
1115
|
+
msg.hidden = true;
|
|
1116
|
+
});
|
|
1117
|
+
}
|
|
1057
1118
|
c.append(retry);
|
|
1058
|
-
this.
|
|
1119
|
+
this.emitError(
|
|
1120
|
+
typeof error === "object" ? error : { error: error ?? kind.toUpperCase(), status: null, code: error ?? kind.toUpperCase(), retryAfter: null }
|
|
1121
|
+
);
|
|
1059
1122
|
}
|
|
1060
1123
|
this.view(c);
|
|
1061
1124
|
h.focus();
|
package/dist/button.d.cts
CHANGED
|
@@ -9,6 +9,17 @@ interface EidLoginStatus {
|
|
|
9
9
|
data?: unknown;
|
|
10
10
|
error?: string;
|
|
11
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* `eid-login-error` event-ийн detail. `error` — хуучин талбар (код эсвэл төрөл); `status` — start-ийн HTTP статус (сүлжээний
|
|
14
|
+
* алдаанд 0, start-аас бусад алдаанд null); `code` — хариуны `error`/`code` (эсвэл `NETWORK`, `HTTP_<статус>`);
|
|
15
|
+
* `retryAfter` — Retry-After (секунд) эсвэл null.
|
|
16
|
+
*/
|
|
17
|
+
interface EidLoginErrorDetail {
|
|
18
|
+
error: string;
|
|
19
|
+
status: number | null;
|
|
20
|
+
code: string;
|
|
21
|
+
retryAfter: number | null;
|
|
22
|
+
}
|
|
12
23
|
interface EidLoginButtonOptions {
|
|
13
24
|
/** Backend start endpoint (ж: `/auth/eid/start`). */
|
|
14
25
|
startUrl: string;
|
|
@@ -95,6 +106,9 @@ declare class EidLoginButton extends Base {
|
|
|
95
106
|
private schedule;
|
|
96
107
|
private poll;
|
|
97
108
|
private succeed;
|
|
109
|
+
private emitError;
|
|
110
|
+
/** n секундээс 0 хүртэл секунд тутам show(n); 0 болоход done(). Цонх хаагдвал (gen өөрчлөгдвөл) зогсоно. */
|
|
111
|
+
private countdown;
|
|
98
112
|
private end;
|
|
99
113
|
}
|
|
100
114
|
/** `<eid-login-button>`-ийг бүртгэнэ (давхар бүртгэхгүй). Энэ модулийг импортлоход автоматаар дуудагдана. */
|
|
@@ -102,4 +116,4 @@ declare function defineEidLoginButton(tag?: string): void;
|
|
|
102
116
|
/** Элементэд товч нэмнэ (framework-гүй хуудас, React/Vue-ийн ref). Үүссэн элементийг буцаана. */
|
|
103
117
|
declare function mountEidLoginButton(target: Element, opts: EidLoginButtonOptions): EidLoginButton;
|
|
104
118
|
|
|
105
|
-
export { EidLoginButton, type EidLoginButtonOptions, type EidLoginStatus, defineEidLoginButton, mountEidLoginButton, resolveEidTheme };
|
|
119
|
+
export { EidLoginButton, type EidLoginButtonOptions, type EidLoginErrorDetail, type EidLoginStatus, defineEidLoginButton, mountEidLoginButton, resolveEidTheme };
|
package/dist/button.d.ts
CHANGED
|
@@ -9,6 +9,17 @@ interface EidLoginStatus {
|
|
|
9
9
|
data?: unknown;
|
|
10
10
|
error?: string;
|
|
11
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* `eid-login-error` event-ийн detail. `error` — хуучин талбар (код эсвэл төрөл); `status` — start-ийн HTTP статус (сүлжээний
|
|
14
|
+
* алдаанд 0, start-аас бусад алдаанд null); `code` — хариуны `error`/`code` (эсвэл `NETWORK`, `HTTP_<статус>`);
|
|
15
|
+
* `retryAfter` — Retry-After (секунд) эсвэл null.
|
|
16
|
+
*/
|
|
17
|
+
interface EidLoginErrorDetail {
|
|
18
|
+
error: string;
|
|
19
|
+
status: number | null;
|
|
20
|
+
code: string;
|
|
21
|
+
retryAfter: number | null;
|
|
22
|
+
}
|
|
12
23
|
interface EidLoginButtonOptions {
|
|
13
24
|
/** Backend start endpoint (ж: `/auth/eid/start`). */
|
|
14
25
|
startUrl: string;
|
|
@@ -95,6 +106,9 @@ declare class EidLoginButton extends Base {
|
|
|
95
106
|
private schedule;
|
|
96
107
|
private poll;
|
|
97
108
|
private succeed;
|
|
109
|
+
private emitError;
|
|
110
|
+
/** n секундээс 0 хүртэл секунд тутам show(n); 0 болоход done(). Цонх хаагдвал (gen өөрчлөгдвөл) зогсоно. */
|
|
111
|
+
private countdown;
|
|
98
112
|
private end;
|
|
99
113
|
}
|
|
100
114
|
/** `<eid-login-button>`-ийг бүртгэнэ (давхар бүртгэхгүй). Энэ модулийг импортлоход автоматаар дуудагдана. */
|
|
@@ -102,4 +116,4 @@ declare function defineEidLoginButton(tag?: string): void;
|
|
|
102
116
|
/** Элементэд товч нэмнэ (framework-гүй хуудас, React/Vue-ийн ref). Үүссэн элементийг буцаана. */
|
|
103
117
|
declare function mountEidLoginButton(target: Element, opts: EidLoginButtonOptions): EidLoginButton;
|
|
104
118
|
|
|
105
|
-
export { EidLoginButton, type EidLoginButtonOptions, type EidLoginStatus, defineEidLoginButton, mountEidLoginButton, resolveEidTheme };
|
|
119
|
+
export { EidLoginButton, type EidLoginButtonOptions, type EidLoginErrorDetail, type EidLoginStatus, defineEidLoginButton, mountEidLoginButton, resolveEidTheme };
|
package/dist/button.js
CHANGED
|
@@ -397,7 +397,8 @@ var T = {
|
|
|
397
397
|
retry: "\u0414\u0430\u0445\u0438\u043D \u043E\u0440\u043E\u043B\u0434\u043E\u0445",
|
|
398
398
|
success: "\u0410\u043C\u0436\u0438\u043B\u0442\u0442\u0430\u0439 \u043D\u044D\u0432\u0442\u044D\u0440\u043B\u044D\u044D",
|
|
399
399
|
sent: (vc) => `\u041C\u044D\u0434\u044D\u0433\u0434\u044D\u043B \u0438\u043B\u0433\u044D\u044D\u043B\u044D\u044D. \u0423\u0442\u0441\u0430\u043D \u0434\u044D\u044D\u0440\u0445 \u043A\u043E\u0434 ${vc.split("").join(" ")}`,
|
|
400
|
-
minutes: (n) => `${n} \u043C\u0438\u043D\u0443\u0442 \u04AF\u043B\u0434\u043B\u044D\u044D
|
|
400
|
+
minutes: (n) => `${n} \u043C\u0438\u043D\u0443\u0442 \u04AF\u043B\u0434\u043B\u044D\u044D`,
|
|
401
|
+
busy: (n) => `\u0421\u0438\u0441\u0442\u0435\u043C \u0437\u0430\u0432\u0433\u04AF\u0439 \u2014 ${n} \u0441\u0435\u043A \u0434\u0430\u0440\u0430\u0430 \u0434\u0430\u0445\u0438\u043D \u043E\u0440\u043E\u043B\u0434\u043E\u043D\u043E \u0443\u0443`
|
|
401
402
|
},
|
|
402
403
|
en: {
|
|
403
404
|
button: "Log in with eID",
|
|
@@ -435,9 +436,25 @@ var T = {
|
|
|
435
436
|
retry: "Try again",
|
|
436
437
|
success: "Logged in",
|
|
437
438
|
sent: (vc) => `Notification sent. Code on your phone ${vc.split("").join(" ")}`,
|
|
438
|
-
minutes: (n) => `${n} minute${n === 1 ? "" : "s"} left
|
|
439
|
+
minutes: (n) => `${n} minute${n === 1 ? "" : "s"} left`,
|
|
440
|
+
busy: (n) => `Service busy \u2014 try again in ${n} s`
|
|
439
441
|
}
|
|
440
442
|
};
|
|
443
|
+
var BUSY_DEFAULT_S = 30;
|
|
444
|
+
function retryAfterOf(r) {
|
|
445
|
+
const v = r.headers.get("Retry-After")?.trim();
|
|
446
|
+
if (!v) return null;
|
|
447
|
+
if (/^\d+$/.test(v)) return Number(v);
|
|
448
|
+
const t = Date.parse(v);
|
|
449
|
+
return Number.isNaN(t) ? null : Math.max(0, Math.ceil((t - Date.now()) / 1e3));
|
|
450
|
+
}
|
|
451
|
+
async function startErrorOf(r, body) {
|
|
452
|
+
if (!r) return { error: "NETWORK", status: 0, code: "NETWORK", retryAfter: null };
|
|
453
|
+
const b = body ?? await r.json().catch(() => ({}));
|
|
454
|
+
const c = typeof b.error === "string" ? b.error : typeof b.code === "string" ? b.code : `HTTP_${r.status}`;
|
|
455
|
+
return { error: c, status: r.status, code: c, retryAfter: retryAfterOf(r) };
|
|
456
|
+
}
|
|
457
|
+
var isBusy = (d) => d.status === 429 || d.status === 503;
|
|
441
458
|
var EID_COLOR_TOKENS = [
|
|
442
459
|
["bg", "hsl(0 0% 100%)", "hsl(229 50% 6%)"],
|
|
443
460
|
["bg-subtle", "hsl(210 40% 98%)", "hsl(222 47% 9%)"],
|
|
@@ -771,13 +788,14 @@ var EidLoginButton = class extends Base {
|
|
|
771
788
|
body: JSON.stringify({ ...body, lang: this.attr("lang") === "en" ? "en" : "mn" })
|
|
772
789
|
});
|
|
773
790
|
} catch {
|
|
774
|
-
if (gen === this.gen && body.mode === "qr") this.end("unavailable");
|
|
791
|
+
if (gen === this.gen && body.mode === "qr") void startErrorOf(null).then((d) => this.end("unavailable", d));
|
|
775
792
|
return null;
|
|
776
793
|
}
|
|
777
794
|
if (gen !== this.gen) return null;
|
|
778
795
|
if (body.mode === "push") return r;
|
|
779
796
|
if (!r.ok) {
|
|
780
|
-
|
|
797
|
+
const d = await startErrorOf(r);
|
|
798
|
+
if (gen === this.gen) this.end(isBusy(d) ? "busy" : "unavailable", d);
|
|
781
799
|
return null;
|
|
782
800
|
}
|
|
783
801
|
const s = await r.json();
|
|
@@ -929,10 +947,18 @@ var EidLoginButton = class extends Base {
|
|
|
929
947
|
void this.begin(gen, { mode: "push", idCode: input.value.replace(/\s+/g, "").toUpperCase() }).then(async (r) => {
|
|
930
948
|
if (gen !== this.gen) return;
|
|
931
949
|
busy(false);
|
|
932
|
-
if (!r)
|
|
950
|
+
if (!r) {
|
|
951
|
+
this.emitError(await startErrorOf(null));
|
|
952
|
+
return setErr(t.pushFailed);
|
|
953
|
+
}
|
|
933
954
|
const b = await r.json().catch(() => ({}));
|
|
934
955
|
if (r.ok && b.vc) return this.showWait(b);
|
|
935
|
-
|
|
956
|
+
const d = await startErrorOf(r, b);
|
|
957
|
+
this.emitError(d);
|
|
958
|
+
if (isBusy(d)) {
|
|
959
|
+
btn.disabled = true;
|
|
960
|
+
return this.countdown(gen, d.retryAfter ?? BUSY_DEFAULT_S, (n) => setErr(n > 0 ? t.busy(n) : ""), () => btn.disabled = false);
|
|
961
|
+
}
|
|
936
962
|
if (r.status === 400) return setErr(t.idBad);
|
|
937
963
|
setErr(t.pushFailed);
|
|
938
964
|
});
|
|
@@ -1010,12 +1036,37 @@ var EidLoginButton = class extends Base {
|
|
|
1010
1036
|
const to = s.redirect ?? this.getAttribute("success-url");
|
|
1011
1037
|
if (go && to) this.navigate(to);
|
|
1012
1038
|
}
|
|
1039
|
+
emitError(detail) {
|
|
1040
|
+
this.dispatchEvent(new CustomEvent("eid-login-error", { detail, bubbles: true, composed: true }));
|
|
1041
|
+
}
|
|
1042
|
+
/** n секундээс 0 хүртэл секунд тутам show(n); 0 болоход done(). Цонх хаагдвал (gen өөрчлөгдвөл) зогсоно. */
|
|
1043
|
+
countdown(gen, n, show, done) {
|
|
1044
|
+
clearInterval(this.tick);
|
|
1045
|
+
show(n);
|
|
1046
|
+
if (n <= 0) return done();
|
|
1047
|
+
this.tick = setInterval(() => {
|
|
1048
|
+
if (gen !== this.gen) return clearInterval(this.tick);
|
|
1049
|
+
n--;
|
|
1050
|
+
show(n);
|
|
1051
|
+
if (n <= 0) {
|
|
1052
|
+
clearInterval(this.tick);
|
|
1053
|
+
done();
|
|
1054
|
+
}
|
|
1055
|
+
}, 1e3);
|
|
1056
|
+
}
|
|
1013
1057
|
end(kind, error) {
|
|
1014
1058
|
clearTimeout(this.timer);
|
|
1015
1059
|
clearInterval(this.tick);
|
|
1016
1060
|
this.gen++;
|
|
1017
1061
|
const t = this.t;
|
|
1018
|
-
const titles = {
|
|
1062
|
+
const titles = {
|
|
1063
|
+
expired: t.expiredTitle,
|
|
1064
|
+
refused: t.refusedTitle,
|
|
1065
|
+
failed: t.failedTitle,
|
|
1066
|
+
unavailable: t.failedTitle,
|
|
1067
|
+
busy: t.failedTitle,
|
|
1068
|
+
callback: t.callbackTitle
|
|
1069
|
+
};
|
|
1019
1070
|
const c = el("div", { class: "end", role: "alert" });
|
|
1020
1071
|
const h = el("h2", { tabindex: "-1" }, titles[kind]);
|
|
1021
1072
|
c.append(h);
|
|
@@ -1025,8 +1076,20 @@ var EidLoginButton = class extends Base {
|
|
|
1025
1076
|
if (kind !== "callback") {
|
|
1026
1077
|
const retry = el("button", { type: "button", class: "btn btn-primary" }, t.retry);
|
|
1027
1078
|
retry.addEventListener("click", () => this.open());
|
|
1079
|
+
if (kind === "busy") {
|
|
1080
|
+
const msg = el("p", { class: "text busy", role: "status" });
|
|
1081
|
+
c.append(msg);
|
|
1082
|
+
retry.disabled = true;
|
|
1083
|
+
const d = error;
|
|
1084
|
+
this.countdown(this.gen, d.retryAfter ?? BUSY_DEFAULT_S, (n) => msg.textContent = n > 0 ? t.busy(n) : "", () => {
|
|
1085
|
+
retry.disabled = false;
|
|
1086
|
+
msg.hidden = true;
|
|
1087
|
+
});
|
|
1088
|
+
}
|
|
1028
1089
|
c.append(retry);
|
|
1029
|
-
this.
|
|
1090
|
+
this.emitError(
|
|
1091
|
+
typeof error === "object" ? error : { error: error ?? kind.toUpperCase(), status: null, code: error ?? kind.toUpperCase(), retryAfter: null }
|
|
1092
|
+
);
|
|
1030
1093
|
}
|
|
1031
1094
|
this.view(c);
|
|
1032
1095
|
h.focus();
|