diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b0ccdb..a1c15a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- Replace deprecated metafields API request used for oauth token check with longer lived call to the shop endpoint [144](https://github.com/Shopify/koa-shopify-auth/pull/144) + ## [4.1.4] - 2021-07-19 ### Fixed - Retry OAuth if cookie / session has expired on callback [112](https://github.com/Shopify/koa-shopify-auth/pull/112) diff --git a/src/verify-request/tests/verify-request.test.ts b/src/verify-request/tests/verify-request.test.ts index a9b8c55..866949d 100644 --- a/src/verify-request/tests/verify-request.test.ts +++ b/src/verify-request/tests/verify-request.test.ts @@ -1,7 +1,6 @@ import '../../test/test_helper'; import {createMockContext} from '@shopify/jest-koa-mocks'; -import {StatusCode} from '@shopify/network'; import Shopify, { RequestReturn } from '@shopify/shopify-api'; import jwt from 'jsonwebtoken'; @@ -9,7 +8,6 @@ import verifyRequest from '../verify-request'; import {clearSession} from '../utilities'; import {TEST_COOKIE_NAME, TOP_LEVEL_OAUTH_COOKIE_NAME} from '../../index'; import {REAUTH_HEADER, REAUTH_URL_HEADER} from '../verify-token'; -import { clear } from 'console'; const TEST_SHOP = 'testshop.myshopify.io'; const TEST_USER = '1'; @@ -41,10 +39,9 @@ describe('verifyRequest', () => { session.scope = 'test_scope'; await Shopify.Utils.storeSession(session); - // mocking metafields call from client.get() - Shopify.Clients.Rest.prototype.get = jest.fn(({path, query}) => { - expect(path).toEqual('metafields'); - expect(query).toEqual({'limit': 1}) + // mocking shop call from client.get() + Shopify.Clients.Rest.prototype.get = jest.fn(({path}) => { + expect(path).toEqual('shop'); return Promise.resolve({ "body": "" } as RequestReturn); }); }); diff --git a/src/verify-request/verify-token.ts b/src/verify-request/verify-token.ts index 9516ecd..15de246 100644 --- a/src/verify-request/verify-token.ts +++ b/src/verify-request/verify-token.ts @@ -29,7 +29,7 @@ export function verifyToken(routes: Routes, accessMode: AccessMode = DEFAULT_ACC try { // make a request to make sure oauth has succeeded, retry otherwise const client = new Shopify.Clients.Rest(session.shop, session.accessToken) - await client.get({ path: "metafields", query: {'limit': 1} }) + await client.get({path: 'shop'}); ctx.cookies.set(TOP_LEVEL_OAUTH_COOKIE_NAME); await next();