Don't call updateAuthState during handleAuthentication

OKTA-415108
<<<Jenkins Check-In of Tested SHA: ef487bb for eng_productivity_ci_bot_okta@okta.com>>>
Artifact: okta-react
Files changed count: 12
PR Link:

.eslintignore

@@ -1,2 +1,3 @@
 node_modules
 /dist
+/scripts

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.0.11
+
+### Bug Fixes
+
+- [#150](https://github.com/okta/okta-react/pull/150) fixes issue with displaying error in `LoginCallback`
+
 # 3.0.10
 
 ### Bug Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okta/okta-react",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "React support for Okta",
   "private": true,
   "scripts": {
@@ -12,6 +12,7 @@
     "lint:report": "eslint -f checkstyle -o ./test-reports/lint/eslint-checkstyle-result.xml .",
     "prepare": "yarn build",
     "start": "yarn --cwd test/e2e/harness start",
+    "pretest:e2e": "node ./scripts/update-se-drivers.js",
     "test": "yarn lint && yarn test:unit && yarn test:e2e",
     "test:e2e": "yarn --cwd test/e2e/harness test",
     "test:unit": "jest"
@@ -52,6 +53,7 @@
     "@babel/plugin-transform-runtime": "^7.11.5",
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-react": "^7.10.4",
+    "axios": "^0.21.0",
     "babel-jest": "^26.3.0",
     "babel-plugin-transform-inline-environment-variables": "^0.4.3",
     "chalk": "^4.1.0",

scripts/travis.sh

@@ -1,6 +1,7 @@
 set -e
 # if this build was triggered via a cron job, run tests on sauce labs
 if [ "${TRAVIS_EVENT_TYPE}" = "cron" ] ; then
+	yarn pretest
     yarn test:e2e
 else
     # run the lint, unit and e2e tests (on chrome headless)

scripts/update-se-drivers.js

@@ -0,0 +1,41 @@
+const axios = require('axios');
+const { execSync } = require('child_process');
+
+function getOS() {
+  let os = process.platform;
+  if (os === 'darwin') {
+    os = 'MacOS';
+  } else if (os === 'win32' || os === 'win64') {
+    os = 'Windows';
+  } else if (os === 'linux') {
+    os = 'Linux';
+  }
+  return os;
+}
+
+const os = getOS();
+console.log(`Operating System - ${os}`);
+
+let chromeVersion;
+if (os === 'MacOS') {
+  const chromeVersionString = execSync('/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version').toString();
+  // Get the major and minor version of the chrome version using regex (1 or more digits followed by a dot followed by 1 or more digits)
+  const matchIndex = 0;
+  chromeVersion = chromeVersionString.match(/(\d+(\.\d+)?)/)[matchIndex];
+} else {
+  chromeVersion = execSync('google-chrome --product-version').toString();
+}
+
+const chromeMajorVersion = chromeVersion.split('.')[0];
+console.log(`Chrome Major Version - ${chromeMajorVersion}`);
+
+const chromeDriverUrl = `https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${chromeMajorVersion}`;
+
+axios.get(chromeDriverUrl).then((response) => {
+  const chromeDriverVersion = response.data;
+  console.log(`Chrome Driver Version - ${chromeDriverVersion}`);
+
+  execSync(`${__dirname}/../node_modules/protractor/bin/webdriver-manager update --versions.chrome ${chromeDriverVersion} --gecko false --versions.standalone latest`);
+}).catch((err) => {
+  console.log(err);
+});

src/Security.js

@@ -29,7 +29,7 @@ const Security = (props) => {
       setAuthState(authService.getAuthState());
     });
 
-    if (!authService._oktaAuth.token.isLoginRedirect()) {
+    if (!authService._oktaAuth.token.isLoginRedirect() && !authService._pending.handleAuthentication) {
       // Trigger an initial change event to make sure authState is latest when not in loginRedirect state
       authService.updateAuthState(); 
     }

test/e2e/harness/package.json

@@ -34,7 +34,7 @@
     "start": "PORT=8080 react-app-rewired start",
     "build": "react-app-rewired build",
     "kill:port": "kill -s TERM $(lsof -t -i:8080 -sTCP:LISTEN) || true",
-    "pretest": "../../../scripts/update_se_drivers.sh 0",
+    "pretest": "node ../../../scripts/update-se-drivers.js",
     "wait:server": "BROWSER=none yarn start & ./node_modules/.bin/wait-on http://localhost:8080",
     "test": "yarn wait:server && yarn protractor",
     "posttest": "yarn kill:port",

test/jest/loginCallback.test.js

@@ -16,6 +16,7 @@ describe('<LoginCallback />', () => {
       updateAuthState: jest.fn(),
       getAuthState: jest.fn().mockImplementation(() => authState),
       handleAuthentication: jest.fn(),
+      _pending: {},
       _oktaAuth: {
         token: {
           isLoginRedirect: jest.fn().mockImplementation(() => false)

test/jest/secureRoute.test.js

@@ -19,6 +19,7 @@ describe('<SecureRoute />', () => {
       updateAuthState: jest.fn(),
       getAuthState: jest.fn().mockImplementation(() => authState),
       login: jest.fn(),
+      _pending: {},
       _oktaAuth: {
         token: {
           isLoginRedirect: jest.fn().mockImplementation(() => false)

test/jest/security.test.js

@@ -21,6 +21,7 @@ describe('<Security />', () => {
       on: jest.fn(),
       updateAuthState: jest.fn(),
       getAuthState: jest.fn().mockImplementation(() => initialAuthState),
+      _pending: {},
       _oktaAuth: {
         token: {
           isLoginRedirect: jest.fn().mockImplementation(() => false)

yarn.lock

@@ -3775,6 +3775,13 @@ axe-core@^3.5.4:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz#84315073b53fa3c0c51676c588d59da09a192227"
   integrity sha512-5P0QZ6J5xGikH780pghEdbEKijCTrruK9KxtPZCFWUpef0f6GipO+xEZ5GKCb020mmqgbiNO6TcA55CriL784Q==
 
+axios@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.0.tgz#26df088803a2350dff2c27f96fef99fe49442aca"
+  integrity sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==
+  dependencies:
+    follow-redirects "^1.10.0"
+
 axobject-query@^2.0.2, axobject-query@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -7903,7 +7910,7 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0:
+follow-redirects@^1.0.0, follow-redirects@^1.10.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
   integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==