@infosoftas/s4-orders-js-sdk 0.0.1-alpha1a → 0.0.1-alpha1d

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 (37) hide show
  1. package/.release-it.json +6 -0
  2. package/README.md +3 -0
  3. package/lib/package.json +42 -0
  4. package/lib/script.js +2 -0
  5. package/lib/script.js.LICENSE.txt +39 -0
  6. package/package.json +6 -5
  7. package/src/App.scss +2 -2
  8. package/src/App.tsx +97 -18
  9. package/src/api/OrdersApi.ts +15 -2
  10. package/src/api/SubscribeApi.ts +5 -1
  11. package/src/assets/styles/forms.scss +1 -1
  12. package/src/assets/styles/general.scss +2 -2
  13. package/src/components/Alert/alert.scss +1 -1
  14. package/src/components/Button/Button.tsx +1 -1
  15. package/src/components/Button/button.scss +1 -1
  16. package/src/components/FormFields/AddressField.tsx +52 -0
  17. package/src/components/FormFields/EmailField.tsx +5 -1
  18. package/src/components/FormFields/FormFields.helper.ts +5 -1
  19. package/src/components/FormFields/FormFieldsMapper.ts +9 -3
  20. package/src/components/FormFields/InputField.tsx +51 -0
  21. package/src/components/FormFields/NameField.tsx +5 -1
  22. package/src/components/FormFields/PhoneField.tsx +5 -1
  23. package/src/components/Loader/loader.scss +1 -1
  24. package/src/components/MainIframe/MainIframe.tsx +1 -1
  25. package/src/components/OrderForm/OrderForm.tsx +73 -17
  26. package/src/components/OrderForm/orderForm.scss +1 -1
  27. package/src/constants/index.ts +1 -1
  28. package/src/enums/general.ts +2 -0
  29. package/src/hooks/useMessageEvent.tsx +3 -2
  30. package/src/index.tsx +2 -2
  31. package/src/types/api.ts +1 -1
  32. package/src/types/general.ts +6 -1
  33. package/src/types/order.ts +6 -1
  34. package/src/utils/fetcher.ts +11 -7
  35. package/src/utils/helper.ts +29 -1
  36. package/src/utils/order.helper.ts +29 -9
  37. package/tsconfig.json +41 -0
@@ -1,18 +1,25 @@
1
1
  import { FC, ChangeEvent, Suspense, useState } from 'react';
2
2
  import { FormProvider, useForm, SubmitHandler } from 'react-hook-form';
3
3
 
4
- import { createSubscriber, mapSubscriberToUser } from 'API/SubscribeApi';
5
- import { orderStart } from 'API/OrdersApi';
6
- import { PaymentMethodEnum } from 'Enums/general';
7
- import { WRONG_MSG, PAYMENT_METHOD_DEFAULT } from 'Constants/index';
8
- import Alert from 'Component/Alert/Alert';
9
- import Button from 'Component/Button/Button';
10
- import formFieldsMapper from 'Component/FormFields/FormFieldsMapper';
11
- import { DEFAULT_ORDER_FORM_FIELDS } from 'Component/FormFields/FormFields.helper';
12
- import { OrderFormInputsType, OrderInfoType } from 'Types/order';
13
- import { PaymentMethodOptionsType, OrderFormFiledType } from 'Types/general';
14
- import { prepareAgreementModel } from 'Utils/order.helper';
15
- import { prepareErrorMessage } from 'Utils/helper';
4
+ import { createSubscriber, mapSubscriberToUser } from '../../api/SubscribeApi';
5
+ import { orderStart } from '../../api/OrdersApi';
6
+ import { PaymentMethodEnum } from '../../enums/general';
7
+ import { WRONG_MSG, PAYMENT_METHOD_DEFAULT } from '../../constants/index';
8
+ import Alert from '../Alert/Alert';
9
+ import Button from '../Button/Button';
10
+ import formFieldsMapper from '../FormFields/FormFieldsMapper';
11
+ import { DEFAULT_ORDER_FORM_FIELDS } from '../FormFields/FormFields.helper';
12
+ import { OrderFormInputsType, OrderInfoType } from '../../types/order';
13
+ import {
14
+ PaymentMethodOptionsType,
15
+ OrderFormFiledType,
16
+ ErrorsMsg,
17
+ } from '../../types/general';
18
+ import { prepareAgreementModel } from '../../utils/order.helper';
19
+ import {
20
+ prepareErrorMessage,
21
+ prepareErrorsArrayMessage,
22
+ } from '../../utils/helper';
16
23
 
17
24
  import './orderForm.scss';
18
25
 
@@ -23,7 +30,8 @@ type Props = {
23
30
  userId?: string;
24
31
  identityProviderId?: string;
25
32
  organizationId: string;
26
- redirectUrl: string;
33
+ redirectUrl?: string;
34
+ showIframe?: boolean;
27
35
  language: string;
28
36
  merchantAgreementUrl: string;
29
37
  paymentMethodsOptions?: PaymentMethodOptionsType;
@@ -40,6 +48,10 @@ const initialData = {
40
48
  name: '',
41
49
  email: '',
42
50
  phoneNumber: '',
51
+ country: '',
52
+ city: '',
53
+ address: '',
54
+ zip: '',
43
55
  paymentMethod: PAYMENT_METHOD_DEFAULT,
44
56
  };
45
57
 
@@ -51,6 +63,7 @@ const OrderForm: FC<Props> = ({
51
63
  identityProviderId,
52
64
  organizationId,
53
65
  redirectUrl,
66
+ showIframe,
54
67
  paymentMethodsOptions,
55
68
  defaultValues,
56
69
  language,
@@ -64,6 +77,7 @@ const OrderForm: FC<Props> = ({
64
77
  }) => {
65
78
  const [loading, setLoading] = useState<boolean>(false);
66
79
  const [apiErrorMsg, setApiErrorMsg] = useState<string>('');
80
+ const [errorsMsg, setErrorsMsg] = useState<string[]>([]);
67
81
  const [orderFields, setOrderFields] = useState<OrderFormFiledType[]>(
68
82
  paymentMethodsOptions?.[PAYMENT_METHOD_DEFAULT]?.orderFormFields ??
69
83
  DEFAULT_ORDER_FORM_FIELDS
@@ -87,15 +101,40 @@ const OrderForm: FC<Props> = ({
87
101
  data
88
102
  ): Promise<void> => {
89
103
  setApiErrorMsg('');
104
+ setErrorsMsg([]);
90
105
 
91
106
  setLoading(true);
92
107
  try {
93
108
  let id: string | undefined = subscriberId;
94
109
  if (!subscriberId) {
95
110
  const response = await createSubscriber({
96
- name: data.name,
97
- email: data.email,
98
- phone: data.phoneNumber,
111
+ name: orderFields.find((i) => i.name === 'name')
112
+ ? data.name?.trim() || undefined
113
+ : undefined,
114
+ email: orderFields.find((i) => i.name === 'email')
115
+ ? data.email?.trim() || undefined
116
+ : undefined,
117
+ phone: orderFields.find((i) => i.name === 'phoneNumber')
118
+ ? data.phoneNumber?.trim() || undefined
119
+ : undefined,
120
+ country: orderFields.find((i) => i.name === 'country')
121
+ ? data.country?.trim() || undefined
122
+ : undefined,
123
+ city: orderFields.find((i) => i.name === 'city')
124
+ ? data.city?.trim() || undefined
125
+ : undefined,
126
+ addressLines: orderFields.find((i) => i.name === 'address')
127
+ ? data.address?.trim()
128
+ ? data.address
129
+ ?.trim()
130
+ .replace(/\r\n/g, '\n')
131
+ .split('\n')
132
+ .filter((line) => line)
133
+ : undefined
134
+ : undefined,
135
+ zip: orderFields.find((i) => i.name === 'zip')
136
+ ? data.zip?.trim() || undefined
137
+ : undefined,
99
138
  });
100
139
  id = response.id;
101
140
 
@@ -114,7 +153,12 @@ const OrderForm: FC<Props> = ({
114
153
  const agreements = prepareAgreementModel({
115
154
  paymentMethod,
116
155
  redirectUrl,
117
- data,
156
+ showIframe,
157
+ phoneNumber: orderFields.find(
158
+ (i) => i.name === 'phoneNumber'
159
+ )
160
+ ? data.phoneNumber?.trim() || undefined
161
+ : undefined,
118
162
  language,
119
163
  merchantAgreementUrl,
120
164
  generateSubscriberContact:
@@ -143,9 +187,19 @@ const OrderForm: FC<Props> = ({
143
187
  }
144
188
  callback(null);
145
189
  setApiErrorMsg(WRONG_MSG);
190
+ setErrorsMsg([]);
146
191
  } catch (error) {
147
192
  console.error(error);
148
193
  setApiErrorMsg(prepareErrorMessage(error as Error));
194
+ setErrorsMsg(
195
+ prepareErrorsArrayMessage(
196
+ (
197
+ error as {
198
+ errors: ErrorsMsg;
199
+ }
200
+ )?.errors
201
+ )
202
+ );
149
203
  callback(null);
150
204
  } finally {
151
205
  setLoading(false);
@@ -227,6 +281,8 @@ const OrderForm: FC<Props> = ({
227
281
  buttonText={buttonText}
228
282
  />
229
283
  <Alert className="mt-2" msg={apiErrorMsg} />
284
+ {errorsMsg?.length > 0 &&
285
+ errorsMsg.map((i) => <Alert className="mt-2" msg={i} />)}
230
286
  </form>
231
287
  </FormProvider>
232
288
  );
@@ -1,4 +1,4 @@
1
- @import 'Assets/styles/variables.scss';
1
+ @import '../../assets/styles/variables.scss';
2
2
 
3
3
  .sdk-order-form {
4
4
  max-width : 320px;
@@ -1,4 +1,4 @@
1
- import { PaymentMethodEnum } from 'Enums/general';
1
+ import { PaymentMethodEnum } from '../enums/general';
2
2
 
3
3
  export const BASE_API = process.env.API_URL ?? '/';
4
4
 
@@ -6,6 +6,8 @@ export enum PaymentMethodEnum {
6
6
 
7
7
  export enum MessageEventTypeEnum {
8
8
  ORDER_FLOW_COMPLETE = 'orderFlowComplete',
9
+ ORDER_FLOW_CANCEL = 'orderFlowCancel',
10
+ ORDER_UPDATE_INFO = 'orderUpdateInfo',
9
11
  VIPPS_COMPLETE = 'completeOrder',
10
12
  CANCEL = 'cancel',
11
13
  COMPLETE = 'complete',
@@ -1,7 +1,7 @@
1
1
  import { useEffect, useCallback } from 'react';
2
2
 
3
- import { MessageEventTypeEnum } from 'Enums/general';
4
- import { CompleteOrderParamsType, OrderInfoType } from 'Types/order';
3
+ import { MessageEventTypeEnum, PaymentMethodEnum } from '../enums/general';
4
+ import { CompleteOrderParamsType, OrderInfoType } from '../types/order';
5
5
  import useQueryParams from './useQueryParams';
6
6
 
7
7
  const useMessageEvent = (
@@ -76,6 +76,7 @@ const useMessageEvent = (
76
76
  orderId: queryParams.get('orderId') || '',
77
77
  agreementId: queryParams.get('agreementId') || '',
78
78
  orderInfo: orderInfo || null,
79
+ paymentMethod: PaymentMethodEnum.Vipps,
79
80
  });
80
81
  }
81
82
  }, [
package/src/index.tsx CHANGED
@@ -1,8 +1,8 @@
1
1
  import { createRoot, Root } from 'react-dom/client';
2
2
  import { createElement } from 'react';
3
3
 
4
- import { ConfigType } from 'Types/general';
5
- import { createSubscriber, mapSubscriberToUser } from 'API/SubscribeApi';
4
+ import { ConfigType } from './types/general';
5
+ import { createSubscriber, mapSubscriberToUser } from './api/SubscribeApi';
6
6
  import App from './App';
7
7
 
8
8
  let root: Root;
package/src/types/api.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { HttpStatusCode } from 'Enums/api';
1
+ import { HttpStatusCode } from '../enums/api';
2
2
 
3
3
  export interface ApiResponseType<T> {
4
4
  status: HttpStatusCode;
@@ -1,4 +1,4 @@
1
- import { PaymentMethodEnum } from 'Enums/general';
1
+ import { PaymentMethodEnum } from '../enums/general';
2
2
  import { OrderFormInputsType } from './order';
3
3
 
4
4
  declare global {
@@ -31,6 +31,7 @@ export type ConfigType = {
31
31
  identityProviderId: string;
32
32
  organizationId: string;
33
33
  apiKey?: string;
34
+ apiUrl?: string;
34
35
  redirectUrl?: string;
35
36
  showIframe?: boolean;
36
37
  availablePaymentMethods?: { label: string; value: PaymentMethodEnum }[];
@@ -48,3 +49,7 @@ export type ConfigType = {
48
49
  errorInvalidPhoneMsg?: string;
49
50
  };
50
51
  };
52
+
53
+ export type ErrorsMsg = {
54
+ [key: string]: string[];
55
+ };
@@ -1,10 +1,14 @@
1
- import { PaymentMethodEnum } from 'Enums/general';
1
+ import { PaymentMethodEnum } from '../enums/general';
2
2
 
3
3
  export type OrderFormInputsType = {
4
4
  name?: string;
5
5
  email?: string;
6
6
  phoneNumber?: string;
7
7
  paymentMethod?: PaymentMethodEnum;
8
+ country?: string;
9
+ city?: string;
10
+ address?: string;
11
+ zip?: string;
8
12
  };
9
13
 
10
14
  export type VippsMobilePay = {
@@ -38,4 +42,5 @@ export type CompleteOrderParamsType = {
38
42
  orderId: string;
39
43
  agreementId: string;
40
44
  orderInfo: OrderInfoType | null;
45
+ paymentMethod?: PaymentMethodEnum | null;
41
46
  };
@@ -1,6 +1,6 @@
1
- import { HttpStatusCode } from 'Enums/api';
2
- import { ApiResponseType } from 'Types/api';
3
- import { BASE_API } from 'Constants/index';
1
+ import { HttpStatusCode } from '../enums/api';
2
+ import { ApiResponseType } from '../types/api';
3
+ import { BASE_API } from '../constants/index';
4
4
 
5
5
  export type Method =
6
6
  | 'GET'
@@ -42,7 +42,8 @@ async function fetcher<ResponseType, BodyType = void>(
42
42
  ): Promise<ApiResponseType<ResponseType> | ResponseType> {
43
43
  const { url, method, headers, body, params } = createHeader(options);
44
44
 
45
- const endpoint = new URL(`${BASE_API}${url}`);
45
+ const apiUrl = sessionStorage.getItem('sdk_api_url');
46
+ const endpoint = new URL(`${apiUrl || BASE_API}${url}`);
46
47
 
47
48
  if (params) {
48
49
  Object.entries(params).forEach(([key, value]) => {
@@ -68,12 +69,15 @@ async function fetcher<ResponseType, BodyType = void>(
68
69
  } else if (response.status === HttpStatusCode.FORBIDDEN) {
69
70
  reject({ message: 'Something Wrong with permission!' });
70
71
  } else {
71
- const data = await response?.json();
72
72
  if (response.ok) {
73
- resolve(data);
73
+ response
74
+ .json()
75
+ .then((data) => resolve(data))
76
+ .catch(() => resolve(null as ResponseType));
74
77
  } else {
78
+ const data = await response?.json();
75
79
  const message =
76
- data.message || data.details || data.title;
80
+ data.details || data.message || data.title;
77
81
  reject({ ...data, message });
78
82
  }
79
83
  }
@@ -1,4 +1,5 @@
1
- import { WRONG_MSG } from 'Constants/index';
1
+ import { WRONG_MSG } from '../constants/index';
2
+ import { ErrorsMsg } from '../types/general';
2
3
 
3
4
  export const prepareErrorMessage = (error: Error, defaultMsg?: string) => {
4
5
  if (typeof error === 'string') {
@@ -16,3 +17,30 @@ export const prepareErrorMessage = (error: Error, defaultMsg?: string) => {
16
17
  );
17
18
  }
18
19
  };
20
+
21
+ export const prepareErrorsArrayMessage = (errors: ErrorsMsg | null) => {
22
+ const msg: string[] = [];
23
+
24
+ if (errors) {
25
+ Object.entries(errors).forEach(([_, values]) => {
26
+ if (values?.length > 0) {
27
+ values.forEach((i) => {
28
+ msg.push(i);
29
+ });
30
+ }
31
+ });
32
+ }
33
+
34
+ return msg;
35
+ };
36
+
37
+ export function uuidv4() {
38
+ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
39
+ /[xy]/g,
40
+ function (c) {
41
+ const r = (Math.random() * 16) | 0;
42
+ const v = c == 'x' ? r : (r & 0x3) | 0x8;
43
+ return v.toString(16);
44
+ }
45
+ );
46
+ }
@@ -1,10 +1,11 @@
1
- import { MessageEventTypeEnum, PaymentMethodEnum } from 'Enums/general';
2
- import { OrderFormInputsType, AgreementsType } from 'Types/order';
1
+ import { MessageEventTypeEnum, PaymentMethodEnum } from '../enums/general';
2
+ import { AgreementsType } from '../types/order';
3
3
 
4
4
  type AgreementModelType = {
5
5
  paymentMethod: PaymentMethodEnum;
6
- redirectUrl: string;
7
- data: OrderFormInputsType;
6
+ redirectUrl?: string;
7
+ showIframe?: boolean;
8
+ phoneNumber?: string;
8
9
  generateSubscriberContact: boolean;
9
10
  language: string;
10
11
  merchantAgreementUrl: string;
@@ -14,7 +15,8 @@ type AgreementModelType = {
14
15
  export const prepareAgreementModel = ({
15
16
  paymentMethod,
16
17
  redirectUrl,
17
- data,
18
+ showIframe,
19
+ phoneNumber,
18
20
  generateSubscriberContact,
19
21
  language,
20
22
  merchantAgreementUrl,
@@ -23,11 +25,29 @@ export const prepareAgreementModel = ({
23
25
  const model: AgreementsType = {
24
26
  paymentProvider: paymentMethod,
25
27
  };
28
+ const existUrl = new URL(window.location.href);
29
+ const journey = existUrl.searchParams.get('journey');
30
+ const url = showIframe
31
+ ? window.location.href.split('?')[0]
32
+ : redirectUrl || window.location.href;
33
+ const cancelUrl = new URL(url);
34
+ cancelUrl.searchParams.append('action', `${MessageEventTypeEnum.CANCEL}`);
35
+ if (journey) {
36
+ cancelUrl.searchParams.append('journey', journey);
37
+ }
38
+ const confirmUrl = new URL(url);
39
+ confirmUrl.searchParams.append(
40
+ 'action',
41
+ `${MessageEventTypeEnum.COMPLETE}`
42
+ );
43
+ if (journey) {
44
+ confirmUrl.searchParams.append('journey', journey);
45
+ }
26
46
 
27
47
  if (paymentMethod === PaymentMethodEnum.SwedbankPay) {
28
48
  model.swedbankPay = {
29
- cancelUrl: `${redirectUrl}?action=${MessageEventTypeEnum.CANCEL}`,
30
- completeUrl: `${redirectUrl}?action=${MessageEventTypeEnum.COMPLETE}`,
49
+ cancelUrl: `${cancelUrl}`,
50
+ completeUrl: `${confirmUrl}`,
31
51
  language,
32
52
  accountId,
33
53
  };
@@ -41,8 +61,8 @@ export const prepareAgreementModel = ({
41
61
  generateSubscriberContact,
42
62
  merchantAgreementUrl,
43
63
  accountId,
44
- phoneNumber: data.phoneNumber,
45
- merchantRedirectUrl: redirectUrl,
64
+ phoneNumber,
65
+ merchantRedirectUrl: redirectUrl || window.location.href,
46
66
  },
47
67
  };
48
68
  };
package/tsconfig.json ADDED
@@ -0,0 +1,41 @@
1
+ {
2
+ "compilerOptions": {
3
+ "target": "es5",
4
+ "lib": ["dom", "dom.iterable", "esnext"],
5
+ "downlevelIteration": true,
6
+ "allowJs": true,
7
+ "checkJs": false,
8
+ "skipLibCheck": true,
9
+ "esModuleInterop": true,
10
+ "allowSyntheticDefaultImports": true,
11
+ "strict": true,
12
+ "forceConsistentCasingInFileNames": true,
13
+ "noFallthroughCasesInSwitch": true,
14
+ "module": "esnext",
15
+ "moduleResolution": "node",
16
+ "resolveJsonModule": true,
17
+ "isolatedModules": false,
18
+ "noEmit": false,
19
+ "noImplicitAny": true,
20
+ "jsx": "react-jsx",
21
+ "baseUrl": "src",
22
+ "sourceMap": true,
23
+ "inlineSources": true,
24
+ "sourceRoot": "/",
25
+ "paths": {
26
+ "*": ["*"],
27
+ "API": ["api"],
28
+ "API/*": ["api/*"],
29
+ "Component/*": ["components/*"],
30
+ "Utils/*": ["utils/*"],
31
+ "Hooks/*": ["hooks/*"],
32
+ "Models/*": ["models/*"],
33
+ "Types/*": ["types/*"],
34
+ "Enums/*": ["enums/*"],
35
+ "Constants/*": ["constants/*"],
36
+ "Assets/*": ["assets/*"]
37
+ }
38
+ },
39
+ "include": ["src"],
40
+ "exclude": ["node_modules"]
41
+ }