@spscommerce/e2e-core 1.1.1 → 1.1.2

package/helpers/apiCalls.ts

@@ -1,5 +1,10 @@
 import fetch from 'node-fetch';
-import { authEndpoint } from './envSetup';
+
+let authEndpoint = 'https://test.id.spsc.io/';
+
+if (process.env.URL && process.env.URL.toLowerCase().includes('prod')) {
+    authEndpoint = 'https://id.spsc.io/';
+}
 
 export async function getAuthToken(): Promise<string> {
     if (process.env.USER_EMAIL && process.env.USER_PASSWORD) {
@@ -56,7 +61,10 @@ export async function changePreferredOrg(orgID: string): Promise<void> {
             email: userData.email,
             first_name: userData.first_name,
             last_name: userData.last_name,
-            preferred_org_id: orgID
+            preferred_org_id: orgID,	
+            organization: {	
+                id: orgID	
+            }
         }),
         headers: {
             'Authorization': `Bearer ${process.env.TOKEN}`,

package/helpers/authSetup.ts

@@ -1,14 +1,21 @@
-import { getAuthToken, changePreferredOrg } from './apiCalls';
-import { primaryOrgID } from './envSetup';
+import { changePreferredOrg, getAuthToken, getUserInfo } from '../helpers/apiCalls';
 
-export async function authenticate(orgID?: string): Promise<void> {
-  if (orgID) {
+export async function authenticate(orgID: string): Promise<void> {
+  const testSuiteName = expect.getState().testPath.split('/').pop().split('.').reverse()[2];
+  process.env.TOKEN = await getAuthToken();
+  let userData = await getUserInfo();
+  console.log(`${testSuiteName} suite authentication flow: 
+  Current preferred org: ${userData.preferred_org_id}.
+  Current org: ${userData.organization.organization_name}.`);
+  while (userData.preferred_org_id !== orgID || userData.organization.id !== orgID) {
     await changePreferredOrg(orgID);
     process.env.TOKEN = await getAuthToken();
-  } else {
-    await changePreferredOrg(primaryOrgID);
-    process.env.TOKEN = await getAuthToken();
+    userData = await getUserInfo();
+    console.log(`${testSuiteName} suite authentication flow: 
+    Preferred org was changed to: ${userData.preferred_org_id}.
+    Current org was changed to: ${userData.organization.organization_name}.`);
   }
+  console.log(process.env.TOKEN);
   await page.addInitScript(params => {
     window.localStorage.setItem(params.name, params.value);
   }, { name: "access_token", value: process.env.TOKEN });
@@ -19,5 +26,7 @@ export async function unauthenticate(): Promise<void> {
   await context.clearCookies();
   await context.addInitScript(() => window.localStorage.clear());
   await context.addInitScript(() => window.sessionStorage.clear());
+  await page.goto(process.env.BASEURL);
+  await page.waitForURL(/https:\/\/auth.*/);
   return;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spscommerce/e2e-core",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "An automation test framework which is based on playwright, jest and ts",
   "scripts": {
     "test": "jest",

package/helpers/envSetup.ts

@@ -1,9 +0,0 @@
-let authEndpoint = 'https://test.id.spsc.io/';
-let primaryOrgID = '209098808305562446811265341033453015703'; // SPS Commerce org id on test env
-
-if (process.env.URL && process.env.URL.toLowerCase().includes('prod')) {
-    authEndpoint = 'https://id.spsc.io/';
-    primaryOrgID = '157627141979612915626333577105111854232'; // SPS Commerce org id on prod env
-}
-
-export { authEndpoint, primaryOrgID };