From 9aad63a62335dc9aaf107567e6aa82b2f12dc17d Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Fri, 6 Jan 2023 14:43:07 +0500
Subject: [PATCH] core: use correct env variables for login tests

---
 .github/workflows/core.tests.yml            | 7 ++++---
 packages/core/__e2e__/token-manager.test.js | 6 ------
 packages/core/__e2e__/utils.js              | 8 ++++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/core.tests.yml b/.github/workflows/core.tests.yml
index dff865e53..74bf74b77 100644
--- a/.github/workflows/core.tests.yml
+++ b/.github/workflows/core.tests.yml
@@ -45,9 +45,10 @@ jobs:
           npm ci --prefer-offline --no-audit
       - name: Add environment variables
         run: |
-          echo "EMAIL=${{ secrets.USER_EMAIL }}" >> $GITHUB_ENV
-          echo "PASSWORD='${{ secrets.USER_PASSWORD }}'" >> $GITHUB_ENV
-          echo "HASHED_PASSWORD=${{ secrets.USER_HASHED_PASSWORD }}" >> $GITHUB_ENV
+          echo "USER_EMAIL=${{ secrets.USER_EMAIL }}" >> $GITHUB_ENV
+          echo "USER_PASSWORD=${{ secrets.USER_PASSWORD }}" >> $GITHUB_ENV
+          echo "USER_TOTP_SECRET=${{ secrets.USER_TOTP_SECRET }}" >> $GITHUB_ENV
+          echo "USER_HASHED_PASSWORD=${{ secrets.USER_HASHED_PASSWORD }}" >> $GITHUB_ENV
           echo "NX_CLOUD_ACCESS_TOKEN=${{ secrets.NX_CLOUD_ACCESS_TOKEN }}" >> $GITHUB_ENV
 
       - name: Run all @notesnook/core tests
diff --git a/packages/core/__e2e__/token-manager.test.js b/packages/core/__e2e__/token-manager.test.js
index 3246a1dca..246fb7044 100644
--- a/packages/core/__e2e__/token-manager.test.js
+++ b/packages/core/__e2e__/token-manager.test.js
@@ -21,12 +21,6 @@ import DB from "../api";
 import StorageInterface from "../__mocks__/storage.mock";
 import { login } from "./utils";
 
-const user = {
-  email: process.env.EMAIL,
-  password: process.env.PASSWORD,
-  hashedPassword: process.env.HASHED_PASSWORD
-};
-
 test("refresh token concurrently", async () => {
   const db = new DB(StorageInterface);
   await db.init();
diff --git a/packages/core/__e2e__/utils.js b/packages/core/__e2e__/utils.js
index 78821dccf..9b214b5e5 100644
--- a/packages/core/__e2e__/utils.js
+++ b/packages/core/__e2e__/utils.js
@@ -20,10 +20,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { authenticator } from "otplib";
 
 export const user = {
-  email: process.env.EMAIL,
-  password: process.env.PASSWORD,
-  hashed: process.env.HASHED_PASSWORD,
-  totpSecret: process.env.TOTP_SECRET
+  email: process.env.USER_EMAIL,
+  password: process.env.USER_PASSWORD,
+  hashed: process.env.USER_HASHED_PASSWORD,
+  totpSecret: process.env.USER_TOTP_SECRET
 };
 
 export async function login(db) {