@shopify/shopify-app-remix 4.1.1 → 4.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/react/components/AppProvider/AppProvider.js.map +1 -1
- package/dist/cjs/react/components/AppProxyLink/AppProxyLink.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/strategies/auth-code-flow.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/strategies/merchant-custom-app.js.map +1 -1
- package/dist/cjs/server/authenticate/admin/strategies/token-exchange.js.map +1 -1
- package/dist/cjs/server/authenticate/webhooks/authenticate.js +34 -10
- package/dist/cjs/server/authenticate/webhooks/authenticate.js.map +1 -1
- package/dist/cjs/server/version.js +1 -1
- package/dist/cjs/server/version.js.map +1 -1
- package/dist/esm/react/components/AppProvider/AppProvider.mjs.map +1 -1
- package/dist/esm/react/components/AppProxyLink/AppProxyLink.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/strategies/auth-code-flow.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/strategies/merchant-custom-app.mjs.map +1 -1
- package/dist/esm/server/authenticate/admin/strategies/token-exchange.mjs.map +1 -1
- package/dist/esm/server/authenticate/webhooks/authenticate.mjs +35 -11
- package/dist/esm/server/authenticate/webhooks/authenticate.mjs.map +1 -1
- package/dist/esm/server/version.mjs +1 -1
- package/dist/esm/server/version.mjs.map +1 -1
- package/dist/ts/react/components/AppProvider/AppProvider.d.ts.map +1 -1
- package/dist/ts/react/components/AppProxyLink/AppProxyLink.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/billing/types.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/strategies/auth-code-flow.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/strategies/merchant-custom-app.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/strategies/token-exchange.d.ts.map +1 -1
- package/dist/ts/server/authenticate/admin/types.d.ts.map +1 -1
- package/dist/ts/server/authenticate/public/extension/types.d.ts.map +1 -1
- package/dist/ts/server/authenticate/webhooks/authenticate.d.ts.map +1 -1
- package/dist/ts/server/authenticate/webhooks/types.d.ts +34 -2
- package/dist/ts/server/authenticate/webhooks/types.d.ts.map +1 -1
- package/dist/ts/server/config-types.d.ts.map +1 -1
- package/dist/ts/server/version.d.ts +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +18 -14
- package/src/react/components/AppProvider/AppProvider.doc.ts +35 -0
- package/src/react/components/AppProvider/AppProvider.tsx +147 -0
- package/src/react/components/AppProvider/index.ts +1 -0
- package/src/react/components/AppProxyForm/AppProxyForm.doc.ts +28 -0
- package/src/react/components/AppProxyForm/AppProxyForm.tsx +82 -0
- package/src/react/components/AppProxyForm/index.ts +1 -0
- package/src/react/components/AppProxyLink/AppProxyLink.doc.ts +28 -0
- package/src/react/components/AppProxyLink/AppProxyLink.tsx +58 -0
- package/src/react/components/AppProxyLink/index.ts +1 -0
- package/src/react/components/AppProxyProvider/AppProxyProvider.doc.ts +40 -0
- package/src/react/components/AppProxyProvider/AppProxyProvider.tsx +100 -0
- package/src/react/components/AppProxyProvider/index.ts +5 -0
- package/src/react/components/RemixPolarisLink.tsx +14 -0
- package/src/react/components/index.ts +4 -0
- package/src/react/const.ts +2 -0
- package/src/react/index.ts +1 -0
- package/src/server/__test-helpers/const.ts +14 -0
- package/src/server/__test-helpers/expect-admin-api-client.ts +51 -0
- package/src/server/__test-helpers/expect-begin-auth-redirect.ts +22 -0
- package/src/server/__test-helpers/expect-document-request-headers.ts +25 -0
- package/src/server/__test-helpers/expect-exit-iframe.ts +37 -0
- package/src/server/__test-helpers/expect-login-redirect.ts +8 -0
- package/src/server/__test-helpers/expect-storefront-api-client.ts +49 -0
- package/src/server/__test-helpers/expect-token-refresh.ts +188 -0
- package/src/server/__test-helpers/get-hmac.ts +7 -0
- package/src/server/__test-helpers/get-jwt.ts +10 -0
- package/src/server/__test-helpers/get-thrown-error.ts +19 -0
- package/src/server/__test-helpers/get-thrown-response.ts +17 -0
- package/src/server/__test-helpers/index.ts +21 -0
- package/src/server/__test-helpers/mock-graphql-request.ts +60 -0
- package/src/server/__test-helpers/request-mock.ts +169 -0
- package/src/server/__test-helpers/setup-embedded-flow.ts +30 -0
- package/src/server/__test-helpers/setup-fetch-flow.ts +29 -0
- package/src/server/__test-helpers/setup-non-embedded-flow.ts +31 -0
- package/src/server/__test-helpers/setup-valid-request.ts +78 -0
- package/src/server/__test-helpers/setup-valid-session.ts +28 -0
- package/src/server/__test-helpers/sign-request-cookie.ts +21 -0
- package/src/server/__test-helpers/test-config.ts +56 -0
- package/src/server/adapters/node/index.ts +13 -0
- package/src/server/adapters/vercel/index.ts +13 -0
- package/src/server/authenticate/admin/authenticate.admin.doc.example.ts +34 -0
- package/src/server/authenticate/admin/authenticate.admin.doc.ts +51 -0
- package/src/server/authenticate/admin/authenticate.ts +232 -0
- package/src/server/authenticate/admin/billing/authenticate.admin.billing.doc.ts +29 -0
- package/src/server/authenticate/admin/billing/cancel.ts +38 -0
- package/src/server/authenticate/admin/billing/check.ts +41 -0
- package/src/server/authenticate/admin/billing/create-usage-record.ts +36 -0
- package/src/server/authenticate/admin/billing/helpers.ts +42 -0
- package/src/server/authenticate/admin/billing/index.ts +6 -0
- package/src/server/authenticate/admin/billing/request.ts +64 -0
- package/src/server/authenticate/admin/billing/require.ts +58 -0
- package/src/server/authenticate/admin/billing/types.ts +613 -0
- package/src/server/authenticate/admin/billing/update-usage-subscription-capped-amount.ts +55 -0
- package/src/server/authenticate/admin/helpers/begin-auth.ts +17 -0
- package/src/server/authenticate/admin/helpers/create-admin-api-context.ts +20 -0
- package/src/server/authenticate/admin/helpers/ensure-app-is-embedded-if-required.ts +18 -0
- package/src/server/authenticate/admin/helpers/ensure-session-token-search-param-if-required.ts +25 -0
- package/src/server/authenticate/admin/helpers/handle-client-error.ts +45 -0
- package/src/server/authenticate/admin/helpers/index.ts +14 -0
- package/src/server/authenticate/admin/helpers/redirect-to-auth-page.ts +28 -0
- package/src/server/authenticate/admin/helpers/redirect-to-bounce-page.ts +23 -0
- package/src/server/authenticate/admin/helpers/redirect-to-install-page.ts +53 -0
- package/src/server/authenticate/admin/helpers/redirect-to-shopify-or-app-root.ts +21 -0
- package/src/server/authenticate/admin/helpers/redirect-with-app-bridge-headers.ts +13 -0
- package/src/server/authenticate/admin/helpers/redirect-with-exitiframe.ts +28 -0
- package/src/server/authenticate/admin/helpers/redirect.ts +164 -0
- package/src/server/authenticate/admin/helpers/render-app-bridge.ts +46 -0
- package/src/server/authenticate/admin/helpers/trigger-after-auth-hook.ts +29 -0
- package/src/server/authenticate/admin/helpers/validate-redirect-url.ts +67 -0
- package/src/server/authenticate/admin/helpers/validate-shop-and-host-params.ts +46 -0
- package/src/server/authenticate/admin/scope/authenticate.admin.scopes.doc.ts +28 -0
- package/src/server/authenticate/admin/scope/client/fetch-scopes-details.ts +43 -0
- package/src/server/authenticate/admin/scope/client/revoke-scopes.ts +38 -0
- package/src/server/authenticate/admin/scope/factory.ts +21 -0
- package/src/server/authenticate/admin/scope/query.ts +51 -0
- package/src/server/authenticate/admin/scope/request.ts +32 -0
- package/src/server/authenticate/admin/scope/revoke.ts +48 -0
- package/src/server/authenticate/admin/scope/types.ts +126 -0
- package/src/server/authenticate/admin/strategies/auth-code-flow.ts +332 -0
- package/src/server/authenticate/admin/strategies/merchant-custom-app.ts +65 -0
- package/src/server/authenticate/admin/strategies/token-exchange.ts +188 -0
- package/src/server/authenticate/admin/strategies/types.ts +29 -0
- package/src/server/authenticate/admin/types.ts +216 -0
- package/src/server/authenticate/const.ts +15 -0
- package/src/server/authenticate/flow/authenticate.flow.doc.example.ts +39 -0
- package/src/server/authenticate/flow/authenticate.flow.doc.ts +47 -0
- package/src/server/authenticate/flow/authenticate.ts +68 -0
- package/src/server/authenticate/flow/types.ts +85 -0
- package/src/server/authenticate/fulfillment-service/authenticate.fulfillment-service.doc.example.ts +52 -0
- package/src/server/authenticate/fulfillment-service/authenticate.fulfillment-service.doc.ts +48 -0
- package/src/server/authenticate/fulfillment-service/authenticate.ts +82 -0
- package/src/server/authenticate/fulfillment-service/types.ts +82 -0
- package/src/server/authenticate/helpers/add-response-headers.ts +43 -0
- package/src/server/authenticate/helpers/app-bridge-url.ts +10 -0
- package/src/server/authenticate/helpers/ensure-cors-headers.ts +38 -0
- package/src/server/authenticate/helpers/get-session-token-header.ts +11 -0
- package/src/server/authenticate/helpers/get-shop-from-request.ts +4 -0
- package/src/server/authenticate/helpers/idempotent-promise-handler.ts +45 -0
- package/src/server/authenticate/helpers/index.ts +10 -0
- package/src/server/authenticate/helpers/invalidate-access-token.ts +17 -0
- package/src/server/authenticate/helpers/reject-bot-request.ts +27 -0
- package/src/server/authenticate/helpers/respond-to-invalid-session-token.ts +28 -0
- package/src/server/authenticate/helpers/respond-to-options-request.ts +26 -0
- package/src/server/authenticate/helpers/validate-session-token.ts +40 -0
- package/src/server/authenticate/login/login.ts +53 -0
- package/src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.example.ts +27 -0
- package/src/server/authenticate/public/appProxy/authenticate.public.app-proxy.doc.ts +55 -0
- package/src/server/authenticate/public/appProxy/authenticate.ts +150 -0
- package/src/server/authenticate/public/appProxy/types.ts +215 -0
- package/src/server/authenticate/public/checkout/authenticate.public.checkout.doc.example.offers.ts +21 -0
- package/src/server/authenticate/public/checkout/authenticate.public.checkout.doc.example.ts +17 -0
- package/src/server/authenticate/public/checkout/authenticate.public.checkout.doc.ts +49 -0
- package/src/server/authenticate/public/checkout/authenticate.ts +13 -0
- package/src/server/authenticate/public/checkout/types.ts +65 -0
- package/src/server/authenticate/public/customer-account/authenticate.public.customerAccount.doc.example.offers.ts +36 -0
- package/src/server/authenticate/public/customer-account/authenticate.public.customerAccount.doc.example.ts +18 -0
- package/src/server/authenticate/public/customer-account/authenticate.public.customerAccount.doc.ts +49 -0
- package/src/server/authenticate/public/customer-account/authenticate.ts +13 -0
- package/src/server/authenticate/public/customer-account/types.ts +65 -0
- package/src/server/authenticate/public/extension/authenticate.ts +54 -0
- package/src/server/authenticate/public/extension/types.ts +11 -0
- package/src/server/authenticate/public/factory.ts +24 -0
- package/src/server/authenticate/public/index.ts +1 -0
- package/src/server/authenticate/public/pos/authenticate.ts +8 -0
- package/src/server/authenticate/public/pos/types.ts +65 -0
- package/src/server/authenticate/public/types.ts +96 -0
- package/src/server/authenticate/webhooks/authenticate.ts +105 -0
- package/src/server/authenticate/webhooks/authenticate.webhooks.doc.example.ts +43 -0
- package/src/server/authenticate/webhooks/authenticate.webhooks.doc.ts +39 -0
- package/src/server/authenticate/webhooks/index.ts +1 -0
- package/src/server/authenticate/webhooks/register.ts +48 -0
- package/src/server/authenticate/webhooks/types.ts +266 -0
- package/src/server/boundary/error.tsx +14 -0
- package/src/server/boundary/headers.ts +15 -0
- package/src/server/boundary/index.ts +39 -0
- package/src/server/boundary/types.ts +4 -0
- package/src/server/clients/admin/authenticate.admin.api.doc.ts +34 -0
- package/src/server/clients/admin/factory.ts +22 -0
- package/src/server/clients/admin/graphql.ts +39 -0
- package/src/server/clients/admin/index.ts +2 -0
- package/src/server/clients/admin/types.ts +120 -0
- package/src/server/clients/index.ts +2 -0
- package/src/server/clients/storefront/authenticate.storefront.api.doc.ts +34 -0
- package/src/server/clients/storefront/factory.ts +32 -0
- package/src/server/clients/storefront/index.ts +2 -0
- package/src/server/clients/storefront/types.ts +78 -0
- package/src/server/clients/types.ts +47 -0
- package/src/server/config-types.ts +309 -0
- package/src/server/errors.ts +3 -0
- package/src/server/future/flags.ts +62 -0
- package/src/server/helpers/create-or-load-offline-session.ts +19 -0
- package/src/server/helpers/ensure-offline-token-is-not-expired.ts +32 -0
- package/src/server/helpers/ensure-valid-offline-session.ts +15 -0
- package/src/server/helpers/index.ts +4 -0
- package/src/server/helpers/refresh-token.ts +35 -0
- package/src/server/index.ts +24 -0
- package/src/server/override-logger.ts +42 -0
- package/src/server/shopify-app.doc.ts +45 -0
- package/src/server/shopify-app.ts +215 -0
- package/src/server/test-helpers/index.ts +1 -0
- package/src/server/test-helpers/test-config.ts +79 -0
- package/src/server/types-contexts.ts +44 -0
- package/src/server/types.ts +507 -0
- package/src/server/unauthenticated/admin/factory.ts +23 -0
- package/src/server/unauthenticated/admin/index.ts +1 -0
- package/src/server/unauthenticated/admin/types.ts +79 -0
- package/src/server/unauthenticated/admin/unauthenticated.admin.doc.ts +40 -0
- package/src/server/unauthenticated/storefront/factory.ts +28 -0
- package/src/server/unauthenticated/storefront/index.ts +1 -0
- package/src/server/unauthenticated/storefront/types.ts +105 -0
- package/src/server/unauthenticated/storefront/unauthenticated.storefront.doc.ts +40 -0
- package/src/server/unauthenticated/types.ts +65 -0
- package/src/server/version.ts +1 -0
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import {HttpResponseError, Session} from '@shopify/shopify-api';
|
|
2
|
+
|
|
3
|
+
import type {BasicParams} from '../../../types';
|
|
4
|
+
import {redirectToAuthPage} from '../helpers';
|
|
5
|
+
import type {AppConfigArg} from '../../../config-types';
|
|
6
|
+
import {invalidateAccessToken} from '../../helpers';
|
|
7
|
+
|
|
8
|
+
import type {CheckBillingOptions} from './types';
|
|
9
|
+
|
|
10
|
+
export function checkBillingFactory<Config extends AppConfigArg>(
|
|
11
|
+
params: BasicParams,
|
|
12
|
+
request: Request,
|
|
13
|
+
session: Session,
|
|
14
|
+
) {
|
|
15
|
+
return async function checkBilling(
|
|
16
|
+
options: CheckBillingOptions<Config> = {},
|
|
17
|
+
) {
|
|
18
|
+
const {api, logger} = params;
|
|
19
|
+
|
|
20
|
+
logger.debug('Checking billing plans', {shop: session.shop, ...options});
|
|
21
|
+
|
|
22
|
+
try {
|
|
23
|
+
return await api.billing.check({
|
|
24
|
+
session,
|
|
25
|
+
plans: options.plans as string[],
|
|
26
|
+
isTest: options.isTest,
|
|
27
|
+
returnObject: true,
|
|
28
|
+
});
|
|
29
|
+
} catch (error) {
|
|
30
|
+
if (error instanceof HttpResponseError && error.response.code === 401) {
|
|
31
|
+
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
32
|
+
shop: session.shop,
|
|
33
|
+
});
|
|
34
|
+
await invalidateAccessToken(params, session);
|
|
35
|
+
throw await redirectToAuthPage(params, request, session.shop);
|
|
36
|
+
} else {
|
|
37
|
+
throw error;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import {HttpResponseError, Session} from '@shopify/shopify-api';
|
|
2
|
+
|
|
3
|
+
import type {BasicParams} from '../../../types';
|
|
4
|
+
import {redirectToAuthPage} from '../helpers';
|
|
5
|
+
import {invalidateAccessToken} from '../../helpers';
|
|
6
|
+
|
|
7
|
+
import type {CreateUsageRecordOptions} from './types';
|
|
8
|
+
|
|
9
|
+
export function createUsageRecordFactory(
|
|
10
|
+
params: BasicParams,
|
|
11
|
+
request: Request,
|
|
12
|
+
session: Session,
|
|
13
|
+
) {
|
|
14
|
+
return async function createUsageRecord(options: CreateUsageRecordOptions) {
|
|
15
|
+
const {api, logger} = params;
|
|
16
|
+
|
|
17
|
+
logger.debug('Create usage record', {shop: session.shop, ...options});
|
|
18
|
+
|
|
19
|
+
try {
|
|
20
|
+
return await api.billing.createUsageRecord({
|
|
21
|
+
...options,
|
|
22
|
+
session,
|
|
23
|
+
});
|
|
24
|
+
} catch (error) {
|
|
25
|
+
if (error instanceof HttpResponseError && error.response.code === 401) {
|
|
26
|
+
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
27
|
+
shop: session.shop,
|
|
28
|
+
});
|
|
29
|
+
await invalidateAccessToken(params, session);
|
|
30
|
+
throw await redirectToAuthPage(params, request, session.shop);
|
|
31
|
+
} else {
|
|
32
|
+
throw error;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import {redirect} from '@remix-run/server-runtime';
|
|
2
|
+
|
|
3
|
+
import {BasicParams} from '../../../types';
|
|
4
|
+
import {getAppBridgeHeaders} from '../helpers';
|
|
5
|
+
|
|
6
|
+
export function redirectOutOfApp(
|
|
7
|
+
params: BasicParams,
|
|
8
|
+
request: Request,
|
|
9
|
+
url: string,
|
|
10
|
+
shop: string,
|
|
11
|
+
): never {
|
|
12
|
+
const {config, logger} = params;
|
|
13
|
+
|
|
14
|
+
logger.debug('Redirecting out of app', {shop, url});
|
|
15
|
+
|
|
16
|
+
const requestUrl = new URL(request.url);
|
|
17
|
+
const isEmbeddedRequest = requestUrl.searchParams.get('embedded') === '1';
|
|
18
|
+
const isXhrRequest = request.headers.get('authorization');
|
|
19
|
+
|
|
20
|
+
if (isXhrRequest) {
|
|
21
|
+
// eslint-disable-next-line no-warning-comments
|
|
22
|
+
// TODO Check this with the beta flag disabled (with the bounce page)
|
|
23
|
+
// Remix is not including the X-Shopify-API-Request-Failure-Reauthorize-Url when throwing a Response
|
|
24
|
+
// https://github.com/remix-run/remix/issues/5356
|
|
25
|
+
throw new Response(undefined, {
|
|
26
|
+
status: 401,
|
|
27
|
+
statusText: 'Unauthorized',
|
|
28
|
+
headers: getAppBridgeHeaders(url),
|
|
29
|
+
});
|
|
30
|
+
} else if (isEmbeddedRequest) {
|
|
31
|
+
const params = new URLSearchParams({
|
|
32
|
+
shop,
|
|
33
|
+
host: requestUrl.searchParams.get('host')!,
|
|
34
|
+
exitIframe: url,
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
throw redirect(`${config.auth.exitIframePath}?${params.toString()}`);
|
|
38
|
+
} else {
|
|
39
|
+
// This will only ever happen for non-embedded apps, because the authenticator will stop before reaching this point
|
|
40
|
+
throw redirect(url);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export {cancelBillingFactory} from './cancel';
|
|
2
|
+
export {requireBillingFactory} from './require';
|
|
3
|
+
export {requestBillingFactory} from './request';
|
|
4
|
+
export {checkBillingFactory} from './check';
|
|
5
|
+
export {createUsageRecordFactory} from './create-usage-record';
|
|
6
|
+
export {updateUsageCappedAmountFactory} from './update-usage-subscription-capped-amount';
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import {
|
|
2
|
+
BillingRequestResponseObject,
|
|
3
|
+
HttpResponseError,
|
|
4
|
+
Session,
|
|
5
|
+
} from '@shopify/shopify-api';
|
|
6
|
+
|
|
7
|
+
import {AppConfigArg} from '../../../config-types';
|
|
8
|
+
import {BasicParams} from '../../../types';
|
|
9
|
+
import {redirectToAuthPage} from '../helpers';
|
|
10
|
+
import {invalidateAccessToken} from '../../helpers';
|
|
11
|
+
|
|
12
|
+
import {redirectOutOfApp} from './helpers';
|
|
13
|
+
import type {RequestBillingOptions} from './types';
|
|
14
|
+
|
|
15
|
+
export function requestBillingFactory<Config extends AppConfigArg>(
|
|
16
|
+
params: BasicParams,
|
|
17
|
+
request: Request,
|
|
18
|
+
session: Session,
|
|
19
|
+
) {
|
|
20
|
+
return async function requestBilling({
|
|
21
|
+
plan,
|
|
22
|
+
isTest,
|
|
23
|
+
returnUrl,
|
|
24
|
+
...overrides
|
|
25
|
+
}: RequestBillingOptions<Config>): Promise<never> {
|
|
26
|
+
const {api, logger} = params;
|
|
27
|
+
|
|
28
|
+
logger.info('Requesting billing', {
|
|
29
|
+
shop: session.shop,
|
|
30
|
+
plan,
|
|
31
|
+
isTest,
|
|
32
|
+
returnUrl,
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
let result: BillingRequestResponseObject;
|
|
36
|
+
try {
|
|
37
|
+
result = await api.billing.request({
|
|
38
|
+
plan: plan as string,
|
|
39
|
+
session,
|
|
40
|
+
isTest,
|
|
41
|
+
returnUrl,
|
|
42
|
+
returnObject: true,
|
|
43
|
+
...overrides,
|
|
44
|
+
});
|
|
45
|
+
} catch (error) {
|
|
46
|
+
if (error instanceof HttpResponseError && error.response.code === 401) {
|
|
47
|
+
logger.debug('API token was invalid, redirecting to OAuth', {
|
|
48
|
+
shop: session.shop,
|
|
49
|
+
});
|
|
50
|
+
await invalidateAccessToken(params, session);
|
|
51
|
+
throw await redirectToAuthPage(params, request, session.shop);
|
|
52
|
+
} else {
|
|
53
|
+
throw error;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
throw redirectOutOfApp(
|
|
58
|
+
params,
|
|
59
|
+
request,
|
|
60
|
+
result.confirmationUrl,
|
|
61
|
+
session.shop,
|
|
62
|
+
);
|
|
63
|
+
};
|
|
64
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import {
|
|
2
|
+
BillingCheckResponseObject,
|
|
3
|
+
HttpResponseError,
|
|
4
|
+
Session,
|
|
5
|
+
} from '@shopify/shopify-api';
|
|
6
|
+
|
|
7
|
+
import type {BasicParams} from '../../../types';
|
|
8
|
+
import type {AppConfigArg} from '../../../config-types';
|
|
9
|
+
import {redirectToAuthPage} from '../helpers';
|
|
10
|
+
import {invalidateAccessToken} from '../../helpers';
|
|
11
|
+
|
|
12
|
+
import type {RequireBillingOptions} from './types';
|
|
13
|
+
|
|
14
|
+
export function requireBillingFactory<Config extends AppConfigArg>(
|
|
15
|
+
params: BasicParams,
|
|
16
|
+
request: Request,
|
|
17
|
+
session: Session,
|
|
18
|
+
) {
|
|
19
|
+
const {api, logger} = params;
|
|
20
|
+
|
|
21
|
+
return async function requireBilling(options: RequireBillingOptions<Config>) {
|
|
22
|
+
const logContext = {
|
|
23
|
+
shop: session.shop,
|
|
24
|
+
plans: options.plans,
|
|
25
|
+
isTest: options.isTest,
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
logger.debug('Checking billing for the shop', logContext);
|
|
29
|
+
|
|
30
|
+
let data: BillingCheckResponseObject;
|
|
31
|
+
try {
|
|
32
|
+
data = await api.billing.check({
|
|
33
|
+
session,
|
|
34
|
+
plans: options.plans as string[],
|
|
35
|
+
isTest: options.isTest,
|
|
36
|
+
returnObject: true,
|
|
37
|
+
});
|
|
38
|
+
} catch (error) {
|
|
39
|
+
if (error instanceof HttpResponseError && error.response.code === 401) {
|
|
40
|
+
logger.debug('API token was invalid, redirecting to OAuth', logContext);
|
|
41
|
+
|
|
42
|
+
await invalidateAccessToken(params, session);
|
|
43
|
+
throw await redirectToAuthPage(params, request, session.shop);
|
|
44
|
+
} else {
|
|
45
|
+
throw error;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
if (!data.hasActivePayment) {
|
|
50
|
+
logger.debug('Billing check failed', logContext);
|
|
51
|
+
throw await options.onFailure(new Error('Billing check failed'));
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
logger.debug('Billing check succeeded', logContext);
|
|
55
|
+
|
|
56
|
+
return data;
|
|
57
|
+
};
|
|
58
|
+
}
|