shared-lib-web 0.0.3 → 0.0.5

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.
Files changed (58) hide show
  1. package/README.md +193 -783
  2. package/dist/components/otp-modal.d.ts +5 -0
  3. package/dist/components/otp-modal.d.ts.map +1 -0
  4. package/dist/components/otp-modal.js +77 -0
  5. package/dist/components/otp-modal.js.map +1 -0
  6. package/dist/components/settings-menu.d.ts +1 -1
  7. package/dist/components/settings-menu.d.ts.map +1 -1
  8. package/dist/components/settings-menu.js +1 -1
  9. package/dist/components/settings-menu.js.map +1 -1
  10. package/dist/components/user-menu.d.ts.map +1 -1
  11. package/dist/components/user-menu.js +22 -5
  12. package/dist/components/user-menu.js.map +1 -1
  13. package/dist/i18n/default-messages.d.ts.map +1 -1
  14. package/dist/i18n/default-messages.js +12 -0
  15. package/dist/i18n/default-messages.js.map +1 -1
  16. package/dist/index.d.ts +5 -3
  17. package/dist/index.d.ts.map +1 -1
  18. package/dist/index.js +4 -2
  19. package/dist/index.js.map +1 -1
  20. package/dist/interfaces/ui-config.d.ts +25 -1
  21. package/dist/interfaces/ui-config.d.ts.map +1 -1
  22. package/dist/state/auth-service.d.ts +5 -0
  23. package/dist/state/auth-service.d.ts.map +1 -1
  24. package/dist/state/auth-service.js +25 -2
  25. package/dist/state/auth-service.js.map +1 -1
  26. package/dist/state/layout-choice-service.d.ts +3 -3
  27. package/dist/state/layout-choice-service.d.ts.map +1 -1
  28. package/dist/state/layout-choice-service.js +8 -6
  29. package/dist/state/layout-choice-service.js.map +1 -1
  30. package/dist/state/otp-service.d.ts +69 -0
  31. package/dist/state/otp-service.d.ts.map +1 -0
  32. package/dist/state/otp-service.js +212 -0
  33. package/dist/state/otp-service.js.map +1 -0
  34. package/dist/types/field-wrapper.d.ts +2 -0
  35. package/dist/types/field-wrapper.d.ts.map +1 -1
  36. package/dist/types/field-wrapper.js +3 -2
  37. package/dist/types/field-wrapper.js.map +1 -1
  38. package/dist/types/type.otp.d.ts +2 -0
  39. package/dist/types/type.otp.d.ts.map +1 -1
  40. package/dist/types/type.otp.js +2 -2
  41. package/dist/types/type.otp.js.map +1 -1
  42. package/dist/utils/app-http.d.ts +12 -0
  43. package/dist/utils/app-http.d.ts.map +1 -1
  44. package/dist/utils/app-http.js +75 -1
  45. package/dist/utils/app-http.js.map +1 -1
  46. package/package.json +1 -1
  47. package/src/components/otp-modal.tsx +154 -0
  48. package/src/components/settings-menu.tsx +2 -2
  49. package/src/components/user-menu.tsx +41 -12
  50. package/src/i18n/default-messages.ts +12 -0
  51. package/src/index.ts +31 -1
  52. package/src/interfaces/ui-config.ts +26 -1
  53. package/src/state/auth-service.ts +28 -2
  54. package/src/state/layout-choice-service.ts +8 -6
  55. package/src/state/otp-service.ts +283 -0
  56. package/src/types/field-wrapper.tsx +5 -2
  57. package/src/types/type.otp.tsx +11 -2
  58. package/src/utils/app-http.ts +80 -1
@@ -1,8 +1,8 @@
1
1
  export type LayoutChoice = "app" | "aside";
2
- /** The current layout choice ("app" until a saved one is read). */
2
+ /** The current layout choice ("aside" until a saved one is read). */
3
3
  export declare const layoutChoiceSignal: import("@preact/signals-core").Signal<LayoutChoice>;
4
- /** "aside" stays "aside"; anything else (nothing saved, an old value) is "app". */
5
- export declare function toLayoutChoice(value: string | null | undefined): LayoutChoice;
4
+ /** Keeps a valid choice; missing or invalid values use the configured default. */
5
+ export declare function toLayoutChoice(value: string | null | undefined, defaultChoice?: LayoutChoice): LayoutChoice;
6
6
  /** Reads the saved choice into layoutChoiceSignal (not saved again). */
7
7
  export declare function applySavedLayoutChoice(): void;
8
8
  /** Picks a layout: saved as LAYOUT_CHOICE; the shell and every MFE on the page follow at once. */
@@ -1 +1 @@
1
- {"version":3,"file":"layout-choice-service.d.ts","sourceRoot":"","sources":["../../src/state/layout-choice-service.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,OAAO,CAAC;AAE3C,mEAAmE;AACnE,eAAO,MAAM,kBAAkB,qDAA8B,CAAC;AAE9D,mFAAmF;AACnF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,CAE7E;AAED,wEAAwE;AACxE,wBAAgB,sBAAsB,IAAI,IAAI,CAM7C;AAED,kGAAkG;AAClG,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAG7D"}
1
+ {"version":3,"file":"layout-choice-service.d.ts","sourceRoot":"","sources":["../../src/state/layout-choice-service.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,OAAO,CAAC;AAE3C,qEAAqE;AACrE,eAAO,MAAM,kBAAkB,qDAAgC,CAAC;AAEhE,kFAAkF;AAClF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,aAAa,GAAE,YAAsB,GAAG,YAAY,CAEpH;AAED,wEAAwE;AACxE,wBAAgB,sBAAsB,IAAI,IAAI,CAO7C;AAED,kGAAkG;AAClG,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAG7D"}
@@ -10,18 +10,20 @@
10
10
  // The provider reads the saved choice on mount; preference-sync.ts follows later changes (same tab and other tabs).
11
11
  // An MFE has no layout of its own: it reads layoutChoiceSignal to know whether the shell shows a header.
12
12
  import { signal } from "@preact/signals-react";
13
+ import { uiConfigSignal } from "./signals.js";
13
14
  import { AppStorage } from "../utils/app-storage.js";
14
15
  import { LAYOUT_CHOICE } from "../utils/storage-keys.js";
15
- /** The current layout choice ("app" until a saved one is read). */
16
- export const layoutChoiceSignal = signal("app");
17
- /** "aside" stays "aside"; anything else (nothing saved, an old value) is "app". */
18
- export function toLayoutChoice(value) {
19
- return value === "aside" ? "aside" : "app";
16
+ /** The current layout choice ("aside" until a saved one is read). */
17
+ export const layoutChoiceSignal = signal("aside");
18
+ /** Keeps a valid choice; missing or invalid values use the configured default. */
19
+ export function toLayoutChoice(value, defaultChoice = "aside") {
20
+ return value === "app" || value === "aside" ? value : defaultChoice;
20
21
  }
21
22
  /** Reads the saved choice into layoutChoiceSignal (not saved again). */
22
23
  export function applySavedLayoutChoice() {
23
24
  const savedValue = AppStorage.getText(LAYOUT_CHOICE);
24
- const choice = toLayoutChoice(savedValue);
25
+ const defaultChoice = uiConfigSignal.peek()?.layout?.defaultLayout ?? "aside";
26
+ const choice = toLayoutChoice(savedValue, defaultChoice);
25
27
  if (choice !== layoutChoiceSignal.peek()) {
26
28
  layoutChoiceSignal.value = choice;
27
29
  }
@@ -1 +1 @@
1
- {"version":3,"file":"layout-choice-service.js","sourceRoot":"","sources":["../../src/state/layout-choice-service.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,mHAAmH;AACnH,gCAAgC;AAChC,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,0GAA0G;AAC1G,gHAAgH;AAChH,EAAE;AACF,oHAAoH;AACpH,yGAAyG;AAEzG,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,mEAAmE;AACnE,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAe,KAAK,CAAC,CAAC;AAE9D,mFAAmF;AACnF,MAAM,UAAU,cAAc,CAAC,KAAgC;IAC7D,OAAO,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7C,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,sBAAsB;IACpC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,MAAM,KAAK,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC;QACzC,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC;IACpC,CAAC;AACH,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,kBAAkB,CAAC,MAAoB;IACrD,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC;IAClC,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC"}
1
+ {"version":3,"file":"layout-choice-service.js","sourceRoot":"","sources":["../../src/state/layout-choice-service.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,mHAAmH;AACnH,gCAAgC;AAChC,6DAA6D;AAC7D,6DAA6D;AAC7D,EAAE;AACF,0GAA0G;AAC1G,gHAAgH;AAChH,EAAE;AACF,oHAAoH;AACpH,yGAAyG;AAEzG,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,qEAAqE;AACrE,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAe,OAAO,CAAC,CAAC;AAEhE,kFAAkF;AAClF,MAAM,UAAU,cAAc,CAAC,KAAgC,EAAE,gBAA8B,OAAO;IACpG,OAAO,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;AACtE,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,sBAAsB;IACpC,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,aAAa,IAAI,OAAO,CAAC;IAC9E,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACzD,IAAI,MAAM,KAAK,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC;QACzC,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC;IACpC,CAAC;AACH,CAAC;AAED,kGAAkG;AAClG,MAAM,UAAU,kBAAkB,CAAC,MAAoB;IACrD,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC;IAClC,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC"}
@@ -0,0 +1,69 @@
1
+ import type { OtpConfig } from "../interfaces/ui-config.js";
2
+ /** Default number of characters of the code. */
3
+ export declare const DEFAULT_OTP_LENGTH = 6;
4
+ /** Default seconds before "Resend code" works again. */
5
+ export declare const DEFAULT_OTP_RESEND_SECONDS = 180;
6
+ /** oid + uid of the code that was sent: the verify call needs them. */
7
+ export interface OtpSession {
8
+ oid: string;
9
+ uid: string;
10
+ }
11
+ /** What onVerified receives. */
12
+ export interface OtpVerifiedResult extends OtpSession {
13
+ otp: string;
14
+ }
15
+ /** The form of the dialog. */
16
+ export interface OtpFormType {
17
+ otp: string;
18
+ }
19
+ /** What openOtpModal needs. */
20
+ export interface OtpOpenOptions {
21
+ /** Sent as "userid" and shown in the dialog (email, mobile or user id). */
22
+ userId: string;
23
+ /** Heading (already translated). Default t("ui.otpTitle"). */
24
+ title?: string;
25
+ /** Text under the user id (already translated). Default t("ui.otpText"). */
26
+ message?: string;
27
+ /** Called after a successful verify (the dialog is closed by then). */
28
+ onVerified?: (result: OtpVerifiedResult) => void;
29
+ /** Called after Cancel, ✕, Escape or a backdrop click. */
30
+ onCancel?: () => void;
31
+ }
32
+ /** What the dialog shows. */
33
+ export interface OtpModalState {
34
+ isOpen: boolean;
35
+ title: string;
36
+ message: string;
37
+ userId: string;
38
+ }
39
+ /** The dialog: open, title and user id. */
40
+ export declare const otpModalSignal: import("@preact/signals-core").Signal<OtpModalState>;
41
+ /** oid + uid of the sent code; null = no code sent yet. */
42
+ export declare const otpSessionSignal: import("@preact/signals-core").Signal<OtpSession | null>;
43
+ /** true while the send call runs. */
44
+ export declare const otpIsSendingSignal: import("@preact/signals-core").Signal<boolean>;
45
+ /** true while the verify call runs. */
46
+ export declare const otpIsVerifyingSignal: import("@preact/signals-core").Signal<boolean>;
47
+ /** Seconds left before "Resend code" works again (0 = now). */
48
+ export declare const otpResendSecondsSignal: import("@preact/signals-core").Signal<number>;
49
+ /** config.http.otp, or an error when it is not set. */
50
+ export declare function readOtpConfig(): OtpConfig;
51
+ /** Number of characters of the code: config.http.otp.length, default 6. */
52
+ export declare function readOtpLength(): number;
53
+ /** 125 -> "2:05". */
54
+ export declare function formatOtpCountdown(seconds: number): string;
55
+ /** Stops the resend countdown (0 = resend works). */
56
+ export declare function stopOtpResendCountdown(): void;
57
+ /** POST sendUrl { userid }: keeps oid + uid and starts the resend countdown. Returns true when sent. */
58
+ export declare function otpSendCall(): Promise<boolean>;
59
+ /** "Resend code" button: sends a new code once the countdown is over. */
60
+ export declare function handleOtpResend(): void;
61
+ /** POST verifyUrl { otp, oid, uid }: closes the dialog and calls onVerified. For form.handleSubmit. */
62
+ export declare function handleOtpVerify(values: OtpFormType): Promise<void>;
63
+ /** Opens the dialog for a user id and sends the code. */
64
+ export declare function openOtpModal(options: OtpOpenOptions): void;
65
+ /** Closes the dialog without calling onCancel (also used after a successful verify). */
66
+ export declare function closeOtpModal(): void;
67
+ /** Cancel, ✕, Escape or a backdrop click: closes the dialog and calls onCancel. */
68
+ export declare function cancelOtpModal(): void;
69
+ //# sourceMappingURL=otp-service.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"otp-service.d.ts","sourceRoot":"","sources":["../../src/state/otp-service.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAM5D,gDAAgD;AAChD,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC,wDAAwD;AACxD,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAI9C,uEAAuE;AACvE,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb;AAED,gCAAgC;AAChC,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD,GAAG,EAAE,MAAM,CAAC;CACb;AAED,8BAA8B;AAC9B,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,+BAA+B;AAC/B,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,8DAA8D;IAC9D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACjD,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,6BAA6B;AAC7B,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAkBD,2CAA2C;AAC3C,eAAO,MAAM,cAAc,sDAA0C,CAAC;AAEtE,2DAA2D;AAC3D,eAAO,MAAM,gBAAgB,0DAAkC,CAAC;AAEhE,qCAAqC;AACrC,eAAO,MAAM,kBAAkB,gDAAgB,CAAC;AAEhD,uCAAuC;AACvC,eAAO,MAAM,oBAAoB,gDAAgB,CAAC;AAElD,+DAA+D;AAC/D,eAAO,MAAM,sBAAsB,+CAAY,CAAC;AAMhD,uDAAuD;AACvD,wBAAgB,aAAa,IAAI,SAAS,CAOzC;AAED,2EAA2E;AAC3E,wBAAgB,aAAa,IAAI,MAAM,CAGtC;AAgBD,qBAAqB;AACrB,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAM1D;AAED,qDAAqD;AACrD,wBAAgB,sBAAsB,IAAI,IAAI,CAM7C;AAmCD,wGAAwG;AACxG,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CA2BpD;AAED,yEAAyE;AACzE,wBAAgB,eAAe,IAAI,IAAI,CAKtC;AAED,uGAAuG;AACvG,wBAAsB,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BxE;AAED,yDAAyD;AACzD,wBAAgB,YAAY,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,CAQ1D;AAED,wFAAwF;AACxF,wBAAgB,aAAa,IAAI,IAAI,CAKpC;AAED,mFAAmF;AACnF,wBAAgB,cAAc,IAAI,IAAI,CAIrC"}
@@ -0,0 +1,212 @@
1
+ // otp-service.ts
2
+ // State and HTTP calls of the one-time code dialog (components/otp-modal.tsx). The URLs come from config.http.otp:
3
+ //
4
+ // // config.ts
5
+ // http: { baseUrl, otp: { sendUrl: `${MsUrl.sor}/otp-send`, verifyUrl: `${MsUrl.sor}/otp-verify`, resendSeconds: 180 } }
6
+ //
7
+ // // page: render <OtpModal /> once, then open it (the code is sent on open)
8
+ // openOtpModal({ userId: email, title: t("profile.verifyEmail"), message: t("profile.verifyEmailText"),
9
+ // onVerified: handleEmailVerified });
10
+ // export function handleEmailVerified(result: OtpVerifiedResult): void { ... result.oid, result.uid, result.otp ... }
11
+ //
12
+ // Send: POST sendUrl { userid } -> { data: { message, oid, uid } }
13
+ // Verify: POST verifyUrl { otp, oid, uid } -> { data: { message, oid, uid } }
14
+ // The backend message is shown as a toast; a failed call shows the backend error (readErrorMessage).
15
+ import { signal } from "@preact/signals-react";
16
+ import { ConstValue } from "dff-util";
17
+ import { translate } from "../i18n/translator.js";
18
+ import { readAppConfig } from "../utils/app-config.js";
19
+ import { AppHttp } from "../utils/app-http.js";
20
+ import { readErrorMessage } from "../utils/error-util.js";
21
+ import { ShowToast } from "./toast-service.js";
22
+ /** Default number of characters of the code. */
23
+ export const DEFAULT_OTP_LENGTH = 6;
24
+ /** Default seconds before "Resend code" works again. */
25
+ export const DEFAULT_OTP_RESEND_SECONDS = 180;
26
+ const OTP_CONFIG_MISSING = "shared-lib-web: config.http.otp (sendUrl, verifyUrl) is missing.";
27
+ const CLOSED_OTP_MODAL = {
28
+ isOpen: false,
29
+ title: ConstValue.EMPTY,
30
+ message: ConstValue.EMPTY,
31
+ userId: ConstValue.EMPTY,
32
+ };
33
+ /** The dialog: open, title and user id. */
34
+ export const otpModalSignal = signal(CLOSED_OTP_MODAL);
35
+ /** oid + uid of the sent code; null = no code sent yet. */
36
+ export const otpSessionSignal = signal(null);
37
+ /** true while the send call runs. */
38
+ export const otpIsSendingSignal = signal(false);
39
+ /** true while the verify call runs. */
40
+ export const otpIsVerifyingSignal = signal(false);
41
+ /** Seconds left before "Resend code" works again (0 = now). */
42
+ export const otpResendSecondsSignal = signal(0);
43
+ let otpCallbacks = {};
44
+ let resendTimer = null;
45
+ /** config.http.otp, or an error when it is not set. */
46
+ export function readOtpConfig() {
47
+ const config = readAppConfig();
48
+ const otpConfig = config?.http?.otp;
49
+ if (!otpConfig) {
50
+ throw new Error(OTP_CONFIG_MISSING);
51
+ }
52
+ return otpConfig;
53
+ }
54
+ /** Number of characters of the code: config.http.otp.length, default 6. */
55
+ export function readOtpLength() {
56
+ const config = readAppConfig();
57
+ return config?.http?.otp?.length ?? DEFAULT_OTP_LENGTH;
58
+ }
59
+ /** true for a plain object. */
60
+ function isRecord(value) {
61
+ return typeof value === "object" && value !== null && !Array.isArray(value);
62
+ }
63
+ /** The reply fields from { data: { message, oid, uid } } or { message, oid, uid }. */
64
+ function readOtpReply(reply) {
65
+ if (!isRecord(reply)) {
66
+ return {};
67
+ }
68
+ const source = isRecord(reply.data) ? reply.data : reply;
69
+ return source;
70
+ }
71
+ /** 125 -> "2:05". */
72
+ export function formatOtpCountdown(seconds) {
73
+ const minutes = Math.floor(seconds / 60);
74
+ const rest = seconds % 60;
75
+ const restText = String(rest);
76
+ const paddedRest = restText.padStart(2, "0");
77
+ return `${minutes}:${paddedRest}`;
78
+ }
79
+ /** Stops the resend countdown (0 = resend works). */
80
+ export function stopOtpResendCountdown() {
81
+ if (resendTimer) {
82
+ clearInterval(resendTimer);
83
+ resendTimer = null;
84
+ }
85
+ otpResendSecondsSignal.value = 0;
86
+ }
87
+ /** One second of the resend countdown. */
88
+ function tickOtpResendCountdown() {
89
+ const nextSeconds = otpResendSecondsSignal.value - 1;
90
+ if (nextSeconds <= 0) {
91
+ stopOtpResendCountdown();
92
+ return;
93
+ }
94
+ otpResendSecondsSignal.value = nextSeconds;
95
+ }
96
+ /** Starts the resend countdown (one timer for the whole page). */
97
+ function startOtpResendCountdown(seconds) {
98
+ stopOtpResendCountdown();
99
+ if (seconds <= 0) {
100
+ return;
101
+ }
102
+ otpResendSecondsSignal.value = seconds;
103
+ resendTimer = setInterval(tickOtpResendCountdown, 1000);
104
+ }
105
+ /** The backend message, else the translated fallback. */
106
+ function readReplyMessage(otpReply, fallbackKey) {
107
+ const fallback = translate(fallbackKey);
108
+ return otpReply.message || fallback;
109
+ }
110
+ /** Shows the backend error of a failed call, else the translated fallback. */
111
+ function showOtpError(error, fallbackKey) {
112
+ const fallback = translate(fallbackKey);
113
+ const message = readErrorMessage(error, fallback);
114
+ ShowToast(message, "error");
115
+ }
116
+ /** POST sendUrl { userid }: keeps oid + uid and starts the resend countdown. Returns true when sent. */
117
+ export async function otpSendCall() {
118
+ const userId = otpModalSignal.value.userId;
119
+ if (otpIsSendingSignal.value || userId.length === 0) {
120
+ return false;
121
+ }
122
+ otpIsSendingSignal.value = true;
123
+ try {
124
+ const otpConfig = readOtpConfig();
125
+ const body = { userid: userId };
126
+ const reply = await AppHttp.Post(otpConfig.sendUrl, body);
127
+ const isStillOpen = otpModalSignal.value.isOpen && otpModalSignal.value.userId === userId;
128
+ if (!isStillOpen) {
129
+ return false;
130
+ }
131
+ const otpReply = readOtpReply(reply);
132
+ otpSessionSignal.value = { oid: otpReply.oid ?? ConstValue.EMPTY, uid: otpReply.uid ?? ConstValue.EMPTY };
133
+ const message = readReplyMessage(otpReply, "ui.otpSent");
134
+ ShowToast(message, "success");
135
+ const resendSeconds = otpConfig.resendSeconds ?? DEFAULT_OTP_RESEND_SECONDS;
136
+ startOtpResendCountdown(resendSeconds);
137
+ return true;
138
+ }
139
+ catch (error) {
140
+ showOtpError(error, "ui.otpSendFailed");
141
+ return false;
142
+ }
143
+ finally {
144
+ otpIsSendingSignal.value = false;
145
+ }
146
+ }
147
+ /** "Resend code" button: sends a new code once the countdown is over. */
148
+ export function handleOtpResend() {
149
+ if (otpResendSecondsSignal.value > 0) {
150
+ return;
151
+ }
152
+ void otpSendCall();
153
+ }
154
+ /** POST verifyUrl { otp, oid, uid }: closes the dialog and calls onVerified. For form.handleSubmit. */
155
+ export async function handleOtpVerify(values) {
156
+ const session = otpSessionSignal.value;
157
+ if (otpIsVerifyingSignal.value) {
158
+ return;
159
+ }
160
+ if (!session) {
161
+ const message = translate("ui.otpSessionMissing");
162
+ ShowToast(message, "error");
163
+ return;
164
+ }
165
+ otpIsVerifyingSignal.value = true;
166
+ try {
167
+ const otpConfig = readOtpConfig();
168
+ const body = { otp: values.otp, oid: session.oid, uid: session.uid };
169
+ const reply = await AppHttp.Post(otpConfig.verifyUrl, body);
170
+ const otpReply = readOtpReply(reply);
171
+ const message = readReplyMessage(otpReply, "ui.otpVerified");
172
+ ShowToast(message, "success");
173
+ const result = {
174
+ oid: otpReply.oid || session.oid,
175
+ uid: otpReply.uid || session.uid,
176
+ otp: values.otp,
177
+ };
178
+ const onVerified = otpCallbacks.onVerified;
179
+ closeOtpModal();
180
+ onVerified?.(result);
181
+ }
182
+ catch (error) {
183
+ showOtpError(error, "ui.otpInvalid");
184
+ }
185
+ finally {
186
+ otpIsVerifyingSignal.value = false;
187
+ }
188
+ }
189
+ /** Opens the dialog for a user id and sends the code. */
190
+ export function openOtpModal(options) {
191
+ stopOtpResendCountdown();
192
+ otpCallbacks = { onVerified: options.onVerified, onCancel: options.onCancel };
193
+ otpSessionSignal.value = null;
194
+ const title = options.title ?? translate("ui.otpTitle");
195
+ const message = options.message ?? translate("ui.otpText");
196
+ otpModalSignal.value = { isOpen: true, title: title, message: message, userId: options.userId };
197
+ void otpSendCall();
198
+ }
199
+ /** Closes the dialog without calling onCancel (also used after a successful verify). */
200
+ export function closeOtpModal() {
201
+ stopOtpResendCountdown();
202
+ otpCallbacks = {};
203
+ otpSessionSignal.value = null;
204
+ otpModalSignal.value = CLOSED_OTP_MODAL;
205
+ }
206
+ /** Cancel, ✕, Escape or a backdrop click: closes the dialog and calls onCancel. */
207
+ export function cancelOtpModal() {
208
+ const onCancel = otpCallbacks.onCancel;
209
+ closeOtpModal();
210
+ onCancel?.();
211
+ }
212
+ //# sourceMappingURL=otp-service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"otp-service.js","sourceRoot":"","sources":["../../src/state/otp-service.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,8 @@ export interface FieldWrapperProps {
5
5
  errorText?: string;
6
6
  hint?: string;
7
7
  className?: string;
8
+ /** Keep the label for screen readers only (not shown). Default false. */
9
+ isLabelHidden?: boolean;
8
10
  children?: ReactNode;
9
11
  }
10
12
  /** id of the message under a field, used for aria-describedby. */
@@ -1 +1 @@
1
- {"version":3,"file":"field-wrapper.d.ts","sourceRoot":"","sources":["../../src/types/field-wrapper.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,+BAqBpD"}
1
+ {"version":3,"file":"field-wrapper.d.ts","sourceRoot":"","sources":["../../src/types/field-wrapper.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAED,kEAAkE;AAClE,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,+BAsBpD"}
@@ -5,12 +5,13 @@ export function readMessageId(inputId) {
5
5
  return `${inputId}-message`;
6
6
  }
7
7
  export function FieldWrapper(props) {
8
- const { inputId, label, errorText, hint, className, children } = props;
8
+ const { inputId, label, errorText, hint, className, isLabelHidden = false, children } = props;
9
9
  const messageId = readMessageId(inputId);
10
10
  const messageText = errorText ?? hint;
11
11
  const messageClassName = errorText ? "label text-error" : "label";
12
12
  const classList = ["fieldset", className];
13
13
  const wrapperClassName = joinClassNames(classList);
14
- return (_jsxs("fieldset", { className: wrapperClassName, children: [_jsx("label", { className: "fieldset-legend", htmlFor: inputId, children: label }), children, messageText ? (_jsx("p", { id: messageId, className: messageClassName, children: messageText })) : null] }));
14
+ const labelClassName = isLabelHidden ? "sr-only" : "fieldset-legend";
15
+ return (_jsxs("fieldset", { className: wrapperClassName, children: [_jsx("label", { className: labelClassName, htmlFor: inputId, children: label }), children, messageText ? (_jsx("p", { id: messageId, className: messageClassName, children: messageText })) : null] }));
15
16
  }
16
17
  //# sourceMappingURL=field-wrapper.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"field-wrapper.js","sourceRoot":"","sources":["../../src/types/field-wrapper.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAWlD,kEAAkE;AAClE,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,GAAG,OAAO,UAAU,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAwB;IACnD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACvE,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,SAAS,IAAI,IAAI,CAAC;IACtC,MAAM,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC;IAClE,MAAM,SAAS,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC1C,MAAM,gBAAgB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IAEnD,OAAO,CACL,oBAAU,SAAS,EAAE,gBAAgB,aACnC,gBAAO,SAAS,EAAC,iBAAiB,EAAC,OAAO,EAAE,OAAO,YAChD,KAAK,GACA,EACP,QAAQ,EACR,WAAW,CAAC,CAAC,CAAC,CACb,YAAG,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,YAC1C,WAAW,GACV,CACL,CAAC,CAAC,CAAC,IAAI,IACC,CACZ,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"field-wrapper.js","sourceRoot":"","sources":["../../src/types/field-wrapper.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAalD,kEAAkE;AAClE,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,GAAG,OAAO,UAAU,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAwB;IACnD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,GAAG,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC9F,MAAM,SAAS,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,SAAS,IAAI,IAAI,CAAC;IACtC,MAAM,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC;IAClE,MAAM,SAAS,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC1C,MAAM,gBAAgB,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAErE,OAAO,CACL,oBAAU,SAAS,EAAE,gBAAgB,aACnC,gBAAO,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,YAC/C,KAAK,GACA,EACP,QAAQ,EACR,WAAW,CAAC,CAAC,CAAC,CACb,YAAG,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,YAC1C,WAAW,GACV,CACL,CAAC,CAAC,CAAC,IAAI,IACC,CACZ,CAAC;AACJ,CAAC"}
@@ -3,6 +3,8 @@ import type { TypeFieldProps } from "./field-props.js";
3
3
  export interface TypeOtpProps<TFieldValues extends FieldValues> extends TypeFieldProps<TFieldValues> {
4
4
  /** Number of characters. Default 6. */
5
5
  length?: number;
6
+ /** Keep the label for screen readers only (not shown). Default false. */
7
+ isLabelHidden?: boolean;
6
8
  }
7
9
  export declare function TypeOtp<TFieldValues extends FieldValues>(props: TypeOtpProps<TFieldValues>): import("react").JSX.Element;
8
10
  //# sourceMappingURL=type.otp.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"type.otp.d.ts","sourceRoot":"","sources":["../../src/types/type.otp.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAKlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,WAAW,YAAY,CAAC,YAAY,SAAS,WAAW,CAAE,SAAQ,cAAc,CAAC,YAAY,CAAC;IAClG,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAwBD,wBAAgB,OAAO,CAAC,YAAY,SAAS,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,+BAqC1F"}
1
+ {"version":3,"file":"type.otp.d.ts","sourceRoot":"","sources":["../../src/types/type.otp.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAKlE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,WAAW,YAAY,CAAC,YAAY,SAAS,WAAW,CAAE,SAAQ,cAAc,CAAC,YAAY,CAAC;IAClG,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAwBD,wBAAgB,OAAO,CAAC,YAAY,SAAS,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,+BA4C1F"}
@@ -31,7 +31,7 @@ function buildOtpBoxes(value, length, hasError) {
31
31
  return boxes;
32
32
  }
33
33
  export function TypeOtp(props) {
34
- const { control, name, label, rules, error, hint, disabled, className, length = 6 } = props;
34
+ const { control, name, label, rules, error, hint, disabled, className, length = 6, isLabelHidden = false } = props;
35
35
  const { t } = useUi();
36
36
  const inputId = useId();
37
37
  const controllerOptions = { control: control, name: name, rules: rules, disabled: disabled };
@@ -43,6 +43,6 @@ export function TypeOtp(props) {
43
43
  const rawValue = field.value ?? ConstValue.EMPTY;
44
44
  const value = String(rawValue);
45
45
  const boxes = buildOtpBoxes(value, length, hasError);
46
- return (_jsx(FieldWrapper, { inputId: inputId, label: label, errorText: errorText, hint: hint, className: className, children: _jsxs("div", { className: "relative flex w-fit gap-2", dir: "ltr", children: [_jsx("input", { id: inputId, ref: field.ref, name: field.name, type: "text", inputMode: "numeric", autoComplete: "one-time-code", maxLength: length, value: value, onChange: field.onChange, onBlur: field.onBlur, disabled: field.disabled, className: "peer absolute inset-0 z-10 w-full cursor-text opacity-0", "aria-invalid": hasError, "aria-describedby": errorText || hint ? messageId : undefined }), boxes] }) }));
46
+ return (_jsx(FieldWrapper, { inputId: inputId, label: label, errorText: errorText, hint: hint, className: className, isLabelHidden: isLabelHidden, children: _jsxs("div", { className: "relative flex w-fit gap-2", dir: "ltr", children: [_jsx("input", { id: inputId, ref: field.ref, name: field.name, type: "text", inputMode: "numeric", autoComplete: "one-time-code", maxLength: length, value: value, onChange: field.onChange, onBlur: field.onBlur, disabled: field.disabled, className: "peer absolute inset-0 z-10 w-full cursor-text opacity-0", "aria-invalid": hasError, "aria-describedby": errorText || hint ? messageId : undefined }), boxes] }) }));
47
47
  }
48
48
  //# sourceMappingURL=type.otp.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"type.otp.js","sourceRoot":"","sources":["../../src/types/type.otp.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type.otp.js","sourceRoot":"","sources":["../../src/types/type.otp.tsx"],"names":[],"mappings":"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"}
@@ -14,6 +14,18 @@ export declare function toAbsoluteUrl(url: string): string;
14
14
  export declare function isHttpUrl(url: string): boolean;
15
15
  /** Joins a base URL and a path with exactly one "/" between them. */
16
16
  export declare function joinUrl(baseUrl: string, path: string): string;
17
+ /** config.http.regenerateUrl, or "" when not set. */
18
+ export declare function readRegenerateUrl(): string;
19
+ /**
20
+ * GET http.regenerateUrl. Returns the new token from { token } or { data: { token } }.
21
+ * Throws when regenerateUrl is empty or the reply has no token.
22
+ */
23
+ export declare function jwtRegenerateCall(): Promise<string>;
24
+ /**
25
+ * Before a request: no token or JwtValid(token) -> nothing. Otherwise the token is regenerated (once);
26
+ * an empty config.http.regenerateUrl throws only then (at the time of the call).
27
+ */
28
+ export declare function ensureFreshToken(): Promise<void>;
17
29
  export declare class AppHttp {
18
30
  /**
19
31
  * API base URL: window.env REACT_APP_<APPNAMEKEY>_API_BASE_URL first, then config.http.baseUrl.
@@ -1 +1 @@
1
- {"version":3,"file":"app-http.d.ts","sourceRoot":"","sources":["../../src/utils/app-http.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app-http.d.ts","sourceRoot":"","sources":["../../src/utils/app-http.ts"],"names":[],"mappings":"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"}
@@ -22,11 +22,17 @@
22
22
  // const saved = await AppHttp.Post(saveUrl, body);
23
23
  // AppHttp.setHeader("x-custom", value);
24
24
  //
25
+ // // JWT regenerate: set http.regenerateUrl. Before every request: JwtValid(token) false -> GET regenerateUrl once
26
+ // // (shared page-wide in readSharedGetCache) -> new token ({ token } or { data: { token } }) saved in sessionStorage;
27
+ // // an error or no token -> endSession() (log out, goes to http.logoutUrl).
28
+ // http: { baseUrl, logoutUrl: "/login", regenerateUrl: `${MsUrl.utils}/jwt-regenerate` }
29
+ //
25
30
  // // file upload to a signed URL
26
31
  // const signed = await AppHttp.Post(`${MsUrl.utils}/s3/upload-url`, { fileName: file.name });
27
32
  // const uploaded = await uploadToSignedUrl(file, signed.data.upload, signed.data.download);
28
33
  // // uploaded = { filename, mimetype, url }
29
- import { Http } from "dff-util";
34
+ import { Http, JwtValid } from "dff-util";
35
+ import { endSession, refreshSessionToken } from "../state/auth-service.js";
30
36
  import { ShowProgress } from "../state/progress-service.js";
31
37
  import { readAppConfig } from "./app-config.js";
32
38
  import { AppStorage } from "./app-storage.js";
@@ -34,6 +40,7 @@ import { setLeaveGuard } from "./leave-guard.js";
34
40
  import { readSessionId } from "./session-id.js";
35
41
  import { BRANCH_ID, TOKEN } from "./storage-keys.js";
36
42
  const CONFIG_MISSING = "shared-lib-web: config is missing. Render <SharedWebUiProvider config={config}> or call setAppConfig(config) first.";
43
+ const REGENERATE_URL_MISSING = "shared-lib-web: the token is not valid and config.http.regenerateUrl is empty.";
37
44
  const BASE_URL_MISSING = "shared-lib-web: no API base URL. Set config.http.baseUrl or window.env.REACT_APP_<APPNAMEKEY>_API_BASE_URL.";
38
45
  /** window.env name (without prefix) of the API base URL. */
39
46
  export const API_BASE_URL_ENV = "API_BASE_URL";
@@ -123,6 +130,66 @@ async function readResponseBody(response) {
123
130
  }
124
131
  return response.text();
125
132
  }
133
+ /** config.http.regenerateUrl, or "" when not set. */
134
+ export function readRegenerateUrl() {
135
+ const config = readAppConfig();
136
+ return config?.http?.regenerateUrl ?? "";
137
+ }
138
+ /**
139
+ * GET http.regenerateUrl. Returns the new token from { token } or { data: { token } }.
140
+ * Throws when regenerateUrl is empty or the reply has no token.
141
+ */
142
+ export async function jwtRegenerateCall() {
143
+ const regenerateUrl = readRegenerateUrl();
144
+ if (regenerateUrl.length === 0) {
145
+ throw new Error(REGENERATE_URL_MISSING);
146
+ }
147
+ const fullUrl = AppHttp.FullUrl(regenerateUrl);
148
+ const headers = AppHttp.Headers();
149
+ const reply = (await Http.Get(fullUrl, {}, headers));
150
+ const token = reply?.token ?? reply?.data?.token;
151
+ if (!token) {
152
+ throw new Error("jwt-regenerate: no token");
153
+ }
154
+ refreshSessionToken(token);
155
+ return token;
156
+ }
157
+ /** The regenerate failed: log out (endSession goes to http.logoutUrl). */
158
+ function handleRegenerateError() {
159
+ endSession();
160
+ }
161
+ /**
162
+ * Runs the regenerate once: the running call is kept in readSharedGetCache under the config regenerateUrl,
163
+ * so every request (shell and MFEs) waits for the same one.
164
+ */
165
+ function regenerateOnce(regenerateUrl) {
166
+ const cache = readSharedGetCache();
167
+ const running = cache.get(regenerateUrl);
168
+ if (running) {
169
+ return running;
170
+ }
171
+ const request = jwtRegenerateCall();
172
+ const handled = request.catch(handleRegenerateError);
173
+ const forget = forgetSharedGet.bind(null, regenerateUrl);
174
+ const regenerate = handled.finally(forget);
175
+ cache.set(regenerateUrl, regenerate);
176
+ return regenerate;
177
+ }
178
+ /**
179
+ * Before a request: no token or JwtValid(token) -> nothing. Otherwise the token is regenerated (once);
180
+ * an empty config.http.regenerateUrl throws only then (at the time of the call).
181
+ */
182
+ export async function ensureFreshToken() {
183
+ const token = readJwtToken();
184
+ if (token.length === 0 || JwtValid(token)) {
185
+ return;
186
+ }
187
+ const regenerateUrl = readRegenerateUrl();
188
+ if (regenerateUrl.length === 0) {
189
+ throw new Error(REGENERATE_URL_MISSING);
190
+ }
191
+ await regenerateOnce(regenerateUrl);
192
+ }
126
193
  export class AppHttp {
127
194
  /**
128
195
  * API base URL: window.env REACT_APP_<APPNAMEKEY>_API_BASE_URL first, then config.http.baseUrl.
@@ -180,6 +247,7 @@ export class AppHttp {
180
247
  }
181
248
  /** GET with query params. */
182
249
  static async Get(url, params = {}, customHeaders = {}) {
250
+ await ensureFreshToken();
183
251
  const baseHeaders = AppHttp.Headers();
184
252
  const headers = { ...baseHeaders, ...customHeaders };
185
253
  const fullUrl = AppHttp.FullUrl(url);
@@ -208,6 +276,7 @@ export class AppHttp {
208
276
  }
209
277
  /** POST a JSON body. */
210
278
  static async Post(url, body, customHeaders = {}) {
279
+ await ensureFreshToken();
211
280
  const baseHeaders = AppHttp.Headers();
212
281
  const headers = { ...baseHeaders, ...customHeaders };
213
282
  const fullUrl = AppHttp.FullUrl(url);
@@ -216,6 +285,7 @@ export class AppHttp {
216
285
  }
217
286
  /** PUT a JSON body to url/id. */
218
287
  static async Put(url, id, body) {
288
+ await ensureFreshToken();
219
289
  const headers = AppHttp.Headers();
220
290
  const fullUrl = AppHttp.FullUrl(url);
221
291
  const itemUrl = `${fullUrl}/${id}`;
@@ -224,6 +294,7 @@ export class AppHttp {
224
294
  }
225
295
  /** DELETE url/id. */
226
296
  static async Delete(url, id, params = {}) {
297
+ await ensureFreshToken();
227
298
  const headers = AppHttp.Headers();
228
299
  const fullUrl = AppHttp.FullUrl(url);
229
300
  const itemUrl = `${fullUrl}/${id}`;
@@ -232,6 +303,7 @@ export class AppHttp {
232
303
  }
233
304
  /** PATCH a JSON body. */
234
305
  static async Patch(url, body) {
306
+ await ensureFreshToken();
235
307
  const headers = AppHttp.Headers();
236
308
  const bodyText = JSON.stringify(body ?? {});
237
309
  const requestInit = { method: "PATCH", headers: headers, body: bodyText };
@@ -276,12 +348,14 @@ export class AppHttp {
276
348
  * const objectUrl = URL.createObjectURL(blob); // <img src={objectUrl}>; URL.revokeObjectURL(objectUrl) later
277
349
  */
278
350
  static async Media(url, params) {
351
+ await ensureFreshToken();
279
352
  const fullUrl = AppHttp.FullUrl(url);
280
353
  const headers = AppHttp.RawHeaders();
281
354
  return Http.FileDownload(fullUrl, params, headers);
282
355
  }
283
356
  /** Downloads a file and saves it in the browser. */
284
357
  static async DownloadFile(url, params = {}, fileName) {
358
+ await ensureFreshToken();
285
359
  const headers = AppHttp.RawHeaders();
286
360
  const fullUrl = AppHttp.FullUrl(url);
287
361
  const request = Http.FileDownload(fullUrl, params, headers);