Merge branch 'master' into feat/wt-340-refresh-drive-web-tokens-on-pa…

…sswordchange
internxt · Oct 17, 2023 · 45a7a82 · 45a7a82
2 parents f6951d4 + e690fbe
commit 45a7a82
Show file tree

Hide file tree

Showing 353 changed files with 21,696 additions and 4,417 deletions.
diff --git a/.env.example b/.env.example
@@ -19,7 +19,7 @@ REACT_APP_NOTIFICATIONS_URL=
 REACT_APP_SHARE_LINKS_DOMAIN=
 REACT_APP_AUTH_URL=
 REACT_APP_BUTTON_AUTH_URL=
-
+REACT_APP_DEBUG=
 # ANALYTICS KEYS
 REACT_APP_ANALYTICS_ERROR_REPORTING_WRITE_KEY=
 REACT_APP_CDP_DATA_PLANE=
diff --git a/.github/workflows/cd-to-share.yml b/.github/workflows/cd-to-share.yml
@@ -26,6 +26,7 @@ jobs:
       - run: echo REACT_APP_PAYMENTS_API_URL=${{ secrets.REACT_APP_PAYMENTS_API_URL }} >> ./infrastructure/share/share.env
       - run: echo REACT_APP_DRIVE_NEW_API_URL=${{ secrets.REACT_APP_DRIVE_NEW_API_URL }} >> ./infrastructure/share/share.env
       - run: echo REACT_APP_RECAPTCHA_V3=${{ secrets.REACT_APP_RECAPTCHA_V3 }} >> ./infrastructure/share/share.env
+      - run: echo REACT_APP_DONT_USE_PROXY=${{ secrets.REACT_APP_DONT_USE_PROXY }} >> ./infrastructure/share/share.env
       - run: echo "registry=https://registry.yarnpkg.com/" > .npmrc
       - run: echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
       # You cannot read packages from other private repos with GITHUB_TOKEN

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,17 +17,36 @@ env:
   CI: false
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         node-version: [14.x]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: 'https://npm.pkg.github.com'
+      - run: echo REACT_APP_CRYPTO_SECRET=${{ secrets.REACT_APP_CRYPTO_SECRET }} >> ./.env
+      - run: echo REACT_APP_STRIPE_PK=${{ secrets.REACT_APP_STRIPE_PK }} >> ./.env
+      - run: echo REACT_APP_STRIPE_TEST_PK=${{ secrets.REACT_APP_STRIPE_TEST_PK }} >> ./.env
+      - run: echo REACT_APP_API_URL=${{ secrets.REACT_APP_API_URL }} >> ./.env
+      - run: echo REACT_APP_SEGMENT_KEY=${{ secrets.REACT_APP_SEGMENT_KEY }} >> ./.env
+      - run: echo REACT_APP_MAGIC_IV=${{ secrets.REACT_APP_MAGIC_IV }} >> ./.env
+      - run: echo REACT_APP_MAGIC_SALT=${{ secrets.REACT_APP_MAGIC_SALT }} >> ./.env
+      - run: echo REACT_APP_CRYPTO_SECRET2=${{ secrets.REACT_APP_CRYPTO_SECRET2 }} >> ./.env
+      - run: echo GENERATE_SOURCEMAP=${{ secrets.GENERATE_SOURCEMAP }} >> ./.env
+      - run: echo REACT_APP_RECAPTCHA_V3=${{ secrets.REACT_APP_RECAPTCHA_V3 }} >> ./.env
+      - run: echo REACT_APP_STORJ_BRIDGE=${{ secrets.REACT_APP_STORJ_BRIDGE }} >> ./.env
+      - run: echo REACT_APP_HOSTNAME=${{ secrets.REACT_APP_HOSTNAME }} >> ./.env
+      - run: echo REACT_APP_PROXY=${{ secrets.REACT_APP_PROXY }} >> ./.env
+      - run: echo REACT_APP_DONT_USE_PROXY=${{ secrets.REACT_APP_DONT_USE_PROXY }} >> ./.env
+      - run: echo REACT_APP_PHOTOS_API_URL=${{ secrets.REACT_APP_PHOTOS_API_URL }} >> ./.env
+      - run: echo REACT_APP_SENTRY_DSN=${{ secrets.REACT_APP_SENTRY_DSN }} >> ./.env
+      - run: echo REACT_APP_PAYMENTS_API_URL=${{ secrets.REACT_APP_PAYMENTS_API_URL }} >> ./.env
+      - run: echo REACT_APP_DRIVE_NEW_API_URL=${{ secrets.REACT_APP_DRIVE_NEW_API_URL }} >> ./.env
+      - run: echo REACT_APP_NODE_ENV=production >> ./.env
       - run: echo "registry=https://registry.yarnpkg.com/" > .npmrc
       - run: echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
       # You cannot read packages from other private repos with GITHUB_TOKEN
@@ -39,11 +58,19 @@ jobs:
       - name: Unit test run
         run: yarn test:unit
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v5
         with:
+          browser: chrome
           start: yarn start
           command: yarn test:e2e
           wait-on: http://localhost:3000
+          wait-on-timeout: 18000
+      - name: Upload screenshots
+        uses: actions/[email protected]
+        if: failure() || cancelled()
+        with:
+          name: cypress-snapshots
+          path: test/e2e/cypress/screenshots
   build:
     runs-on: ubuntu-latest
     strategy:

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -3,3 +3,4 @@
 /src/app/network/ @sg-gs
 /src/app/crypto/ @sg-gs
 /src/app/core/services/stream.service.ts @sg-gs
+/src/app/crypto/services/pgp.service.ts @sg-gs
diff --git a/package.json b/package.json
@@ -1,13 +1,14 @@
 {
   "name": "drive-web",
-  "version": "v1.0.28",
+  "version": "v1.0.181",
   "private": true,
   "dependencies": {
     "@headlessui/react": "1.7.5",
     "@iconscout/react-unicons": "^1.1.6",
     "@internxt/inxt-js": "=1.2.21",
     "@internxt/lib": "^1.2.0",
-    "@internxt/sdk": "^1.4.27",
+    "@internxt/sdk": "1.4.54",
+    "@phosphor-icons/react": "^2.0.10",
     "@popperjs/core": "^2.11.6",
     "@reduxjs/toolkit": "^1.6.0",
     "@sentry/react": "^7.1.0",
@@ -24,6 +25,7 @@
     "crypto-js": "^4.0.0",
     "dayjs": "^1.11.7",
     "detect-browser": "^5.3.0",
+    "docx-preview": "^0.1.18",
     "file-saver": "^2.0.5",
     "history": "^4.10.1",
     "i18next": "^22.4.9",
@@ -32,8 +34,7 @@
     "jszip": "=3.2.2",
     "lint-staged": "^13.1.0",
     "lodash": "^4.17.21",
-    "openpgp": "^4.10.10",
-    "phosphor-react": "^1.4.1",
+    "openpgp": "^5.9.0",
     "prettysize": "^2.0.0",
     "query-string": "^6.13.8",
     "react": "^17.0.1",
@@ -45,9 +46,10 @@
     "react-dom": "^17.0.1",
     "react-draggable": "^4.4.4",
     "react-gtm-module": "^2.0.11",
+    "react-helmet-async": "^1.3.0",
     "react-hook-form": "^7.11.0",
     "react-hot-toast": "^2.2.0",
-    "react-hotkeys-hook": "^3.4.7",
+    "react-hotkeys-hook": "^4.3.2",
     "react-i18next": "^12.1.4",
     "react-image-file-resizer": "^0.4.8",
     "react-infinite-scroll-component": "6.1.0",
@@ -63,7 +65,8 @@
     "streamsaver": "^2.0.5",
     "string-template": "^1.0.0",
     "uuid": "^8.3.2",
-    "web-vitals": "^0.2.4"
+    "web-vitals": "^0.2.4",
+    "xlsx-preview": "^1.0.4"
   },
   "scripts": {
     "preinstall": "node scripts/use-yarn.js",

diff --git a/public/apple-app-site-association b/public/apple-app-site-association
@@ -0,0 +1,13 @@
+{
+  "applinks": {
+    "apps": [],
+    "details": [
+      {
+        "appID": "JR4S3SY396.internxt.InternxtDesktop",
+        "paths": [
+          "/universal-link-auth/*"
+        ]
+      }
+    ]
+  }
+}
diff --git a/public/index.html b/public/index.html
@@ -1,19 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-  <meta charset="utf-8" />
-  <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="theme-color" content="#000000" />
-  <meta name="description" content="Secure file storage" />
-  <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-  <!--
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Stand for privacy, switch to Internxt. Internxt's open-source suite of cloud storage services protects your right to privacy. Internxt Drive, Photos, Send, and more."
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-  <!--
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -22,43 +24,81 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-  <title>Internxt Drive</title>
-
-  <!-- <script src="https://www.google.com/recaptcha/api.js?render=%REACT_APP_RECAPTCHA_V3%"></script> -->
-  <script type="text/javascript">
-    !function () {
-      let k = "2EFjDkXZ8xv0qKyI2dHZ4d5VtmM"
-      if (location.hostname === "drive.internxt.com") {
-        k = "2EL15xyzDYBZ1V8C4ov6vX6MSOV"
-      }
-      var e = window.rudderanalytics = window.rudderanalytics || []; e.methods = ["load", "page", "track", "identify", "alias", "group", "ready", "reset", "getAnonymousId", "setAnonymousId", "getUserId", "getUserTraits", "getGroupId", "getGroupTraits"], e.factory = function (t) { return function () { var r = Array.prototype.slice.call(arguments); return r.unshift(t), e.push(r), e } }; for (var t = 0; t < e.methods.length; t++) { var r = e.methods[t]; e[r] = e.factory(r) } e.loadJS = function (e, t) { var r = document.createElement("script"); r.type = "text/javascript", r.async = !0, r.src = "https://s3.us-east-1.wasabisys.com/djdjdkwl/ruddersnippet.js"; var a = document.getElementsByTagName("script")[0]; a.parentNode.insertBefore(r, a) }, e.loadJS(),
-        e.load(k, "https://cdp.internxt.com"),
-        e.page()
-    }();
-  </script>
+    <title>Internxt Drive – Private & Secure Cloud Storage</title>
 
-  <!-- MailerLite Universal -->
-  <script>
-    if ('%NODE_ENV%' === 'production') {
-      (function (w, d, e, u, f, l, n) {
-        w[f] = w[f] || function () {
-          (w[f].q = w[f].q || [])
-            .push(arguments);
-        }, l = d.createElement(e), l.async = 1, l.src = u,
-          n = d.getElementsByTagName(e)[0], n.parentNode.insertBefore(l, n);
-      })
-        (window, document, 'script', 'https://assets.mailerlite.com/js/universal.js', 'ml');
-      ml('account', '16439');
-    }
-  </script>
-  <!-- < !--End MailerLite Universal-->
+    <!-- <script src="https://www.google.com/recaptcha/api.js?render=%REACT_APP_RECAPTCHA_V3%"></script> -->
+    <script type="text/javascript">
+      !(function () {
+        let k = '2EFjDkXZ8xv0qKyI2dHZ4d5VtmM';
+        if (location.hostname === 'drive.internxt.com') {
+          k = '2EL15xyzDYBZ1V8C4ov6vX6MSOV';
+        }
+        var e = (window.rudderanalytics = window.rudderanalytics || []);
+        (e.methods = [
+          'load',
+          'page',
+          'track',
+          'identify',
+          'alias',
+          'group',
+          'ready',
+          'reset',
+          'getAnonymousId',
+          'setAnonymousId',
+          'getUserId',
+          'getUserTraits',
+          'getGroupId',
+          'getGroupTraits',
+        ]),
+          (e.factory = function (t) {
+            return function () {
+              var r = Array.prototype.slice.call(arguments);
+              return r.unshift(t), e.push(r), e;
+            };
+          });
+        for (var t = 0; t < e.methods.length; t++) {
+          var r = e.methods[t];
+          e[r] = e.factory(r);
+        }
+        (e.loadJS = function (e, t) {
+          var r = document.createElement('script');
+          (r.type = 'text/javascript'),
+            (r.async = !0),
+            (r.src = 'https://s3.us-east-1.wasabisys.com/djdjdkwl/ruddersnippet.js');
+          var a = document.getElementsByTagName('script')[0];
+          a.parentNode.insertBefore(r, a);
+        }),
+          e.loadJS(),
+          e.load(k, 'https://cdp.internxt.com'),
+          e.page();
+      })();
+    </script>
 
-</head>
+    <!-- MailerLite Universal -->
+    <script>
+      if ('%NODE_ENV%' === 'production') {
+        (function (w, d, e, u, f, l, n) {
+          (w[f] =
+            w[f] ||
+            function () {
+              (w[f].q = w[f].q || []).push(arguments);
+            }),
+            (l = d.createElement(e)),
+            (l.async = 1),
+            (l.src = u),
+            (n = d.getElementsByTagName(e)[0]),
+            n.parentNode.insertBefore(l, n);
+        })(window, document, 'script', 'https://assets.mailerlite.com/js/universal.js', 'ml');
+        ml('account', '16439');
+      }
+    </script>
+    <!-- < !--End MailerLite Universal-->
+  </head>
 
-<body>
-  <noscript>You need to enable JavaScript to run this app.</noscript>
-  <div id="root"></div>
-  <!--
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
         This HTML file is a template.
         If you open it directly in the browser, you will see an empty page.
 
@@ -68,6 +108,5 @@
           To begin the development, run `npm start` or `yarn start`.
           To create a production bundle, use `npm run build` or `yarn build`.
     -->
-</body>
-
-</html>
+  </body>
+</html>
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1 @@
+sonar.cpd.exclusions=src/app/i18n/locales/*.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		sonar.cpd.exclusions=src/app/i18n/locales/*.json