@frontegg/rest-api 2.10.61 → 2.10.62
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/CHANGELOG.md +2 -0
- package/dist/es2015/fetch.d.ts +1 -1
- package/dist/es2015/fetch.js +14 -6
- package/dist/es2015/fetch.js.map +1 -1
- package/dist/es2015/interfaces.d.ts +1 -1
- package/dist/es2015/subscriptions/interfaces.d.ts +4 -6
- package/dist/es2015/subscriptions/subscriptions.d.ts +1 -1
- package/dist/es2015/subscriptions/subscriptions.js +2 -2
- package/dist/es2015/subscriptions/subscriptions.js.map +1 -1
- package/dist/fetch.d.ts +1 -1
- package/dist/fetch.js +13 -5
- package/dist/fetch.js.map +1 -1
- package/dist/interfaces.d.ts +1 -1
- package/dist/subscriptions/interfaces.d.ts +4 -6
- package/dist/subscriptions/subscriptions.d.ts +1 -1
- package/dist/subscriptions/subscriptions.js +2 -2
- package/dist/subscriptions/subscriptions.js.map +1 -1
- package/dist/umd/index.js +15 -7
- package/package.json +1 -1
- package/src/fetch.ts +15 -8
- package/src/interfaces.ts +1 -1
- package/src/subscriptions/interfaces.ts +6 -8
- package/src/subscriptions/subscriptions.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [2.10.62](https://github.com/frontegg/typescript-rest-api/compare/v2.10.61...v2.10.62) (2022-04-19)
|
|
6
|
+
|
|
5
7
|
### [2.10.61](https://github.com/frontegg/typescript-rest-api/compare/v2.10.60...v2.10.61) (2022-02-27)
|
|
6
8
|
|
|
7
9
|
### [2.10.60](https://github.com/frontegg/typescript-rest-api/compare/v2.10.59...v2.10.60) (2022-02-24)
|
package/dist/es2015/fetch.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ interface RequestOptions {
|
|
|
9
9
|
headers?: Record<string, string>;
|
|
10
10
|
credentials?: RequestCredentials;
|
|
11
11
|
}
|
|
12
|
-
export declare function getBaseUrl(context: ContextOptions): string;
|
|
12
|
+
export declare function getBaseUrl(context: ContextOptions, url: string): string;
|
|
13
13
|
export declare const Get: (url: string, params?: any, opts?: Omit<RequestOptions, "method" | "url"> | undefined) => Promise<any>;
|
|
14
14
|
export declare const Post: (url: string, body?: any, opts?: Omit<RequestOptions, "method" | "url"> | undefined) => Promise<any>;
|
|
15
15
|
export declare const Patch: (url: string, body?: any, opts?: Omit<RequestOptions, "method" | "url"> | undefined) => Promise<any>;
|
package/dist/es2015/fetch.js
CHANGED
|
@@ -8,9 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { ContextHolder } from './ContextHolder';
|
|
11
|
-
import { FronteggApiError } from
|
|
12
|
-
export function getBaseUrl(context) {
|
|
13
|
-
let baseUrl
|
|
11
|
+
import { FronteggApiError } from './error';
|
|
12
|
+
export function getBaseUrl(context, url) {
|
|
13
|
+
let baseUrl;
|
|
14
|
+
if (typeof context.baseUrl === 'function') {
|
|
15
|
+
baseUrl = context.baseUrl(url);
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
baseUrl = context.baseUrl;
|
|
19
|
+
}
|
|
14
20
|
const prefix = context.urlPrefix || 'frontegg';
|
|
15
21
|
if (!baseUrl.endsWith('/')) {
|
|
16
22
|
baseUrl += '/';
|
|
@@ -22,7 +28,7 @@ export function getBaseUrl(context) {
|
|
|
22
28
|
}
|
|
23
29
|
function prepareUrl(context, url, params) {
|
|
24
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const baseUrl = getBaseUrl(context);
|
|
31
|
+
const baseUrl = getBaseUrl(context, url);
|
|
26
32
|
const paramsToSend = yield buildQueryParams(context, params);
|
|
27
33
|
let finalUrl = url.startsWith('http') ? url : `${baseUrl}${url}`;
|
|
28
34
|
const hasKeys = Object.keys(paramsToSend).length > 0;
|
|
@@ -99,7 +105,8 @@ const sendRequest = (opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
99
105
|
});
|
|
100
106
|
if (response.status === 302) {
|
|
101
107
|
window.location.href = yield response.text();
|
|
102
|
-
return new Promise(() => {
|
|
108
|
+
return new Promise(() => {
|
|
109
|
+
});
|
|
103
110
|
}
|
|
104
111
|
if (!response.ok) {
|
|
105
112
|
if (response.status === 413) {
|
|
@@ -110,7 +117,8 @@ const sendRequest = (opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
110
117
|
errorMessage = yield response.text();
|
|
111
118
|
errorMessage = JSON.parse(errorMessage);
|
|
112
119
|
}
|
|
113
|
-
catch (e) {
|
|
120
|
+
catch (e) {
|
|
121
|
+
}
|
|
114
122
|
if (errorMessage.errors) {
|
|
115
123
|
errorMessage = errorMessage.errors.join(', ');
|
|
116
124
|
}
|
package/dist/es2015/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAa3C,MAAM,UAAU,UAAU,CAAC,OAAuB;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export interface KeyValuePair {
|
|
|
12
12
|
}
|
|
13
13
|
export declare type LogLevel = 'warn' | 'error';
|
|
14
14
|
export interface ContextOptions {
|
|
15
|
-
baseUrl: string;
|
|
15
|
+
baseUrl: string | ((url: string) => string);
|
|
16
16
|
clientId?: string;
|
|
17
17
|
tokenResolver?: () => Promise<string> | string;
|
|
18
18
|
additionalQueryParamsResolver?: () => Promise<KeyValuePair[]> | KeyValuePair[];
|
|
@@ -22,8 +22,11 @@ export interface ISubscriptionResponse {
|
|
|
22
22
|
currentPeriodEnd: string;
|
|
23
23
|
status: ISubscriptionStatus;
|
|
24
24
|
cancellation: ISubscriptionCancellationResponse | null;
|
|
25
|
-
items: ISubscriptionItemResponse[];
|
|
26
25
|
trialEnd?: string;
|
|
26
|
+
plan: ISubscriptionPlanResponse;
|
|
27
|
+
}
|
|
28
|
+
export interface ISubscriptionPlanResponse {
|
|
29
|
+
slug: string;
|
|
27
30
|
}
|
|
28
31
|
export interface ISubscriptionCancellationResponse {
|
|
29
32
|
policy: ISubscriptionCancellationPolicy;
|
|
@@ -118,11 +121,6 @@ export interface IPaymentProviderResponse {
|
|
|
118
121
|
export interface IUpdateSubscriptionRequest {
|
|
119
122
|
paymentMethodId: string;
|
|
120
123
|
planId: string;
|
|
121
|
-
items: IUpdateSubscriptionItemRequest[];
|
|
122
|
-
}
|
|
123
|
-
export interface IUpdateSubscriptionItemRequest {
|
|
124
|
-
id: string;
|
|
125
|
-
planId: string;
|
|
126
124
|
}
|
|
127
125
|
export interface IUpdateManagedSubscriptionRequest {
|
|
128
126
|
paymentMethodId: string;
|
|
@@ -18,4 +18,4 @@ export declare function renewSubscription(subscriptionId: string): Promise<void>
|
|
|
18
18
|
/**
|
|
19
19
|
* Upgrade/Downgrade tenant subscription plan
|
|
20
20
|
*/
|
|
21
|
-
export declare function updateSubscription(subscriptionId: string, { paymentMethodId, planId
|
|
21
|
+
export declare function updateSubscription(subscriptionId: string, { paymentMethodId, planId }: IUpdateSubscriptionRequest): Promise<void>;
|
|
@@ -48,10 +48,10 @@ export function renewSubscription(subscriptionId) {
|
|
|
48
48
|
/**
|
|
49
49
|
* Upgrade/Downgrade tenant subscription plan
|
|
50
50
|
*/
|
|
51
|
-
export function updateSubscription(subscriptionId, { paymentMethodId, planId
|
|
51
|
+
export function updateSubscription(subscriptionId, { paymentMethodId, planId }) {
|
|
52
52
|
return __awaiter(this, void 0, void 0, function* () {
|
|
53
53
|
console.debug("updateSubscription()", { subscriptionId });
|
|
54
|
-
return Put(`${urls.subscriptions.billing.subscriptions.v1}/${subscriptionId}`, { paymentMethodId, planId
|
|
54
|
+
return Put(`${urls.subscriptions.billing.subscriptions.v1}/${subscriptionId}`, { paymentMethodId, planId });
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
57
|
//# sourceMappingURL=subscriptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../../src/subscriptions/subscriptions.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC;;GAEG;AACH,MAAM,UAAgB,gBAAgB;;QACpC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,OAAO,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,eAAe,CACnC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACvD,OAAO,GAAG,CACR,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,EAAE,CACnE,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,kBAAkB,CACtC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAC1D,OAAO,GAAG,CACR,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,iBAAiB,EACjF,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,iBAAiB,CACrC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACzD,OAAO,GAAG,CACR,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,YAAY,EAC5E,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,kBAAkB,CACtC,cAAsB,EACtB,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../../src/subscriptions/subscriptions.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC;;GAEG;AACH,MAAM,UAAgB,gBAAgB;;QACpC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,OAAO,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,eAAe,CACnC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACvD,OAAO,GAAG,CACR,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,EAAE,CACnE,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,kBAAkB,CACtC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAC1D,OAAO,GAAG,CACR,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,iBAAiB,EACjF,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,iBAAiB,CACrC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACzD,OAAO,GAAG,CACR,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,YAAY,EAC5E,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,UAAgB,kBAAkB,CACtC,cAAsB,EACtB,EAAE,eAAe,EAAE,MAAM,EAA8B;;QAEvD,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAC1D,OAAO,GAAG,CACR,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,EAAE,EAClE,EAAE,eAAe,EAAE,MAAM,EAAE,CAC5B,CAAC;IACJ,CAAC;CAAA"}
|
package/dist/fetch.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ interface RequestOptions {
|
|
|
9
9
|
headers?: Record<string, string>;
|
|
10
10
|
credentials?: RequestCredentials;
|
|
11
11
|
}
|
|
12
|
-
export declare function getBaseUrl(context: ContextOptions): string;
|
|
12
|
+
export declare function getBaseUrl(context: ContextOptions, url: string): string;
|
|
13
13
|
export declare const Get: (url: string, params?: any, opts?: Omit<RequestOptions, "method" | "url"> | undefined) => Promise<any>;
|
|
14
14
|
export declare const Post: (url: string, body?: any, opts?: Omit<RequestOptions, "method" | "url"> | undefined) => Promise<any>;
|
|
15
15
|
export declare const Patch: (url: string, body?: any, opts?: Omit<RequestOptions, "method" | "url"> | undefined) => Promise<any>;
|
package/dist/fetch.js
CHANGED
|
@@ -12,8 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.PostDownload = exports.Delete = exports.Put = exports.Patch = exports.Post = exports.Get = exports.getBaseUrl = void 0;
|
|
13
13
|
const ContextHolder_1 = require("./ContextHolder");
|
|
14
14
|
const error_1 = require("./error");
|
|
15
|
-
function getBaseUrl(context) {
|
|
16
|
-
let baseUrl
|
|
15
|
+
function getBaseUrl(context, url) {
|
|
16
|
+
let baseUrl;
|
|
17
|
+
if (typeof context.baseUrl === 'function') {
|
|
18
|
+
baseUrl = context.baseUrl(url);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
baseUrl = context.baseUrl;
|
|
22
|
+
}
|
|
17
23
|
const prefix = context.urlPrefix || 'frontegg';
|
|
18
24
|
if (!baseUrl.endsWith('/')) {
|
|
19
25
|
baseUrl += '/';
|
|
@@ -26,7 +32,7 @@ function getBaseUrl(context) {
|
|
|
26
32
|
exports.getBaseUrl = getBaseUrl;
|
|
27
33
|
function prepareUrl(context, url, params) {
|
|
28
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
-
const baseUrl = getBaseUrl(context);
|
|
35
|
+
const baseUrl = getBaseUrl(context, url);
|
|
30
36
|
const paramsToSend = yield buildQueryParams(context, params);
|
|
31
37
|
let finalUrl = url.startsWith('http') ? url : `${baseUrl}${url}`;
|
|
32
38
|
const hasKeys = Object.keys(paramsToSend).length > 0;
|
|
@@ -103,7 +109,8 @@ const sendRequest = (opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
103
109
|
});
|
|
104
110
|
if (response.status === 302) {
|
|
105
111
|
window.location.href = yield response.text();
|
|
106
|
-
return new Promise(() => {
|
|
112
|
+
return new Promise(() => {
|
|
113
|
+
});
|
|
107
114
|
}
|
|
108
115
|
if (!response.ok) {
|
|
109
116
|
if (response.status === 413) {
|
|
@@ -114,7 +121,8 @@ const sendRequest = (opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
114
121
|
errorMessage = yield response.text();
|
|
115
122
|
errorMessage = JSON.parse(errorMessage);
|
|
116
123
|
}
|
|
117
|
-
catch (e) {
|
|
124
|
+
catch (e) {
|
|
125
|
+
}
|
|
118
126
|
if (errorMessage.errors) {
|
|
119
127
|
errorMessage = errorMessage.errors.join(', ');
|
|
120
128
|
}
|
package/dist/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mDAAgD;AAEhD,mCAA2C;AAa3C,SAAgB,UAAU,CAAC,OAAuB;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"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"}
|
package/dist/interfaces.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export interface KeyValuePair {
|
|
|
12
12
|
}
|
|
13
13
|
export declare type LogLevel = 'warn' | 'error';
|
|
14
14
|
export interface ContextOptions {
|
|
15
|
-
baseUrl: string;
|
|
15
|
+
baseUrl: string | ((url: string) => string);
|
|
16
16
|
clientId?: string;
|
|
17
17
|
tokenResolver?: () => Promise<string> | string;
|
|
18
18
|
additionalQueryParamsResolver?: () => Promise<KeyValuePair[]> | KeyValuePair[];
|
|
@@ -22,8 +22,11 @@ export interface ISubscriptionResponse {
|
|
|
22
22
|
currentPeriodEnd: string;
|
|
23
23
|
status: ISubscriptionStatus;
|
|
24
24
|
cancellation: ISubscriptionCancellationResponse | null;
|
|
25
|
-
items: ISubscriptionItemResponse[];
|
|
26
25
|
trialEnd?: string;
|
|
26
|
+
plan: ISubscriptionPlanResponse;
|
|
27
|
+
}
|
|
28
|
+
export interface ISubscriptionPlanResponse {
|
|
29
|
+
slug: string;
|
|
27
30
|
}
|
|
28
31
|
export interface ISubscriptionCancellationResponse {
|
|
29
32
|
policy: ISubscriptionCancellationPolicy;
|
|
@@ -118,11 +121,6 @@ export interface IPaymentProviderResponse {
|
|
|
118
121
|
export interface IUpdateSubscriptionRequest {
|
|
119
122
|
paymentMethodId: string;
|
|
120
123
|
planId: string;
|
|
121
|
-
items: IUpdateSubscriptionItemRequest[];
|
|
122
|
-
}
|
|
123
|
-
export interface IUpdateSubscriptionItemRequest {
|
|
124
|
-
id: string;
|
|
125
|
-
planId: string;
|
|
126
124
|
}
|
|
127
125
|
export interface IUpdateManagedSubscriptionRequest {
|
|
128
126
|
paymentMethodId: string;
|
|
@@ -18,4 +18,4 @@ export declare function renewSubscription(subscriptionId: string): Promise<void>
|
|
|
18
18
|
/**
|
|
19
19
|
* Upgrade/Downgrade tenant subscription plan
|
|
20
20
|
*/
|
|
21
|
-
export declare function updateSubscription(subscriptionId: string, { paymentMethodId, planId
|
|
21
|
+
export declare function updateSubscription(subscriptionId: string, { paymentMethodId, planId }: IUpdateSubscriptionRequest): Promise<void>;
|
|
@@ -55,10 +55,10 @@ exports.renewSubscription = renewSubscription;
|
|
|
55
55
|
/**
|
|
56
56
|
* Upgrade/Downgrade tenant subscription plan
|
|
57
57
|
*/
|
|
58
|
-
function updateSubscription(subscriptionId, { paymentMethodId, planId
|
|
58
|
+
function updateSubscription(subscriptionId, { paymentMethodId, planId }) {
|
|
59
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
console.debug("updateSubscription()", { subscriptionId });
|
|
61
|
-
return fetch_1.Put(`${constants_1.urls.subscriptions.billing.subscriptions.v1}/${subscriptionId}`, { paymentMethodId, planId
|
|
61
|
+
return fetch_1.Put(`${constants_1.urls.subscriptions.billing.subscriptions.v1}/${subscriptionId}`, { paymentMethodId, planId });
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
exports.updateSubscription = updateSubscription;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/subscriptions/subscriptions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oCAAoC;AACpC,4CAAoC;AAEpC;;GAEG;AACH,SAAsB,gBAAgB;;QACpC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,OAAO,WAAG,CAAC,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC;CAAA;AAHD,4CAGC;AAED;;GAEG;AACH,SAAsB,eAAe,CACnC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACvD,OAAO,WAAG,CACR,GAAG,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,EAAE,CACnE,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AAED;;GAEG;AACH,SAAsB,kBAAkB,CACtC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAC1D,OAAO,WAAG,CACR,GAAG,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,iBAAiB,EACjF,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AARD,gDAQC;AAED;;GAEG;AACH,SAAsB,iBAAiB,CACrC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACzD,OAAO,WAAG,CACR,GAAG,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,YAAY,EAC5E,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AARD,8CAQC;AAED;;GAEG;AACH,SAAsB,kBAAkB,CACtC,cAAsB,EACtB,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/subscriptions/subscriptions.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oCAAoC;AACpC,4CAAoC;AAEpC;;GAEG;AACH,SAAsB,gBAAgB;;QACpC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,OAAO,WAAG,CAAC,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC;CAAA;AAHD,4CAGC;AAED;;GAEG;AACH,SAAsB,eAAe,CACnC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACvD,OAAO,WAAG,CACR,GAAG,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,EAAE,CACnE,CAAC;IACJ,CAAC;CAAA;AAPD,0CAOC;AAED;;GAEG;AACH,SAAsB,kBAAkB,CACtC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAC1D,OAAO,WAAG,CACR,GAAG,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,iBAAiB,EACjF,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AARD,gDAQC;AAED;;GAEG;AACH,SAAsB,iBAAiB,CACrC,cAAsB;;QAEtB,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACzD,OAAO,WAAG,CACR,GAAG,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,YAAY,EAC5E,EAAE,CACH,CAAC;IACJ,CAAC;CAAA;AARD,8CAQC;AAED;;GAEG;AACH,SAAsB,kBAAkB,CACtC,cAAsB,EACtB,EAAE,eAAe,EAAE,MAAM,EAA8B;;QAEvD,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAC1D,OAAO,WAAG,CACR,GAAG,gBAAI,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,cAAc,EAAE,EAClE,EAAE,eAAe,EAAE,MAAM,EAAE,CAC5B,CAAC;IACJ,CAAC;CAAA;AATD,gDASC"}
|
package/dist/umd/index.js
CHANGED
|
@@ -116,8 +116,14 @@
|
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
|
|
119
|
-
function getBaseUrl(context) {
|
|
120
|
-
let baseUrl
|
|
119
|
+
function getBaseUrl(context, url) {
|
|
120
|
+
let baseUrl;
|
|
121
|
+
if (typeof context.baseUrl === 'function') {
|
|
122
|
+
baseUrl = context.baseUrl(url);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
baseUrl = context.baseUrl;
|
|
126
|
+
}
|
|
121
127
|
const prefix = context.urlPrefix || 'frontegg';
|
|
122
128
|
if (!baseUrl.endsWith('/')) {
|
|
123
129
|
baseUrl += '/';
|
|
@@ -129,7 +135,7 @@
|
|
|
129
135
|
}
|
|
130
136
|
function prepareUrl(context, url, params) {
|
|
131
137
|
return __awaiter(this, void 0, void 0, function* () {
|
|
132
|
-
const baseUrl = getBaseUrl(context);
|
|
138
|
+
const baseUrl = getBaseUrl(context, url);
|
|
133
139
|
const paramsToSend = yield buildQueryParams(context, params);
|
|
134
140
|
let finalUrl = url.startsWith('http') ? url : `${baseUrl}${url}`;
|
|
135
141
|
const hasKeys = Object.keys(paramsToSend).length > 0;
|
|
@@ -206,7 +212,8 @@
|
|
|
206
212
|
});
|
|
207
213
|
if (response.status === 302) {
|
|
208
214
|
window.location.href = yield response.text();
|
|
209
|
-
return new Promise(() => {
|
|
215
|
+
return new Promise(() => {
|
|
216
|
+
});
|
|
210
217
|
}
|
|
211
218
|
if (!response.ok) {
|
|
212
219
|
if (response.status === 413) {
|
|
@@ -217,7 +224,8 @@
|
|
|
217
224
|
errorMessage = yield response.text();
|
|
218
225
|
errorMessage = JSON.parse(errorMessage);
|
|
219
226
|
}
|
|
220
|
-
catch (e) {
|
|
227
|
+
catch (e) {
|
|
228
|
+
}
|
|
221
229
|
if (errorMessage.errors) {
|
|
222
230
|
errorMessage = errorMessage.errors.join(', ');
|
|
223
231
|
}
|
|
@@ -2314,10 +2322,10 @@
|
|
|
2314
2322
|
/**
|
|
2315
2323
|
* Upgrade/Downgrade tenant subscription plan
|
|
2316
2324
|
*/
|
|
2317
|
-
function updateSubscription(subscriptionId, { paymentMethodId, planId
|
|
2325
|
+
function updateSubscription(subscriptionId, { paymentMethodId, planId }) {
|
|
2318
2326
|
return __awaiter(this, void 0, void 0, function* () {
|
|
2319
2327
|
console.debug("updateSubscription()", { subscriptionId });
|
|
2320
|
-
return Put(`${urls.subscriptions.billing.subscriptions.v1}/${subscriptionId}`, { paymentMethodId, planId
|
|
2328
|
+
return Put(`${urls.subscriptions.billing.subscriptions.v1}/${subscriptionId}`, { paymentMethodId, planId });
|
|
2321
2329
|
});
|
|
2322
2330
|
}
|
|
2323
2331
|
|
package/package.json
CHANGED
package/src/fetch.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ContextHolder } from './ContextHolder';
|
|
2
2
|
import { ContextOptions, KeyValuePair } from './interfaces';
|
|
3
|
-
import { FronteggApiError } from
|
|
3
|
+
import { FronteggApiError } from './error';
|
|
4
4
|
|
|
5
5
|
interface RequestOptions {
|
|
6
6
|
url: string;
|
|
@@ -13,8 +13,13 @@ interface RequestOptions {
|
|
|
13
13
|
credentials?: RequestCredentials;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
export function getBaseUrl(context: ContextOptions): string {
|
|
17
|
-
let baseUrl
|
|
16
|
+
export function getBaseUrl(context: ContextOptions, url: string): string {
|
|
17
|
+
let baseUrl;
|
|
18
|
+
if (typeof context.baseUrl === 'function') {
|
|
19
|
+
baseUrl = context.baseUrl(url);
|
|
20
|
+
} else {
|
|
21
|
+
baseUrl = context.baseUrl;
|
|
22
|
+
}
|
|
18
23
|
const prefix = context.urlPrefix || 'frontegg';
|
|
19
24
|
if (!baseUrl.endsWith('/')) {
|
|
20
25
|
baseUrl += '/';
|
|
@@ -26,7 +31,7 @@ export function getBaseUrl(context: ContextOptions): string {
|
|
|
26
31
|
}
|
|
27
32
|
|
|
28
33
|
async function prepareUrl(context: ContextOptions, url: string, params?: any): Promise<string> {
|
|
29
|
-
const baseUrl = getBaseUrl(context);
|
|
34
|
+
const baseUrl = getBaseUrl(context, url);
|
|
30
35
|
const paramsToSend = await buildQueryParams(context, params);
|
|
31
36
|
|
|
32
37
|
let finalUrl = url.startsWith('http') ? url : `${baseUrl}${url}`;
|
|
@@ -110,7 +115,8 @@ const sendRequest = async (opts: RequestOptions) => {
|
|
|
110
115
|
|
|
111
116
|
if (response.status === 302) {
|
|
112
117
|
window.location.href = await response.text();
|
|
113
|
-
return new Promise(() => {
|
|
118
|
+
return new Promise(() => {
|
|
119
|
+
});
|
|
114
120
|
}
|
|
115
121
|
if (!response.ok) {
|
|
116
122
|
if (response.status === 413) {
|
|
@@ -120,16 +126,17 @@ const sendRequest = async (opts: RequestOptions) => {
|
|
|
120
126
|
try {
|
|
121
127
|
errorMessage = await response.text();
|
|
122
128
|
errorMessage = JSON.parse(errorMessage);
|
|
123
|
-
} catch (e) {
|
|
129
|
+
} catch (e) {
|
|
130
|
+
}
|
|
124
131
|
if (errorMessage.errors) {
|
|
125
132
|
errorMessage = errorMessage.errors.join(', ');
|
|
126
133
|
} else if (typeof errorMessage !== 'string') {
|
|
127
134
|
errorMessage = `Error ${response.status} - ${response.statusText}`;
|
|
128
135
|
}
|
|
129
136
|
|
|
130
|
-
if (response.status >= 400 && response.status < 500 && ['warn'].includes(context.logLevel ?? ''))
|
|
137
|
+
if (response.status >= 400 && response.status < 500 && [ 'warn' ].includes(context.logLevel ?? ''))
|
|
131
138
|
console.warn(errorMessage);
|
|
132
|
-
else if (response.status === 500 && ['warn', 'error'].includes(context.logLevel ?? '')) console.error(errorMessage);
|
|
139
|
+
else if (response.status === 500 && [ 'warn', 'error' ].includes(context.logLevel ?? '')) console.error(errorMessage);
|
|
133
140
|
|
|
134
141
|
throw new FronteggApiError(errorMessage, response.status);
|
|
135
142
|
}
|
package/src/interfaces.ts
CHANGED
|
@@ -16,7 +16,7 @@ export interface KeyValuePair {
|
|
|
16
16
|
export type LogLevel = 'warn' | 'error';
|
|
17
17
|
|
|
18
18
|
export interface ContextOptions {
|
|
19
|
-
baseUrl: string;
|
|
19
|
+
baseUrl: string | ((url: string) => string);
|
|
20
20
|
clientId?: string;
|
|
21
21
|
tokenResolver?: () => Promise<string> | string; // custom resolve Authorization Header value
|
|
22
22
|
additionalQueryParamsResolver?: () => Promise<KeyValuePair[]> | KeyValuePair[];
|
|
@@ -31,8 +31,12 @@ export interface ISubscriptionResponse {
|
|
|
31
31
|
currentPeriodEnd: string;
|
|
32
32
|
status: ISubscriptionStatus;
|
|
33
33
|
cancellation: ISubscriptionCancellationResponse | null;
|
|
34
|
-
items: ISubscriptionItemResponse[];
|
|
35
34
|
trialEnd?: string;
|
|
35
|
+
plan: ISubscriptionPlanResponse;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export interface ISubscriptionPlanResponse {
|
|
39
|
+
slug: string;
|
|
36
40
|
}
|
|
37
41
|
|
|
38
42
|
export interface ISubscriptionCancellationResponse {
|
|
@@ -145,15 +149,9 @@ export interface IPaymentProviderResponse {
|
|
|
145
149
|
export interface IUpdateSubscriptionRequest {
|
|
146
150
|
paymentMethodId: string;
|
|
147
151
|
planId: string;
|
|
148
|
-
items: IUpdateSubscriptionItemRequest[];
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
export interface IUpdateSubscriptionItemRequest {
|
|
152
|
-
id: string;
|
|
153
|
-
planId: string;
|
|
154
152
|
}
|
|
155
153
|
|
|
156
154
|
export interface IUpdateManagedSubscriptionRequest {
|
|
157
155
|
paymentMethodId: string;
|
|
158
156
|
planId: string;
|
|
159
|
-
}
|
|
157
|
+
}
|
|
@@ -53,11 +53,11 @@ export async function renewSubscription(
|
|
|
53
53
|
*/
|
|
54
54
|
export async function updateSubscription(
|
|
55
55
|
subscriptionId: string,
|
|
56
|
-
{ paymentMethodId, planId
|
|
56
|
+
{ paymentMethodId, planId }: IUpdateSubscriptionRequest
|
|
57
57
|
): Promise<void> {
|
|
58
58
|
console.debug("updateSubscription()", { subscriptionId });
|
|
59
59
|
return Put(
|
|
60
60
|
`${urls.subscriptions.billing.subscriptions.v1}/${subscriptionId}`,
|
|
61
|
-
{ paymentMethodId, planId
|
|
61
|
+
{ paymentMethodId, planId }
|
|
62
62
|
);
|
|
63
63
|
}
|