@squiz/dxp-cli-next 5.5.1 → 5.6.0-develop.1

package/lib/ApiService.js

@@ -36,16 +36,20 @@ exports.ApiService = ApiService;
  * will seamlessly have the authorization required.
  */
 function requestInterceptor(request) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
+        const additionalHeaders = {};
         const maybeSessionCookie = yield (0, ApplicationStore_1.getApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
-        if (!maybeSessionCookie) {
-            return request;
+        if (maybeSessionCookie) {
+            additionalHeaders.cookie =
+                (_a = tough_cookie_1.Cookie.fromJSON(maybeSessionCookie)) === null || _a === void 0 ? void 0 : _a.cookieString();
+        }
+        if (process.env.DXP_JWT) {
+            additionalHeaders.authorization = `Bearer ${process.env.DXP_JWT}`;
         }
-        const sessionCookie = tough_cookie_1.Cookie.fromJSON(maybeSessionCookie);
-        if (!sessionCookie) {
-            return request;
+        if (Object.keys(additionalHeaders).length > 0) {
+            request.headers = Object.assign(Object.assign({}, (request.headers || {})), additionalHeaders);
         }
-        request.headers = Object.assign(Object.assign({}, (request.headers || {})), { cookie: sessionCookie === null || sessionCookie === void 0 ? void 0 : sessionCookie.cookieString() });
         return request;
     });
 }

package/lib/ApiService.spec.js

@@ -19,6 +19,7 @@ const VALID_COOKIE = new tough_cookie_1.Cookie({
 describe('ApiService', () => {
     describe('requestInterceptor', () => {
         beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+            delete process.env.DXP_JWT;
             yield (0, ApplicationStore_1.deleteApplicationFile)(ApplicationStore_1.STORE_FILES.sessionCookie);
         }));
         it('loads stored session cookie into request config', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -32,6 +33,20 @@ describe('ApiService', () => {
             const requestConfig = yield (0, ApiService_1.requestInterceptor)({});
             expect(requestConfig).toEqual({});
         }));
+        it('attaches DXP JWT as authorization header if environment variable defined', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.DXP_JWT = 'xxx.yyy.zzz';
+            const requestConfig = yield (0, ApiService_1.requestInterceptor)({
+                headers: {
+                    'x-custom-header': 'header value',
+                },
+            });
+            expect(requestConfig).toEqual({
+                headers: {
+                    authorization: 'Bearer xxx.yyy.zzz',
+                    'x-custom-header': 'header value',
+                },
+            });
+        }));
     });
     describe('responseInterceptor', () => {
         beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.5.1",
+  "version": "5.6.0-develop.1",
   "repository": {
     "url": "https://gitlab.squiz.net/developer-experience/dxp-cli-next"
   },
@@ -39,7 +39,7 @@
     "codecov"
   ],
   "dependencies": {
-    "@squiz/component-cli-lib": "1.22.0",
+    "@squiz/component-cli-lib": "1.32.1-alpha.17",
     "axios": "1.1.3",
     "cli-color": "2.0.3",
     "commander": "9.4.0",