@infosoftas/s4-orders-js-sdk 0.2.1 → 0.2.2

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 CHANGED
@@ -177,7 +177,7 @@ type ConfigType = {
177
177
  ) => void;
178
178
  domElementId: string;
179
179
  moduleTitle?: string;
180
- submitStartCallback?: (subscriberId: string) => void;
180
+ submitStartCallback?: (subscriberId: string) => void | Promise<void>;
181
181
  userActionCallback?: (action: UserActionEnum, args: object | null | undefined) => void;
182
182
  setContactCallback?: (contactInfo: ContactRequestType) => void;
183
183
  cancelVippsCallback?: () => void;
@@ -486,26 +486,27 @@ import { useSearchParams } from 'react-router-dom';
486
486
  import { orderComponent } from '@infosoftas/s4-orders-js-sdk/src/index';
487
487
 
488
488
  import { prepareConfig } from 'Utils/moduleConfig';
489
- import { encodeJwt } from 'Utils/helper';
489
+ import { createReturnToken } from 'Mutations/useReturnToken';
490
490
 
491
491
  const ORDER_PLACE_ID = 'sdk-order';
492
492
 
493
- const OrderPlace: FC = ({journey, userEmail, sub, emails, userId, name, city, country, postalCode, streetAddress}) => {
493
+ const OrderPlace: FC = ({journey, userEmail, idToken, userId, name, city, country, postalCode, streetAddress}) => {
494
494
  const moduleMount = useRef(false);
495
495
  const [searchParams, setSearchParams] = useSearchParams();
496
496
 
497
+ // The SDK waits for this callback before it builds the payment return URLs,
498
+ // so an async callback can finish setting `hashToken` first.
499
+ // Ask your backend to create the token (and verify the user); never build it in the browser.
497
500
  const submitStartCallback = useCallback(
498
- (subscriberId: string) => {
499
- const hashTokenValue = {
500
- extension_SubscriberId: subscriberId,
501
- emails: emails,
502
- sub: sub,
503
- };
504
-
505
- searchParams?.set('hashToken', encodeJwt(hashTokenValue) as string);
506
- setSearchParams(searchParams);
501
+ async (subscriberId: string) => {
502
+ const hashToken = await createReturnToken(idToken, subscriberId);
503
+
504
+ if (hashToken) {
505
+ searchParams?.set('hashToken', hashToken);
506
+ setSearchParams(searchParams);
507
+ }
507
508
  },
508
- [emails, sub, searchParams, setSearchParams]
509
+ [idToken, searchParams, setSearchParams]
509
510
  );
510
511
 
511
512
  useEffect(() => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@infosoftas/s4-orders-js-sdk",
3
- "version": "0.2.1",
3
+ "version": "0.2.2",
4
4
  "scripts": {
5
5
  "build": "tsc --noEmit && webpack --mode production",
6
6
  "test": "vitest run",
package/src/App.tsx CHANGED
@@ -423,9 +423,9 @@ const App: FC<ConfigType> = ({
423
423
  });
424
424
  };
425
425
 
426
- const onSubmitStart = (id: string) => {
426
+ const onSubmitStart = async (id: string) => {
427
427
  setSubscriberSdkId(id);
428
- submitStartCallback?.(id);
428
+ await submitStartCallback?.(id);
429
429
  };
430
430
 
431
431
  if (window !== top) {
@@ -23,7 +23,7 @@ import { DEFAULT_ORDER_FORM_FIELDS } from '../FormFields/FormFields.helper';
23
23
  type Props = {
24
24
  callback: (url: string | null, orderInfo?: OrderInfoType | null) => void;
25
25
  onBack: () => void;
26
- submitStartCallback?: (id: string) => void;
26
+ submitStartCallback?: (id: string) => void | Promise<void>;
27
27
  userActionCallback?: (
28
28
  action: UserActionEnum,
29
29
  args: object | null | undefined
@@ -24,7 +24,7 @@ import { Input } from '../ui/input';
24
24
  type Props = {
25
25
  callback: (url: string | null, orderInfo?: OrderInfoType | null) => void;
26
26
  onBack: () => void;
27
- submitStartCallback?: (id: string) => void;
27
+ submitStartCallback?: (id: string) => void | Promise<void>;
28
28
  userActionCallback?: (
29
29
  action: UserActionEnum,
30
30
  args: object | null | undefined
@@ -43,7 +43,7 @@ import SubmitConfirmationDialog from './SubmitConfirmationDialog';
43
43
  type Props = {
44
44
  callback: (url: string | null, orderInfo?: OrderInfoType | null) => void;
45
45
  updateFormData: (data: OrderFormInputsType) => void;
46
- submitStartCallback?: (id: string) => void;
46
+ submitStartCallback?: (id: string) => void | Promise<void>;
47
47
  userActionCallback?: (
48
48
  action: UserActionEnum,
49
49
  args: object | null | undefined
@@ -0,0 +1,86 @@
1
+ // @vitest-environment jsdom
2
+
3
+ import { act, cleanup, renderHook } from '@testing-library/react';
4
+ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
5
+
6
+ import { orderStart } from '../api/OrdersApi';
7
+ import { PaymentMethodEnum } from '../enums/general';
8
+ import useOrderForm from './useOrderForm';
9
+
10
+ vi.mock('../api/OrdersApi', () => ({ orderStart: vi.fn() }));
11
+ vi.mock('../api/SubscribeApi', () => ({ createSubscriber: vi.fn() }));
12
+ vi.mock('../api/InvoiceApi', () => ({ invoiceLookup: vi.fn() }));
13
+
14
+ const renderOrderForm = (
15
+ submitStartCallback: (id: string) => void | Promise<void>,
16
+ callback = vi.fn()
17
+ ) =>
18
+ renderHook(() =>
19
+ useOrderForm({
20
+ callback,
21
+ submitStartCallback,
22
+ templatePackageId: 'template-1',
23
+ subscriberId: 'subscriber-1',
24
+ organizationId: 'organization-1',
25
+ language: 'en-US',
26
+ merchantAgreementUrl: 'https://shop.example.test/terms',
27
+ orderFields: [],
28
+ invoiceOrderFields: [],
29
+ })
30
+ );
31
+
32
+ const submit = (result: ReturnType<typeof renderOrderForm>['result']) =>
33
+ act(() =>
34
+ result.current.orderSubmit({
35
+ paymentMethod: PaymentMethodEnum.SwedbankPay,
36
+ })
37
+ );
38
+
39
+ describe('useOrderForm submitStartCallback', () => {
40
+ beforeEach(() => {
41
+ vi.mocked(orderStart).mockResolvedValue({
42
+ id: 'order-1',
43
+ terminalRedirectUrl: 'https://pay.example.test/terminal',
44
+ } as Awaited<ReturnType<typeof orderStart>>);
45
+ vi.spyOn(console, 'error').mockImplementation(() => undefined);
46
+ });
47
+
48
+ afterEach(() => {
49
+ cleanup();
50
+ vi.clearAllMocks();
51
+ vi.restoreAllMocks();
52
+ window.history.replaceState({}, '', '/');
53
+ });
54
+
55
+ it('waits for an async callback so its hashToken reaches the return URLs', async () => {
56
+ const { result } = renderOrderForm(async () => {
57
+ await new Promise((resolve) => setTimeout(resolve, 20));
58
+ window.history.replaceState({}, '', '/?hashToken=protected');
59
+ });
60
+
61
+ await submit(result);
62
+
63
+ const { paymentAgreement } = vi.mocked(orderStart).mock.calls[0][0];
64
+ const { completeUrl, cancelUrl } = paymentAgreement.swedbankPay ?? {};
65
+ expect(new URL(completeUrl as string).searchParams.get('hashToken')).toBe(
66
+ 'protected'
67
+ );
68
+ expect(new URL(cancelUrl as string).searchParams.get('hashToken')).toBe(
69
+ 'protected'
70
+ );
71
+ });
72
+
73
+ it('does not start the payment when the callback rejects', async () => {
74
+ const callback = vi.fn();
75
+ const { result } = renderOrderForm(
76
+ () => Promise.reject(new Error('token failed')),
77
+ callback
78
+ );
79
+
80
+ await submit(result);
81
+
82
+ expect(orderStart).not.toHaveBeenCalled();
83
+ expect(callback).toHaveBeenCalledWith(null);
84
+ expect(result.current.loading).toBe(false);
85
+ });
86
+ });
@@ -31,7 +31,7 @@ import {
31
31
 
32
32
  type Props = {
33
33
  callback: (url: string | null, orderInfo?: OrderInfoType | null) => void;
34
- submitStartCallback?: (id: string) => void;
34
+ submitStartCallback?: (id: string) => void | Promise<void>;
35
35
  userActionCallback?: (
36
36
  action: UserActionEnum,
37
37
  args: object | null | undefined
@@ -244,7 +244,7 @@ const useOrderForm = ({
244
244
  setContactCallback(contactModel);
245
245
  }
246
246
 
247
- submitStartCallback?.(id as string);
247
+ await submitStartCallback?.(id as string);
248
248
 
249
249
  if (id) {
250
250
  const paymentMethod =
@@ -81,7 +81,7 @@ export type ConfigType = {
81
81
  orderCompletionFailedCallback?: (
82
82
  event: OrderCompletionFailedEventType
83
83
  ) => void;
84
- submitStartCallback?: (subscriberId: string) => void;
84
+ submitStartCallback?: (subscriberId: string) => void | Promise<void>;
85
85
  userActionCallback?: (
86
86
  action: UserActionEnum,
87
87
  args: object | null | undefined
@@ -78,4 +78,17 @@ describe('prepareAgreementModel return URLs', () => {
78
78
  ['action', 'complete'],
79
79
  ]);
80
80
  });
81
+
82
+ it('uses the live hashToken over a stale one in the Vipps redirectUrl', () => {
83
+ window.history.replaceState({}, '', '/checkout?hashToken=live');
84
+
85
+ const { vippsMobilePay } = prepare(
86
+ PaymentMethodEnum.Vipps,
87
+ 'https://shop.example.test/checkout?hashToken=stale'
88
+ );
89
+
90
+ expect(params(vippsMobilePay?.merchantRedirectUrl)).toEqual([
91
+ ['hashToken', 'live'],
92
+ ]);
93
+ });
81
94
  });
@@ -73,6 +73,11 @@ export const prepareAgreementModel = ({
73
73
  const baseUrl = withoutPaymentReturnParams(
74
74
  redirectUrl || window.location.href
75
75
  );
76
+ // The host may set the token after the config was built (e.g. once a new
77
+ // subscriber exists), so the live value wins over one in `redirectUrl`.
78
+ if (hashToken) {
79
+ baseUrl.searchParams.set('hashToken', hashToken);
80
+ }
76
81
  const buildReturnUrl = (action: PaymentReturnActionEnum) => {
77
82
  const returnUrl = new URL(baseUrl);
78
83
  returnUrl.searchParams.set('action', action);
package/tsconfig.json CHANGED
File without changes