@shopify/shopify-api 8.1.1 → 9.0.0

package/adapters/__e2etests__/test_apps/test-dummy-shopify-server.js

@@ -60,6 +60,15 @@ const tests = {
             }),
         }),
     },
+    400: {
+        expectedRequest: (0, test_config_types_1.initTestRequest)(),
+        testResponse: (0, test_config_types_1.initTestResponse)({
+            statusCode: 400,
+            statusText: errorStatusText,
+            headers: { 'x-request-id': requestId },
+            body: JSON.stringify({ errors: 'Something went wrong!' }),
+        }),
+    },
     403: {
         expectedRequest: (0, test_config_types_1.initTestRequest)(),
         testResponse: (0, test_config_types_1.initTestResponse)({

package/adapters/__e2etests__/test_apps/test-dummy-shopify-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-dummy-shopify-server.js","sourceRoot":"","sources":["test-dummy-shopify-server.ts"],"names":[],"mappings":";;AAAA,oBAAoB;AACpB,+BAAmE;AAOnE,4DAAuE;AACvE,oCAAsC;AAOtC,0CAA0C;AAC1C,MAAM,IAAI,GAAW,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,MAAM,EAAE,EAAE,CAAC,CAAC;AAC1E,MAAM,eAAe,GAAG,cAAc,CAAC;AACvC,MAAM,SAAS,GAAG,mBAAmB,CAAC;AACtC,MAAM,KAAK,GAAmC;IAC5C,GAAG,EAAE;QACH,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,GAAE;KACjC;IACD,MAAM,EAAE;QACN,eAAe,EAAE,IAAA,mCAAe,EAAC;YAC/B,OAAO,EAAE,EAAC,qBAAqB,EAAE,YAAY,EAAC;SAC/C,CAAC;QACF,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,OAAO,EAAE,EAAC,qBAAqB,EAAE,YAAY,EAAC;SAC/C,CAAC;KACH;IACD,WAAW,EAAE;QACX,eAAe,EAAE,IAAA,mCAAe,EAAC;YAC/B,OAAO,EAAE,EAAC,YAAY,EAAE,oBAAoB,EAAC;SAC9C,CAAC;QACF,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,OAAO,EAAE,EAAC,YAAY,EAAE,oBAAoB,EAAC;SAC9C,CAAC;KACH;IACD,WAAW,EAAE;QACX,eAAe,EAAE,IAAA,mCAAe,EAAC;YAC/B,OAAO,EAAE,EAAC,YAAY,EAAE,UAAU,EAAC;SACpC,CAAC;QACF,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,OAAO,EAAE,EAAC,YAAY,EAAE,UAAU,EAAC;SACpC,CAAC;KACH;IACD,aAAa,EAAE;QACb,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,OAAO,EAAE;gBACP,iCAAiC,EAC/B,uCAAuC;aAC1C;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,OAAO,EAAE,yBAAyB,EAAC,CAAC;SAC3D,CAAC;KACH;IACD,cAAc,EAAE;QACd,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,OAAO,EAAE;gBACP,iCAAiC,EAC/B,uCAAuC;aAC1C;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,OAAO,EAAE,8BAA8B;gBACvC,IAAI,EAAE;oBACJ,KAAK,EAAE,YAAY;iBACpB;aACF,CAAC;SACH,CAAC;KACH;IACD,GAAG,EAAE;QACH,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,eAAe;YAC3B,OAAO,EAAE,EAAC,cAAc,EAAE,SAAS,EAAC;YACpC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAE,uBAAuB,EAAC,CAAC;SACxD,CAAC;KACH;IACD,GAAG,EAAE;QACH,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,eAAe;YAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;SACzB,CAAC;KACH;IACD,GAAG,EAAE;QACH,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,oBAAoB;SACjC,CAAC;KACH;IACD,GAAG,EAAE;QACH,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,eAAe;YAC3B,OAAO,EAAE,EAAC,cAAc,EAAE,SAAS,EAAC;YACpC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAE,uBAAuB,EAAC,CAAC;SACxD,CAAC;KACH;IACD,IAAI,EAAE;QACJ,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,eAAe;YAC3B,OAAO,EAAE,EAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAC;YAC1C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAE,uBAAuB,EAAC,CAAC;SACxD,CAAC;KACH;IACD,GAAG,EAAE;QACH,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,eAAe;YAC3B,OAAO,EAAE,EAAC,cAAc,EAAE,SAAS,EAAC;YACpC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;SACzB,CAAC;KACH;IACD,KAAK,EAAE;QACL,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,eAAe;YAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,MAAM,EAAE,sBAAsB,EAAC,CAAC;SACvD,CAAC;KACH;IACD,aAAa,EAAE;QACb,eAAe,EAAE,IAAA,mCAAe,GAAE;QAClC,YAAY,EAAE,IAAA,oCAAgB,EAAC;YAC7B,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,eAAe;YAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,MAAM,EAAE,EAAC,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,qBAAqB,EAAC;aACrE,CAAC;SACH,CAAC;KACH;CACF,CAAC;AAEF,IAAI,UAAU,GAAG,CAAC,CAAC;AAEnB,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,CAAC,GAAoB,EAAE,GAAmB,EAAE,EAAE;;IACxE,MAAM,MAAM,GAAG,MAAA,GAAG,CAAC,GAAG,0CAAE,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC;IACpC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACxC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;IAC7C,IAAI,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;IAErC,IAAI,IAAA,oBAAY,EAAC,eAA0B,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE;QACrE,IAAI,IAAI,KAAK,SAAS,IAAI,UAAU,GAAG,CAAC,EAAE;YACxC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC;YACzC,UAAU,IAAI,CAAC,CAAC;SACjB;QACD,IAAI,IAAI,KAAK,eAAe,EAAE;YAC5B,IAAI,UAAU,KAAK,CAAC,EAAE;gBACpB,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC;gBACzC,UAAU,GAAG,CAAC,CAAC;aAChB;iBAAM;gBACL,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC;gBACzC,iDAAiD;gBACjD,UAAU,GAAG,CAAC,CAAC;aAChB;SACF;QACD,IAAI,IAAI,KAAK,kBAAkB,EAAE;YAC/B,IAAI,UAAU,KAAK,CAAC,EAAE;gBACpB,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;gBACvC,UAAU,GAAG,CAAC,CAAC;aAChB;iBAAM;gBACL,uFAAuF;gBACvF,UAAU,GAAG,CAAC,CAAC;aAChB;SACF;QACD,IAAI,IAAI,KAAK,YAAY,EAAE;YACzB,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC;SAC1C;KACF;SAAM;QACL,yCAAyC;QACzC,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC;QACzC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YACjC,MAAM,EAAE;gBACN,OAAO,EACL,2EAA2E;gBAC7E,eAAe;gBACf,eAAe,EAAE,eAAe,CAAC,OAAO;aACzC;SACF,CAAC,CAAC;KACJ;IAED,yBAAyB;IACzB,GAAG,CAAC,SAAS,CACX,YAAY,CAAC,UAAU,EACvB,YAAY,CAAC,UAAU,EACvB,YAAY,CAAC,OAAO,CACrB,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAE3B,iBAAiB;IACjB,IAAI,IAAI,KAAK,SAAS,IAAI,UAAU,KAAK,CAAC,EAAE;QAC1C,UAAU,GAAG,CAAC,CAAC;KAChB;IAED,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,MAAM,CAAC,CAAC,CAAC,CAAC;KACX;AACH,CAAC,CAAC,CAAC;AAEH,SAAS,MAAM,CAAC,OAAY;IAC1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC7B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAE9B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"test-dummy-shopify-server.js","sourceRoot":"","sources":["test-dummy-shopify-server.ts"],"names":[],"mappings":"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"}

package/adapters/__e2etests__/test_apps/test-node-app.js

@@ -3,132 +3,155 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const http_1 = require("http");
 require("../../node");
-const http_client_1 = require("../../../lib/clients/http_client/http_client");
+const lib_1 = require("../../../lib");
+const admin_1 = require("../../../lib/clients/admin");
 const utils_1 = require("../utils");
+const test_config_types_1 = require("../test_config_types");
+const test_handle_graphql_1 = require("../test_handle_graphql");
 /* Codes for different Colours */
 const RED = '\x1b[31m';
 const GREEN = '\x1b[32m';
 const RESET = '\x1b[39m';
-const HttpClient = (0, http_client_1.httpClientClass)(utils_1.config, 'http');
+const RestClient = (0, admin_1.restClientClass)({
+    config: Object.assign(Object.assign({}, utils_1.config), { hostScheme: 'http' }),
+    formatPaths: false,
+});
 /* eslint-disable no-process-env */
 const apiServerPort = parseInt(process.env.HTTP_SERVER_PORT || '3000', 10);
 const appPort = parseInt(process.env.PORT || '8787', 10);
 /* eslint-enable no-process-env */
 const apiServer = `localhost:${apiServerPort}`;
-const client = new HttpClient({ domain: apiServer });
-const defaultRetryTimer = HttpClient.RETRY_WAIT_TIME;
+const defaultRetryTimer = RestClient.RETRY_WAIT_TIME;
 let testCount = 0;
 const server = (0, http_1.createServer)((request, appResponse) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     if (request.method === 'POST') {
         const testConfig = yield getJSONDataFromRequestStream(request);
         const testRequest = testConfig.testRequest;
         const expectedResponse = testConfig.expectedResponse;
-        const tries = testRequest.tries || 1;
-        const params = {
-            path: testRequest.url,
-            type: testRequest.bodyType,
-            data: JSON.stringify(testRequest.body),
-        };
         let testPassed = false;
-        let timedOut = false;
         let testFailedDebug = '';
         let response;
-        let retryTimeout;
         setRestClientRetryTime(defaultRetryTimer);
         testCount++;
         console.log(`[node] testRequest #${testCount} = ${JSON.stringify(testRequest, undefined, 2)}\n`);
-        if (typeof testRequest.retryTimeoutTimer !== 'undefined') {
-            setRestClientRetryTime(testRequest.retryTimeoutTimer);
-            console.log(`[node] RETRY_TIME_WAIT (BEFORE) = ${HttpClient.RETRY_WAIT_TIME} ms\n\n`);
-            if (testRequest.retryTimeoutTimer !== 0) {
-                console.log(`[node] setting setTimeout @ ${HttpClient.RETRY_WAIT_TIME} ms\n`);
-                retryTimeout = setTimeout(() => {
+        if (testRequest.type === test_config_types_1.TestType.Graphql) {
+            const result = yield (0, test_handle_graphql_1.handleGraphqlTest)({
+                apiServer,
+                testRequest,
+                expectedResponse,
+            });
+            testPassed = result.testPassed;
+            testFailedDebug = result.testFailedDebug;
+            console.log(`[node] testPassed=${testPassed}, testFailedDebug=${testFailedDebug}\n`);
+        }
+        else {
+            const client = new RestClient({
+                session: new lib_1.Session(Object.assign(Object.assign({}, utils_1.session), { shop: apiServer })),
+            });
+            let timedOut = false;
+            let retryTimeout;
+            const tries = testRequest.tries || 1;
+            const params = {
+                path: testRequest.url,
+                type: testRequest.bodyType,
+                data: JSON.stringify(testRequest.body),
+            };
+            if (typeof testRequest.retryTimeoutTimer !== 'undefined') {
+                setRestClientRetryTime(testRequest.retryTimeoutTimer);
+                console.log(`[node] RETRY_TIME_WAIT (BEFORE) = ${RestClient.RETRY_WAIT_TIME} ms\n\n`);
+                if (testRequest.retryTimeoutTimer !== 0) {
+                    console.log(`[node] setting setTimeout @ ${RestClient.RETRY_WAIT_TIME} ms\n`);
+                    retryTimeout = setTimeout(() => {
+                        try {
+                            throw new Error('Request was not retried within the interval defined by Retry-After, test failed');
+                        }
+                        catch (error) {
+                            console.log(`[node] ${RED}setTimeout fired!${RESET} @ ${RestClient.RETRY_WAIT_TIME}\n`);
+                            testFailedDebug = JSON.stringify({
+                                errorMessageReceived: error.message,
+                            });
+                            timedOut = true;
+                        }
+                    }, testRequest.retryTimeoutTimer);
+                }
+            }
+            switch (testRequest.method.toLowerCase()) {
+                case 'get':
                     try {
-                        throw new Error('Request was not retried within the interval defined by Retry-After, test failed');
+                        response = yield client.get({
+                            path: testRequest.url,
+                            tries,
+                            extraHeaders: testRequest.headers,
+                        });
+                        if (timedOut) {
+                            console.log(`[node] timedOut=${timedOut}, testPassed=${testPassed}, testFailedDebug=${testFailedDebug}\n`);
+                        }
+                        else {
+                            testPassed =
+                                (0, utils_1.matchHeaders)(response.headers, expectedResponse.headers) && JSON.stringify(response.body) === expectedResponse.body;
+                            testFailedDebug = JSON.stringify({
+                                bodyExpected: expectedResponse.body,
+                                bodyReceived: response.body,
+                                headersExpected: expectedResponse.headers,
+                                headersReceived: response.headers,
+                            });
+                        }
                     }
                     catch (error) {
-                        console.log(`[node] ${RED}setTimeout fired!${RESET} @ ${HttpClient.RETRY_WAIT_TIME}\n`);
+                        testPassed = error.constructor.name.startsWith(expectedResponse.errorType);
+                        if (expectedResponse.errorType === 'HttpResponseError') {
+                            testPassed =
+                                testPassed &&
+                                    'response' in error &&
+                                    'code' in error.response &&
+                                    error.response.code === expectedResponse.statusCode &&
+                                    'statusText' in error.response &&
+                                    error.response.statusText === expectedResponse.statusText;
+                        }
+                        if ('expectRequestId' in expectedResponse) {
+                            testPassed =
+                                testPassed &&
+                                    error.message.includes(expectedResponse.expectRequestId);
+                        }
+                        if ('errorMessage' in expectedResponse) {
+                            testPassed =
+                                testPassed && error.message === expectedResponse.errorMessage;
+                        }
                         testFailedDebug = JSON.stringify({
+                            statusCodeExpected: expectedResponse.statusCode,
+                            statusCodeReceived: error.code,
+                            statusTextExpected: expectedResponse.statusText,
+                            statusTextReceived: error.statusText,
+                            errorTypeExpected: expectedResponse.errorType,
+                            errorTypeReceived: error.constructor.name,
+                            errorMessageExpected: expectedResponse.errorMessage,
                             errorMessageReceived: error.message,
                         });
-                        timedOut = true;
                     }
-                }, testRequest.retryTimeoutTimer);
+                    break;
+                case 'post':
+                    response = yield client.post(params);
+                    testPassed =
+                        JSON.stringify(response.body) === expectedResponse.body;
+                    break;
+                case 'put':
+                    response = yield client.put(params);
+                    testPassed =
+                        JSON.stringify(response.body) === expectedResponse.body;
+                    break;
+                case 'delete':
+                    response = yield client.delete({ path: testRequest.url });
+                    testPassed =
+                        JSON.stringify(response.body) === expectedResponse.body;
+                    break;
+                default:
+                    testPassed = false;
+            }
+            if (typeof testRequest.retryTimeoutTimer !== 'undefined' &&
+                testRequest.retryTimeoutTimer !== 0 &&
+                typeof retryTimeout !== 'undefined') {
+                clearTimeout(retryTimeout);
             }
-        }
-        switch (testRequest.method.toLowerCase()) {
-            case 'get':
-                try {
-                    response = yield client.get({
-                        path: testRequest.url,
-                        tries,
-                        extraHeaders: testRequest.headers,
-                    });
-                    if (timedOut) {
-                        console.log(`[node] timedOut=${timedOut}, testPassed=${testPassed}, testFailedDebug=${testFailedDebug}\n`);
-                    }
-                    else {
-                        testPassed =
-                            (0, utils_1.matchHeaders)(response.headers, expectedResponse.headers) && JSON.stringify(response.body) === expectedResponse.body;
-                        testFailedDebug = JSON.stringify({
-                            bodyExpected: expectedResponse.body,
-                            bodyReceived: response.body,
-                            headersExpected: expectedResponse.headers,
-                            headersReceived: response.headers,
-                        });
-                    }
-                }
-                catch (error) {
-                    testPassed = error.constructor.name.startsWith(expectedResponse.errorType);
-                    if (expectedResponse.errorType === 'HttpResponseError') {
-                        testPassed =
-                            testPassed &&
-                                'response' in error &&
-                                'code' in error.response &&
-                                error.response.code === expectedResponse.statusCode &&
-                                'statusText' in error.response &&
-                                error.response.statusText === expectedResponse.statusText;
-                    }
-                    if ('expectRequestId' in expectedResponse) {
-                        testPassed =
-                            testPassed &&
-                                error.message.includes(expectedResponse.expectRequestId);
-                    }
-                    if ('errorMessage' in expectedResponse) {
-                        testPassed =
-                            testPassed && error.message === expectedResponse.errorMessage;
-                    }
-                    testFailedDebug = JSON.stringify({
-                        statusCodeExpected: expectedResponse.statusCode,
-                        statusCodeReceived: error.code,
-                        statusTextExpected: expectedResponse.statusText,
-                        statusTextReceived: error.statusText,
-                        errorTypeExpected: expectedResponse.errorType,
-                        errorTypeReceived: error.constructor.name,
-                        errorMessageExpected: expectedResponse.errorMessage,
-                        errorMessageReceived: error.message,
-                    });
-                }
-                break;
-            case 'post':
-                response = yield client.post(params);
-                testPassed = JSON.stringify(response.body) === expectedResponse.body;
-                break;
-            case 'put':
-                response = yield client.put(params);
-                testPassed = JSON.stringify(response.body) === expectedResponse.body;
-                break;
-            case 'delete':
-                response = yield client.delete({ path: testRequest.url });
-                testPassed = JSON.stringify(response.body) === expectedResponse.body;
-                break;
-            default:
-                testPassed = false;
-        }
-        if (typeof testRequest.retryTimeoutTimer !== 'undefined' &&
-            testRequest.retryTimeoutTimer !== 0 &&
-            typeof retryTimeout !== 'undefined') {
-            clearTimeout(retryTimeout);
         }
         console.log(`[node] test #${testCount} passed=${testPassed ? GREEN : RED}${testPassed}${RESET}, debug=${JSON.stringify(testFailedDebug, undefined, 2)}\n`);
         if (testPassed) {
@@ -161,8 +184,7 @@ function handle(_signal) {
     process.exit(0);
 }
 function setRestClientRetryTime(time) {
-    // We de-type HttpClient here so we can alter its readonly time property
-    HttpClient.RETRY_WAIT_TIME = time;
+    RestClient.RETRY_WAIT_TIME = time;
 }
 process.on('SIGINT', handle);
 process.on('SIGTERM', handle);

package/adapters/__e2etests__/test_apps/test-node-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-node-app.js","sourceRoot":"","sources":["test-node-app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-node-app.js","sourceRoot":"","sources":["test-node-app.ts"],"names":[],"mappings":"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"}

package/adapters/__e2etests__/test_apps/test-web-api-app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-web-api-app.d.ts","sourceRoot":"","sources":["test-web-api-app.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;;eAsCJ,GAAG,QAAQ,GAAG,QAAQ,GAAG;;AAD5C,wBA2KE"}
+{"version":3,"file":"test-web-api-app.d.ts","sourceRoot":"","sources":["test-web-api-app.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;;eAgDJ,GAAG,QAAQ,GAAG,QAAQ,GAAG;;AAD5C,wBA+LE"}

package/adapters/__e2etests__/test_apps/test-web-api-app.js

@@ -2,14 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 require("../../web-api");
-const http_client_1 = require("../../../lib/clients/http_client/http_client");
+const lib_1 = require("../../../lib");
+const admin_1 = require("../../../lib/clients/admin");
 const utils_1 = require("../utils");
+const test_config_types_1 = require("../test_config_types");
+const test_handle_graphql_1 = require("../test_handle_graphql");
 /* Codes for different Colours */
 const RED = '\x1b[31m';
 const GREEN = '\x1b[32m';
 const RESET = '\x1b[39m';
-const HttpClient = (0, http_client_1.httpClientClass)(utils_1.config, 'http');
-const defaultRetryTimer = HttpClient.RETRY_WAIT_TIME;
+const RestClient = (0, admin_1.restClientClass)({
+    config: Object.assign(Object.assign({}, utils_1.config), { hostScheme: 'http' }),
+    formatPaths: false,
+});
+const defaultRetryTimer = RestClient.RETRY_WAIT_TIME;
 let testCount = 0;
 function params(testRequest) {
     return {
@@ -19,122 +25,137 @@ function params(testRequest) {
     };
 }
 function setRestClientRetryTime(time) {
-    // We de-type HttpClient here so we can alter its readonly time property
-    HttpClient.RETRY_WAIT_TIME = time;
+    RestClient.RETRY_WAIT_TIME = time;
 }
 /* eslint-disable-next-line import/no-anonymous-default-export */
 exports.default = {
     fetch(req, _env, _ctx) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const apiServerPort = parseInt(globalThis.HTTP_SERVER_PORT || '3000', 10);
-            const client = new HttpClient({
-                domain: `localhost:${apiServerPort}`,
+            const apiServer = `localhost:${apiServerPort}`;
+            const client = new RestClient({
+                session: new lib_1.Session(Object.assign(Object.assign({}, utils_1.session), { shop: apiServer })),
             });
             if (req.method === 'POST') {
                 const testConfig = yield req.json();
                 const testRequest = testConfig.testRequest;
                 const expectedResponse = testConfig.expectedResponse;
-                const tries = testRequest.tries || 1;
                 let testPassed = false;
-                let timedOut = false;
-                let retryTimeout;
                 let testFailedDebug = '';
                 let response;
                 setRestClientRetryTime(defaultRetryTimer);
                 testCount++;
                 console.log(`[webApi] testRequest #${testCount} = ${JSON.stringify(testRequest, undefined, 2)}\n`);
-                if (typeof testRequest.retryTimeoutTimer !== 'undefined') {
-                    setRestClientRetryTime(testRequest.retryTimeoutTimer);
-                    console.log(`[webApi] RETRY_TIME_WAIT (BEFORE) = ${HttpClient.RETRY_WAIT_TIME}\n`);
-                    if (testRequest.retryTimeoutTimer !== 0) {
-                        console.log(`[webApi] setting setTimeout @ ${HttpClient.RETRY_WAIT_TIME} ms\n`);
-                        retryTimeout = setTimeout(() => {
+                if (testRequest.type === test_config_types_1.TestType.Graphql) {
+                    const result = yield (0, test_handle_graphql_1.handleGraphqlTest)({
+                        apiServer,
+                        testRequest,
+                        expectedResponse,
+                    });
+                    testPassed = result.testPassed;
+                    testFailedDebug = result.testFailedDebug;
+                    console.log(`[webApi] testPassed=${testPassed}, testFailedDebug=${testFailedDebug}\n`);
+                }
+                else {
+                    const tries = testRequest.tries || 1;
+                    let timedOut = false;
+                    let retryTimeout;
+                    if (typeof testRequest.retryTimeoutTimer !== 'undefined') {
+                        setRestClientRetryTime(testRequest.retryTimeoutTimer);
+                        console.log(`[webApi] RETRY_TIME_WAIT (BEFORE) = ${RestClient.RETRY_WAIT_TIME}\n`);
+                        if (testRequest.retryTimeoutTimer !== 0) {
+                            console.log(`[webApi] setting setTimeout @ ${RestClient.RETRY_WAIT_TIME} ms\n`);
+                            retryTimeout = setTimeout(() => {
+                                try {
+                                    throw new Error('Request was not retried within the interval defined by Retry-After, test failed');
+                                }
+                                catch (error) {
+                                    console.log(`[webApi] ${RED}setTimeout fired!${RESET} @ ${RestClient.RETRY_WAIT_TIME}\n`);
+                                    testFailedDebug = JSON.stringify({
+                                        errorMessageReceived: error.message,
+                                    });
+                                    timedOut = true;
+                                }
+                            }, testRequest.retryTimeoutTimer);
+                        }
+                    }
+                    switch (testRequest.method.toLowerCase()) {
+                        case 'get':
                             try {
-                                throw new Error('Request was not retried within the interval defined by Retry-After, test failed');
+                                response = yield client.get({
+                                    path: testRequest.url,
+                                    tries,
+                                    extraHeaders: testRequest.headers,
+                                });
+                                if (timedOut) {
+                                    console.log(`[webApi] timedOut=${timedOut}, testPassed=${testPassed}, testFailedDebug=${testFailedDebug}\n`);
+                                }
+                                else {
+                                    testPassed =
+                                        (0, utils_1.matchHeaders)(response.headers, expectedResponse.headers) && JSON.stringify(response.body) === expectedResponse.body;
+                                    testFailedDebug = JSON.stringify({
+                                        bodyExpected: expectedResponse.body,
+                                        bodyReceived: response.body,
+                                        headersExpected: expectedResponse.headers,
+                                        headersReceived: response.headers,
+                                    });
+                                }
                             }
                             catch (error) {
-                                console.log(`[webApi] ${RED}setTimeout fired!${RESET} @ ${HttpClient.RETRY_WAIT_TIME}\n`);
+                                testPassed = error.constructor.name.startsWith(expectedResponse.errorType);
+                                if (expectedResponse.errorType === 'HttpResponseError') {
+                                    testPassed =
+                                        testPassed &&
+                                            'response' in error &&
+                                            'code' in error.response &&
+                                            error.response.code === expectedResponse.statusCode &&
+                                            'statusText' in error.response &&
+                                            error.response.statusText === expectedResponse.statusText;
+                                }
+                                if ('expectRequestId' in expectedResponse) {
+                                    testPassed =
+                                        testPassed &&
+                                            error.message.includes(expectedResponse.expectRequestId);
+                                }
+                                if ('errorMessage' in expectedResponse) {
+                                    testPassed =
+                                        testPassed && error.message === expectedResponse.errorMessage;
+                                }
                                 testFailedDebug = JSON.stringify({
+                                    statusCodeExpected: expectedResponse.statusCode,
+                                    statusCodeReceived: error.code,
+                                    statusTextExpected: expectedResponse.statusText,
+                                    statusTextReceived: error.statusText,
+                                    errorTypeExpected: expectedResponse.errorType,
+                                    errorTypeReceived: error.constructor.name,
+                                    errorMessageExpected: expectedResponse.errorMessage,
                                     errorMessageReceived: error.message,
                                 });
-                                timedOut = true;
                             }
-                        }, testRequest.retryTimeoutTimer);
+                            break;
+                        case 'post':
+                            response = yield client.post(params(testRequest));
+                            testPassed =
+                                JSON.stringify(response.body) === expectedResponse.body;
+                            break;
+                        case 'put':
+                            response = yield client.put(params(testRequest));
+                            testPassed =
+                                JSON.stringify(response.body) === expectedResponse.body;
+                            break;
+                        case 'delete':
+                            response = yield client.delete({ path: testRequest.url });
+                            testPassed =
+                                JSON.stringify(response.body) === expectedResponse.body;
+                            break;
+                        default:
+                            testPassed = false;
+                    }
+                    if (typeof testRequest.retryTimeoutTimer !== 'undefined' &&
+                        testRequest.retryTimeoutTimer !== 0 &&
+                        typeof retryTimeout !== 'undefined') {
+                        clearTimeout(retryTimeout);
                     }
-                }
-                switch (testRequest.method.toLowerCase()) {
-                    case 'get':
-                        try {
-                            response = yield client.get({
-                                path: testRequest.url,
-                                tries,
-                                extraHeaders: testRequest.headers,
-                            });
-                            if (timedOut) {
-                                console.log(`[webApi] timedOut=${timedOut}, testPassed=${testPassed}, testFailedDebug=${testFailedDebug}\n`);
-                            }
-                            else {
-                                testPassed =
-                                    (0, utils_1.matchHeaders)(response.headers, expectedResponse.headers) && JSON.stringify(response.body) === expectedResponse.body;
-                                testFailedDebug = JSON.stringify({
-                                    bodyExpected: expectedResponse.body,
-                                    bodyReceived: response.body,
-                                    headersExpected: expectedResponse.headers,
-                                    headersReceived: response.headers,
-                                });
-                            }
-                        }
-                        catch (error) {
-                            testPassed = error.constructor.name.startsWith(expectedResponse.errorType);
-                            if (expectedResponse.errorType === 'HttpResponseError') {
-                                testPassed =
-                                    testPassed &&
-                                        'response' in error &&
-                                        'code' in error.response &&
-                                        error.response.code === expectedResponse.statusCode &&
-                                        'statusText' in error.response &&
-                                        error.response.statusText === expectedResponse.statusText;
-                            }
-                            if ('expectRequestId' in expectedResponse) {
-                                testPassed =
-                                    testPassed &&
-                                        error.message.includes(expectedResponse.expectRequestId);
-                            }
-                            if ('errorMessage' in expectedResponse) {
-                                testPassed =
-                                    testPassed && error.message === expectedResponse.errorMessage;
-                            }
-                            testFailedDebug = JSON.stringify({
-                                statusCodeExpected: expectedResponse.statusCode,
-                                statusCodeReceived: error.code,
-                                statusTextExpected: expectedResponse.statusText,
-                                statusTextReceived: error.statusText,
-                                errorTypeExpected: expectedResponse.errorType,
-                                errorTypeReceived: error.constructor.name,
-                                errorMessageExpected: expectedResponse.errorMessage,
-                                errorMessageReceived: error.message,
-                            });
-                        }
-                        break;
-                    case 'post':
-                        response = yield client.post(params(testRequest));
-                        testPassed = JSON.stringify(response.body) === expectedResponse.body;
-                        break;
-                    case 'put':
-                        response = yield client.put(params(testRequest));
-                        testPassed = JSON.stringify(response.body) === expectedResponse.body;
-                        break;
-                    case 'delete':
-                        response = yield client.delete({ path: testRequest.url });
-                        testPassed = JSON.stringify(response.body) === expectedResponse.body;
-                        break;
-                    default:
-                        testPassed = false;
-                }
-                if (typeof testRequest.retryTimeoutTimer !== 'undefined' &&
-                    testRequest.retryTimeoutTimer !== 0 &&
-                    typeof retryTimeout !== 'undefined') {
-                    clearTimeout(retryTimeout);
                 }
                 console.log(`[webApi] test #${testCount} passed=${testPassed ? GREEN : RED}${testPassed}${RESET}, debug=${JSON.stringify(testFailedDebug, undefined, 2)}\n`);
                 if (testPassed) {

package/adapters/__e2etests__/test_apps/test-web-api-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-web-api-app.js","sourceRoot":"","sources":["test-web-api-app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test-web-api-app.js","sourceRoot":"","sources":["test-web-api-app.ts"],"names":[],"mappings":"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"}