Merge branch 'develop-clever' into feat-maintenance-mode

.github/workflows/develop.yml

@@ -0,0 +1,49 @@
+name: Build
+
+on:
+  push:
+    branches: [develop-clever]
+  pull_request:
+    branches: [develop-clever]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14.16.0'
+          cache: 'yarn'
+      - run: yarn install
+      - run: yarn build
+  unit-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14.16.0'
+          cache: 'yarn'
+      - run: yarn install
+      - run: yarn test-ci
+  deployment:
+    runs-on: ubuntu-latest
+    needs: [build, unit-tests]
+    if: "github.event_name == 'push' && !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.pull_request.title, '[skip ci]') && !contains(github.event.pull_request.title, '[ci skip]')"
+    timeout-minutes: 40
+    env:
+      NODE_VERSION: 16.17.1
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: 47ng/[email protected]
+        with:
+          appID: ${{ secrets.CLEVER_APP_DEVELOP }}
+          force: true
+        env:
+          CLEVER_TOKEN: ${{ secrets.CLEVER_TOKEN }}
+          CLEVER_SECRET: ${{ secrets.CLEVER_SECRET }}

packages/server/esp/dsc/dscProvider.js

@@ -19,7 +19,11 @@ class DscProvider {
 
   async connectApiCall() {
     return axios.get(`${config.dscUrl}`, {
-      headers: { apiKey: this.apiKey, 'Content-Type': 'application/json' },
+      headers: {
+        apiKey: this.apiKey,
+        'Content-Type': 'application/json',
+        'User-Agent': config.dscUserAgent,
+      },
     });
   }
 
@@ -54,6 +58,7 @@ class DscProvider {
       headers: {
         apiKey: this.apiKey,
         'Content-Type': 'application/json',
+        'User-Agent': config.dscUserAgent,
       },
     });
   }
@@ -62,7 +67,11 @@ class DscProvider {
     const url = `${config.dscUrl}/withTypeCampagne`;
     try {
       return await axios.post(url, restData, {
-        headers: { apiKey: this.apiKey, 'Content-Type': 'application/json' },
+        headers: {
+          apiKey: this.apiKey,
+          'Content-Type': 'application/json',
+          'User-Agent': config.dscUserAgent,
+        },
         params: { typeCampagne },
       });
     } catch (error) {
@@ -74,7 +83,11 @@ class DscProvider {
     const url = `${config.dscUrl}/withTypeCampagne/${campaignMailId}`;
     try {
       return await axios.put(url, restData, {
-        headers: { apiKey: this.apiKey, 'Content-Type': 'application/json' },
+        headers: {
+          apiKey: this.apiKey,
+          'Content-Type': 'application/json',
+          'User-Agent': config.dscUserAgent,
+        },
         params: { typeCampagne },
       });
     } catch (error) {