From 974fcb973dad6cb31819c64a59402e932afbc9b1 Mon Sep 17 00:00:00 2001
From: Umut Benzer <umut@benzer.dev>
Date: Fri, 24 May 2024 14:53:14 +0200
Subject: [PATCH 01/13] IDS-4707 - Switch from InputCombo to InputText if there
 are too many connections to list

---
 client/utils/useDefaultFields.js |  9 ++++++---
 package.json                     |  6 ++----
 server/lib/multipartRequest.js   | 10 +++++++++-
 server/routes/connections.js     |  4 +++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/client/utils/useDefaultFields.js b/client/utils/useDefaultFields.js
index 4d05bab60..7ca5fe10d 100644
--- a/client/utils/useDefaultFields.js
+++ b/client/utils/useDefaultFields.js
@@ -1,5 +1,7 @@
 import _ from 'lodash';
 
+const CONNECTIONS_LIST_LIMIT = 20;
+
 const applyDefaults = (type, fields, property, defaults) => {
   const field = _.find(fields, { property });
 
@@ -61,14 +63,15 @@ export const useConnectionsField = (isEditField, fields, connections, onConnecti
     return _.remove(fields, { property: 'connection' });
   }
 
+  const isConnectionListingLimitExceeded =  connections.length >= CONNECTIONS_LIST_LIMIT;
   const defaults = {
     property: 'connection',
     label: 'Connection',
     [type]: {
       required: true,
-      type: 'select',
-      component: 'InputCombo',
-      options: connections.map(conn => ({ value: conn.name, label: conn.name })),
+      type: 'text',
+      component: isConnectionListingLimitExceeded ? 'InputText' :'InputCombo',
+      options: isConnectionListingLimitExceeded ? undefined : connections.map(conn => ({ value: conn.name, label: conn.name })),
       onChange: onConnectionChange
     }
   };
diff --git a/package.json b/package.json
index e2dce3e55..7f9e00b68 100644
--- a/package.json
+++ b/package.json
@@ -14,15 +14,13 @@
     "deploy": "a0-ext deploy --package ./dist/package.zip --url http://0.0.0.0:3000/api/extensions",
     "client:build": "a0-ext build:client ./client/app.jsx ./dist/client",
     "extension:build": "a0-ext build:server ./webtask.js ./dist && cp ./dist/auth0-delegated-admin.extension.$npm_package_version.js ./build/bundle.js && cp ./webtask.json ./dist/webtask.json",
-    "serve:dev": "cross-env NODE_ENV=development nodemon -e js --ignore assets/app/ --ignore build/webpack/ --ignore client/ --ignore server/data.json --ignore node_modules/ ./build/webpack/server.js",
+    "serve:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--openssl-legacy-provider nodemon -e js --ignore assets/app/ --ignore build/webpack/ --ignore client/ --ignore server/data.json --ignore node_modules/ ./build/webpack/server.js",
     "serve:prod": "cross-env NODE_ENV=production node index.js",
     "test": "cross-env NODE_ENV=test nyc --reporter=lcov mocha --require ignore-styles tests/mocha.js './tests/**/*.tests.js'",
     "test:watch": "cross-env NODE_ENV=test mocha --require ignore-styles tests/mocha.js './tests/**/*.tests.js' --watch",
     "test:pre": "npm run test:clean && npm run lint:js",
     "test:clean": "rimraf ./coverage && rimraf ./.nyc_output",
-    "extension:size": "cross-env NODE_ENV=production webpack -p --config ./build/extension/webpack.config.js --json > ./build/extension/bundle-size.json && node ./build/extension/bundle-size.js",
-    "snyk-protect": "snyk protect",
-    "prepare": "npm run snyk-protect"
+    "extension:size": "cross-env NODE_ENV=production webpack -p --config ./build/extension/webpack.config.js --json > ./build/extension/bundle-size.json && node ./build/extension/bundle-size.js"
   },
   "keywords": [
     "auth0",
diff --git a/server/lib/multipartRequest.js b/server/lib/multipartRequest.js
index 007830566..ad29f2975 100644
--- a/server/lib/multipartRequest.js
+++ b/server/lib/multipartRequest.js
@@ -1,7 +1,12 @@
 import Promise from 'bluebird';
 import { ArgumentError } from 'auth0-extension-tools';
 
-export default function(client, entity, opts = {}, perPage = 50, concurrency = 5) {
+
+export default function(client, entity, opts = {}, fetchOptions = {} ) {
+  const perPage = fetchOptions.perPage || 50;
+  const concurrency = fetchOptions.concurrency || 5;
+  const limit = fetchOptions.limit || null;
+
   if (client === null || client === undefined) {
     throw new ArgumentError('Must provide a auth0 client object.');
   }
@@ -20,6 +25,9 @@ export default function(client, entity, opts = {}, perPage = 50, concurrency = 5
     getter({ ...options, include_totals: true, page: 0 })
       .then((response) => {
         total = response.total || 0;
+        if (limit) {
+          total = Math.min(total, limit);
+        }
         pageCount = Math.ceil(total / perPage);
         const data = response[entity] || response || [];
         data.forEach(item => result.push(item));
diff --git a/server/routes/connections.js b/server/routes/connections.js
index c12e2dbe4..74e728779 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -3,10 +3,12 @@ import { Router } from 'express';
 
 import multipartRequest from '../lib/multipartRequest';
 
+const CONNECTIONS_LIST_LIMIT = 50;
+
 export default (scriptManager) => {
   const api = Router();
   api.get('/', (req, res, next) => {
-    multipartRequest(req.auth0, 'connections', { strategy: 'auth0', fields: 'id,name,strategy,options' })
+    multipartRequest(req.auth0, 'connections', { strategy: 'auth0', fields: 'id,name,strategy,options' }, { perPage: 100, limit: CONNECTIONS_LIST_LIMIT})
       .then((connections) => {
         global.connections = connections.map(conn => ({ name: conn.name, id: conn.id }));
         const settingsContext = {

From b3982949c4bb13f657d5f17abc6f5315fdec4717 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Tue, 28 May 2024 19:24:49 +0100
Subject: [PATCH 02/13] Fix test + QoL improvements

---
 client/actions/user.js           |  2 +-
 client/constants.js              |  2 ++
 client/utils/useDefaultFields.js | 10 +++++-----
 server/routes/connections.js     |  3 +--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/actions/user.js b/client/actions/user.js
index 558b44273..0f8041572 100644
--- a/client/actions/user.js
+++ b/client/actions/user.js
@@ -80,7 +80,7 @@ export function requestCreateUser(memberships) {
     dispatch({
       type: constants.REQUEST_CREATE_USER,
       payload: {
-        connection: connections && connections.length && connections[0].name,
+        connection: connections && connections.length && connections.length < 20 && connections[0].name || null,
         memberships: memberships && memberships.length === 1 ? [ memberships[0] ] : [ ]
       }
     });
diff --git a/client/constants.js b/client/constants.js
index dfdc92925..90737185d 100644
--- a/client/constants.js
+++ b/client/constants.js
@@ -253,3 +253,5 @@ export const SUPER_ADMIN = 2;
 
 // The list of reserved user fields that must not be rendered in the custom fields edit form
 export const RESERVED_USER_FIELDS = [ 'username', 'memberships', 'connection', 'password', 'email', 'repeatPassword', 'resetPassword' ];
+
+export const CONNECTIONS_LIST_LIMIT = 20;
\ No newline at end of file
diff --git a/client/utils/useDefaultFields.js b/client/utils/useDefaultFields.js
index 7ca5fe10d..cf1055580 100644
--- a/client/utils/useDefaultFields.js
+++ b/client/utils/useDefaultFields.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 
-const CONNECTIONS_LIST_LIMIT = 20;
+import { CONNECTIONS_LIST_LIMIT } from "../constants";
 
 const applyDefaults = (type, fields, property, defaults) => {
   const field = _.find(fields, { property });
@@ -63,14 +63,14 @@ export const useConnectionsField = (isEditField, fields, connections, onConnecti
     return _.remove(fields, { property: 'connection' });
   }
 
-  const isConnectionListingLimitExceeded =  connections.length >= CONNECTIONS_LIST_LIMIT;
+  const isConnectionListingLimitExceeded = connections.length >= CONNECTIONS_LIST_LIMIT;
   const defaults = {
     property: 'connection',
-    label: 'Connection',
+    label: isConnectionListingLimitExceeded ? 'Connection Name' : 'Connection',
     [type]: {
       required: true,
-      type: 'text',
-      component: isConnectionListingLimitExceeded ? 'InputText' :'InputCombo',
+      type: isConnectionListingLimitExceeded ? 'text' : 'select',
+      component: isConnectionListingLimitExceeded ? 'InputText' : 'InputCombo',
       options: isConnectionListingLimitExceeded ? undefined : connections.map(conn => ({ value: conn.name, label: conn.name })),
       onChange: onConnectionChange
     }
diff --git a/server/routes/connections.js b/server/routes/connections.js
index 74e728779..ece19e8ea 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -2,8 +2,7 @@ import _ from 'lodash';
 import { Router } from 'express';
 
 import multipartRequest from '../lib/multipartRequest';
-
-const CONNECTIONS_LIST_LIMIT = 50;
+import { CONNECTIONS_LIST_LIMIT } from "../constants";
 
 export default (scriptManager) => {
   const api = Router();

From 340edf0170d77539afd0eaea7af2a5ded4e02635 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Wed, 29 May 2024 17:59:42 +0100
Subject: [PATCH 03/13] Fix connections fetch limit

---
 client/actions/user.js       | 4 ++--
 server/routes/connections.js | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/actions/user.js b/client/actions/user.js
index 0f8041572..6aba6778c 100644
--- a/client/actions/user.js
+++ b/client/actions/user.js
@@ -5,7 +5,7 @@ import * as constants from '../constants';
 import { fetchUserLogs } from './userLog';
 import { fetchUserDevices } from './userDevice';
 import { getAccessLevel } from './auth';
-import { removeBlockedIPs } from "../reducers/removeBlockedIPs";
+import { CONNECTIONS_LIST_LIMIT } from "../constants";
 
 const addRequiredTextParam = (url, languageDictionary) => {
   languageDictionary = languageDictionary || {};
@@ -80,7 +80,7 @@ export function requestCreateUser(memberships) {
     dispatch({
       type: constants.REQUEST_CREATE_USER,
       payload: {
-        connection: connections && connections.length && connections.length < 20 && connections[0].name || null,
+        connection: connections && connections.length && connections.length < CONNECTIONS_LIST_LIMIT && connections[0].name || null,
         memberships: memberships && memberships.length === 1 ? [ memberships[0] ] : [ ]
       }
     });
diff --git a/server/routes/connections.js b/server/routes/connections.js
index ece19e8ea..424c08676 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -2,12 +2,13 @@ import _ from 'lodash';
 import { Router } from 'express';
 
 import multipartRequest from '../lib/multipartRequest';
-import { CONNECTIONS_LIST_LIMIT } from "../constants";
+// only fetch one page of connections
+const CONNECTIONS_FETCH_LIMIT = 50;
 
 export default (scriptManager) => {
   const api = Router();
   api.get('/', (req, res, next) => {
-    multipartRequest(req.auth0, 'connections', { strategy: 'auth0', fields: 'id,name,strategy,options' }, { perPage: 100, limit: CONNECTIONS_LIST_LIMIT})
+    multipartRequest(req.auth0, 'connections', { strategy: 'auth0', fields: 'id,name,strategy,options' }, { perPage: 100, limit: CONNECTIONS_FETCH_LIMIT})
       .then((connections) => {
         global.connections = connections.map(conn => ({ name: conn.name, id: conn.id }));
         const settingsContext = {

From b623d9f3a4f49df44e1af1f57c08748891c435ff Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Thu, 30 May 2024 09:51:49 +0100
Subject: [PATCH 04/13] Use default perPage for connections

---
 server/routes/connections.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/routes/connections.js b/server/routes/connections.js
index 424c08676..da88f93be 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -8,7 +8,7 @@ const CONNECTIONS_FETCH_LIMIT = 50;
 export default (scriptManager) => {
   const api = Router();
   api.get('/', (req, res, next) => {
-    multipartRequest(req.auth0, 'connections', { strategy: 'auth0', fields: 'id,name,strategy,options' }, { perPage: 100, limit: CONNECTIONS_FETCH_LIMIT})
+    multipartRequest(req.auth0, 'connections', { strategy: 'auth0', fields: 'id,name,strategy,options' }, { limit: CONNECTIONS_FETCH_LIMIT})
       .then((connections) => {
         global.connections = connections.map(conn => ({ name: conn.name, id: conn.id }));
         const settingsContext = {

From eee0a90850fd7a60b4349d4418a886160db8c4a2 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Fri, 31 May 2024 17:25:19 +0100
Subject: [PATCH 05/13] set CONNECTIONS_LIST_LIMIT to 20k

---
 client/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/constants.js b/client/constants.js
index 90737185d..8c0ce670a 100644
--- a/client/constants.js
+++ b/client/constants.js
@@ -254,4 +254,4 @@ export const SUPER_ADMIN = 2;
 // The list of reserved user fields that must not be rendered in the custom fields edit form
 export const RESERVED_USER_FIELDS = [ 'username', 'memberships', 'connection', 'password', 'email', 'repeatPassword', 'resetPassword' ];
 
-export const CONNECTIONS_LIST_LIMIT = 20;
\ No newline at end of file
+export const CONNECTIONS_LIST_LIMIT = 20000;

From 04b29ac9dee5a997be212c25c9b6348dbb601494 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Mon, 3 Jun 2024 15:29:36 +0100
Subject: [PATCH 06/13] Don't fetch records if total > limit

---
 client/actions/user.js            |  8 ++++++--
 client/constants.js               |  2 --
 client/containers/Users/Users.jsx |  2 +-
 client/utils/useDefaultFields.js  | 26 ++++++++++++++---------
 server/lib/multipartRequest.js    | 34 ++++++++++++++++++++++++-------
 server/routes/connections.js      | 26 ++++++++++++++++++-----
 6 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/client/actions/user.js b/client/actions/user.js
index 6aba6778c..9a505098d 100644
--- a/client/actions/user.js
+++ b/client/actions/user.js
@@ -5,7 +5,6 @@ import * as constants from '../constants';
 import { fetchUserLogs } from './userLog';
 import { fetchUserDevices } from './userDevice';
 import { getAccessLevel } from './auth';
-import { CONNECTIONS_LIST_LIMIT } from "../constants";
 
 const addRequiredTextParam = (url, languageDictionary) => {
   languageDictionary = languageDictionary || {};
@@ -77,10 +76,15 @@ export function createUser(user, languageDictionary) {
 export function requestCreateUser(memberships) {
   return (dispatch, getState) => {
     const connections = getState().connections.get('records').toJS();
+
+    const connection = connections.length === 0
+      ? null
+      : connections && connections.length && connections[0].name
+
     dispatch({
       type: constants.REQUEST_CREATE_USER,
       payload: {
-        connection: connections && connections.length && connections.length < CONNECTIONS_LIST_LIMIT && connections[0].name || null,
+        connection,
         memberships: memberships && memberships.length === 1 ? [ memberships[0] ] : [ ]
       }
     });
diff --git a/client/constants.js b/client/constants.js
index 8c0ce670a..dfdc92925 100644
--- a/client/constants.js
+++ b/client/constants.js
@@ -253,5 +253,3 @@ export const SUPER_ADMIN = 2;
 
 // The list of reserved user fields that must not be rendered in the custom fields edit form
 export const RESERVED_USER_FIELDS = [ 'username', 'memberships', 'connection', 'password', 'email', 'repeatPassword', 'resetPassword' ];
-
-export const CONNECTIONS_LIST_LIMIT = 20000;
diff --git a/client/containers/Users/Users.jsx b/client/containers/Users/Users.jsx
index 62044f913..e3140ff54 100644
--- a/client/containers/Users/Users.jsx
+++ b/client/containers/Users/Users.jsx
@@ -102,7 +102,7 @@ class Users extends Component {
         <div className="row content-header">
           <div className="col-xs-12 user-table-content">
             <h1>{languageDictionary.usersTitle || 'Users'}</h1>
-            {(connections.length && role > 0 && showCreateUser) ?
+            {( role > 0 && showCreateUser) ?
               <button id="create-user-button" className="btn btn-success pull-right new" onClick={this.createUser}>
                 <i className="icon-budicon-473"></i>
                 {languageDictionary.createUserButtonText || 'Create User'}
diff --git a/client/utils/useDefaultFields.js b/client/utils/useDefaultFields.js
index cf1055580..86a381fce 100644
--- a/client/utils/useDefaultFields.js
+++ b/client/utils/useDefaultFields.js
@@ -1,7 +1,5 @@
 import _ from 'lodash';
 
-import { CONNECTIONS_LIST_LIMIT } from "../constants";
-
 const applyDefaults = (type, fields, property, defaults) => {
   const field = _.find(fields, { property });
 
@@ -17,7 +15,11 @@ export const useUsernameField = (isEditField, fields, connections, hasSelectedCo
   const type = isEditField ? 'edit' : 'create';
   const selectedConnection = _.find(connections, (conn) => conn.name === hasSelectedConnection);
   const requireUsername = selectedConnection && selectedConnection.options ? selectedConnection.options.requires_username : false;
-  const noUsername = !requireUsername && (!initialValues || !initialValues.username);
+  const noUsername = connections.length > 0
+    ? !requireUsername && (!initialValues || !initialValues.username)
+    // if we have no connections, we *might* need a username field, we don't know - 
+    // because we don't have the connections to check
+    : false;
 
   const defaults = {
     property: 'username',
@@ -25,7 +27,8 @@ export const useUsernameField = (isEditField, fields, connections, hasSelectedCo
     disable: noUsername,
     [type]: {
       type: 'text',
-      required: true
+      // if we have no connections we should show the field but not require it
+      required: connections.length > 0
     }
   };
 
@@ -59,19 +62,22 @@ export const useMembershipsField = (isEditField, fields, hasMembership, membersh
 
 export const useConnectionsField = (isEditField, fields, connections, onConnectionChange) => {
   const type = isEditField ? 'edit' : 'create';
-  if (!connections || connections.length <= 1) {
+  // if we have exactly one connection then don't show this field and use that connection
+  // however if we have zero connections, we should show the free text connections field
+  if (!connections || connections.length === 1) {
     return _.remove(fields, { property: 'connection' });
   }
 
-  const isConnectionListingLimitExceeded = connections.length >= CONNECTIONS_LIST_LIMIT;
+  const isConnectionLimitExceeded = connections.length === 0;
+
   const defaults = {
     property: 'connection',
-    label: isConnectionListingLimitExceeded ? 'Connection Name' : 'Connection',
+    label: isConnectionLimitExceeded ? 'Connection Name' : 'Connection',
     [type]: {
       required: true,
-      type: isConnectionListingLimitExceeded ? 'text' : 'select',
-      component: isConnectionListingLimitExceeded ? 'InputText' : 'InputCombo',
-      options: isConnectionListingLimitExceeded ? undefined : connections.map(conn => ({ value: conn.name, label: conn.name })),
+      type: isConnectionLimitExceeded ? 'text' : 'select',
+      component: isConnectionLimitExceeded ? 'InputText' : 'InputCombo',
+      options: isConnectionLimitExceeded ? undefined : connections.map(conn => ({ value: conn.name, label: conn.name })),
       onChange: onConnectionChange
     }
   };
diff --git a/server/lib/multipartRequest.js b/server/lib/multipartRequest.js
index ad29f2975..3298931f0 100644
--- a/server/lib/multipartRequest.js
+++ b/server/lib/multipartRequest.js
@@ -1,6 +1,7 @@
 import Promise from 'bluebird';
 import { ArgumentError } from 'auth0-extension-tools';
 
+export const tooManyRecords = Symbol("Record count exceeds limit");
 
 export default function(client, entity, opts = {}, fetchOptions = {} ) {
   const perPage = fetchOptions.perPage || 50;
@@ -17,7 +18,12 @@ export default function(client, entity, opts = {}, fetchOptions = {} ) {
 
   const getter = client[entity].getAll;
   const options = { ...opts, per_page: perPage };
-  const result = [];
+  const result = {
+    success: true,
+    status: "fetched records",
+    data: []
+  };
+
   let total = 0;
   let pageCount = 0;
 
@@ -25,26 +31,40 @@ export default function(client, entity, opts = {}, fetchOptions = {} ) {
     getter({ ...options, include_totals: true, page: 0 })
       .then((response) => {
         total = response.total || 0;
-        if (limit) {
-          total = Math.min(total, limit);
-        }
         pageCount = Math.ceil(total / perPage);
+
+        // if the total exceeds the limit, don't fetch any more connections from api2
+        // we get some from the initial request to get totals, but we'll ignore them
+        if (limit && (total > limit)) { 
+          pageCount = 1;
+          return null;
+        }
+
         const data = response[entity] || response || [];
-        data.forEach(item => result.push(item));
+        data.forEach(item => result.data.push(item));
         return null;
       });
 
   const getPage = (page) =>
     getter({ ...options, page })
       .then((data) => {
-        data.forEach(item => result.push(item));
+        data.forEach(item => result.data.push(item));
         return null;
       });
 
   const getAll = () =>
     getTotals()
       .then(() => {
-        if (total === 0 || result.length >= total) {
+        // the number of connections exceeds the limit we can handle:
+        //   - don't return any to the frontend
+        //   - will use a free text box in the user creation dialogue
+        if (limit && (total > limit)) { 
+          result.success = false;
+          result.status = tooManyRecords;
+          return result;
+        }
+
+        if (total === 0 || result.data.length >= total) {
           return result;
         }
 
diff --git a/server/routes/connections.js b/server/routes/connections.js
index da88f93be..a3333cca0 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -1,16 +1,32 @@
 import _ from 'lodash';
 import { Router } from 'express';
 
+import { tooManyRecords } from '../lib/multipartRequest';
+
 import multipartRequest from '../lib/multipartRequest';
-// only fetch one page of connections
-const CONNECTIONS_FETCH_LIMIT = 50;
+
+// the limit on the frontend is 20000 so we need to fetch at least as many connections as that to 
+// check if that limit is reached. If we fetch less than the frontend limit, it would always show the
+// drop down select box which would be broken for tenants with more connections than the limit. 
+const CONNECTIONS_FETCH_LIMIT = 20000;
 
 export default (scriptManager) => {
   const api = Router();
   api.get('/', (req, res, next) => {
-    multipartRequest(req.auth0, 'connections', { strategy: 'auth0', fields: 'id,name,strategy,options' }, { limit: CONNECTIONS_FETCH_LIMIT})
+    multipartRequest(
+      req.auth0,
+      'connections',
+      { strategy: 'auth0', fields: 'id,name,strategy,options' },
+      { limit: CONNECTIONS_FETCH_LIMIT, perPage: 100 }
+    )
       .then((connections) => {
-        global.connections = connections.map(conn => ({ name: conn.name, id: conn.id }));
+
+        if (!connections.success && connections.status === tooManyRecords) { 
+          console.log("got back 'too many records'");
+          global.isConnectionsLimitExceeded = true;
+        }
+        
+        global.connections = connections.data.map(conn => ({ name: conn.name, id: conn.id }));
         const settingsContext = {
           request: {
             user: req.user
@@ -20,7 +36,7 @@ export default (scriptManager) => {
 
         return scriptManager.execute('settings', settingsContext)
           .then((settings) => {
-            let result = _.chain(connections)
+            let result = _.chain(connections.data)
               .sortBy(conn => conn.name.toLowerCase())
               .value();
 

From 9079d12b65813efd1a003348e8199ea179e92dc5 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Mon, 3 Jun 2024 17:21:24 +0100
Subject: [PATCH 07/13] Use 0 connections as special case

---
 server/lib/multipartRequest.js | 16 ++++------------
 server/routes/connections.js   | 15 ++++-----------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/server/lib/multipartRequest.js b/server/lib/multipartRequest.js
index 3298931f0..46b8076e9 100644
--- a/server/lib/multipartRequest.js
+++ b/server/lib/multipartRequest.js
@@ -1,8 +1,6 @@
 import Promise from 'bluebird';
 import { ArgumentError } from 'auth0-extension-tools';
 
-export const tooManyRecords = Symbol("Record count exceeds limit");
-
 export default function(client, entity, opts = {}, fetchOptions = {} ) {
   const perPage = fetchOptions.perPage || 50;
   const concurrency = fetchOptions.concurrency || 5;
@@ -18,11 +16,7 @@ export default function(client, entity, opts = {}, fetchOptions = {} ) {
 
   const getter = client[entity].getAll;
   const options = { ...opts, per_page: perPage };
-  const result = {
-    success: true,
-    status: "fetched records",
-    data: []
-  };
+  const result = [];
 
   let total = 0;
   let pageCount = 0;
@@ -41,14 +35,14 @@ export default function(client, entity, opts = {}, fetchOptions = {} ) {
         }
 
         const data = response[entity] || response || [];
-        data.forEach(item => result.data.push(item));
+        data.forEach(item => result.push(item));
         return null;
       });
 
   const getPage = (page) =>
     getter({ ...options, page })
       .then((data) => {
-        data.forEach(item => result.data.push(item));
+        data.forEach(item => result.push(item));
         return null;
       });
 
@@ -59,12 +53,10 @@ export default function(client, entity, opts = {}, fetchOptions = {} ) {
         //   - don't return any to the frontend
         //   - will use a free text box in the user creation dialogue
         if (limit && (total > limit)) { 
-          result.success = false;
-          result.status = tooManyRecords;
           return result;
         }
 
-        if (total === 0 || result.data.length >= total) {
+        if (total === 0 || result.length >= total) {
           return result;
         }
 
diff --git a/server/routes/connections.js b/server/routes/connections.js
index a3333cca0..b721623e3 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -1,14 +1,13 @@
 import _ from 'lodash';
 import { Router } from 'express';
 
-import { tooManyRecords } from '../lib/multipartRequest';
-
 import multipartRequest from '../lib/multipartRequest';
 
 // the limit on the frontend is 20000 so we need to fetch at least as many connections as that to 
 // check if that limit is reached. If we fetch less than the frontend limit, it would always show the
 // drop down select box which would be broken for tenants with more connections than the limit. 
-const CONNECTIONS_FETCH_LIMIT = 20000;
+// const CONNECTIONS_FETCH_LIMIT = 20000;
+const CONNECTIONS_FETCH_LIMIT = 20;
 
 export default (scriptManager) => {
   const api = Router();
@@ -20,13 +19,7 @@ export default (scriptManager) => {
       { limit: CONNECTIONS_FETCH_LIMIT, perPage: 100 }
     )
       .then((connections) => {
-
-        if (!connections.success && connections.status === tooManyRecords) { 
-          console.log("got back 'too many records'");
-          global.isConnectionsLimitExceeded = true;
-        }
-        
-        global.connections = connections.data.map(conn => ({ name: conn.name, id: conn.id }));
+        global.connections = connections.map(conn => ({ name: conn.name, id: conn.id }));
         const settingsContext = {
           request: {
             user: req.user
@@ -36,7 +29,7 @@ export default (scriptManager) => {
 
         return scriptManager.execute('settings', settingsContext)
           .then((settings) => {
-            let result = _.chain(connections.data)
+            let result = _.chain(connections)
               .sortBy(conn => conn.name.toLowerCase())
               .value();
 

From 24c4d6cd19052a4c1ca08e53a4e488c82eb0351e Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Mon, 3 Jun 2024 17:24:20 +0100
Subject: [PATCH 08/13] Restore correct connections limit

---
 server/routes/connections.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/routes/connections.js b/server/routes/connections.js
index b721623e3..c670343d3 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -6,8 +6,7 @@ import multipartRequest from '../lib/multipartRequest';
 // the limit on the frontend is 20000 so we need to fetch at least as many connections as that to 
 // check if that limit is reached. If we fetch less than the frontend limit, it would always show the
 // drop down select box which would be broken for tenants with more connections than the limit. 
-// const CONNECTIONS_FETCH_LIMIT = 20000;
-const CONNECTIONS_FETCH_LIMIT = 20;
+const CONNECTIONS_FETCH_LIMIT = 20000;
 
 export default (scriptManager) => {
   const api = Router();

From 40aaf627ab8af0ea7446a649c509af78e5958631 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Mon, 3 Jun 2024 17:26:57 +0100
Subject: [PATCH 09/13] Fix commemnt

---
 server/routes/connections.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/routes/connections.js b/server/routes/connections.js
index c670343d3..4ca6f10ca 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -3,9 +3,10 @@ import { Router } from 'express';
 
 import multipartRequest from '../lib/multipartRequest';
 
-// the limit on the frontend is 20000 so we need to fetch at least as many connections as that to 
-// check if that limit is reached. If we fetch less than the frontend limit, it would always show the
-// drop down select box which would be broken for tenants with more connections than the limit. 
+// This is the number of connections in a tenant which the DAE can reasonably handle. More than this and it fails to
+// finish loading connections and the "create user" button is never shown. If there are more connections than this
+// in the tenant, we will return zero connections to the front end, and it will use a free text box for connection name
+// in the create user dialogue. 
 const CONNECTIONS_FETCH_LIMIT = 20000;
 
 export default (scriptManager) => {

From a56873045eaeb67f2339f4c340b0b197cb22601e Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Mon, 3 Jun 2024 18:34:34 +0100
Subject: [PATCH 10/13] Fix failing test

---
 server/lib/multipartRequest.js               | 2 ++
 server/routes/connections.js                 | 4 ++--
 tests/client/utils/useDefaultFields.tests.js | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/lib/multipartRequest.js b/server/lib/multipartRequest.js
index 46b8076e9..8cbde8bdb 100644
--- a/server/lib/multipartRequest.js
+++ b/server/lib/multipartRequest.js
@@ -21,6 +21,8 @@ export default function(client, entity, opts = {}, fetchOptions = {} ) {
   let total = 0;
   let pageCount = 0;
 
+  console.log({options})
+
   const getTotals = () =>
     getter({ ...options, include_totals: true, page: 0 })
       .then((response) => {
diff --git a/server/routes/connections.js b/server/routes/connections.js
index 4ca6f10ca..fb75d52f1 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -7,7 +7,7 @@ import multipartRequest from '../lib/multipartRequest';
 // finish loading connections and the "create user" button is never shown. If there are more connections than this
 // in the tenant, we will return zero connections to the front end, and it will use a free text box for connection name
 // in the create user dialogue. 
-const CONNECTIONS_FETCH_LIMIT = 20000;
+const CONNECTIONS_FETCH_LIMIT = 200;
 
 export default (scriptManager) => {
   const api = Router();
@@ -16,7 +16,7 @@ export default (scriptManager) => {
       req.auth0,
       'connections',
       { strategy: 'auth0', fields: 'id,name,strategy,options' },
-      { limit: CONNECTIONS_FETCH_LIMIT, perPage: 100 }
+      { limit: CONNECTIONS_FETCH_LIMIT, perPage: 20 }
     )
       .then((connections) => {
         global.connections = connections.map(conn => ({ name: conn.name, id: conn.id }));
diff --git a/tests/client/utils/useDefaultFields.tests.js b/tests/client/utils/useDefaultFields.tests.js
index 25dd4cbc8..f3b4558dc 100644
--- a/tests/client/utils/useDefaultFields.tests.js
+++ b/tests/client/utils/useDefaultFields.tests.js
@@ -321,7 +321,7 @@ describe('Client-Utils-useDefaultFields', () => {
       }];
       const target = [];
 
-      useDefaultFields.useConnectionsField(true, fields, []);
+      useDefaultFields.useConnectionsField(true, fields, connection);
       expect(fields).to.deep.equal(target);
     });
 

From 9b05ec7ace975966fad1d601d5e1edcd00dd6447 Mon Sep 17 00:00:00 2001
From: Umut Benzer <umut@benzer.dev>
Date: Tue, 4 Jun 2024 10:51:13 +0200
Subject: [PATCH 11/13] Improve the way create user button is handled. Set
 connection cutoff to its final value

---
 client/containers/Users/Users.jsx | 10 +++++++---
 server/lib/multipartRequest.js    |  2 --
 server/routes/connections.js      |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/containers/Users/Users.jsx b/client/containers/Users/Users.jsx
index e3140ff54..da5768b6b 100644
--- a/client/containers/Users/Users.jsx
+++ b/client/containers/Users/Users.jsx
@@ -15,6 +15,7 @@ import './Users.styles.css';
 class Users extends Component {
   static propTypes = {
     loading: PropTypes.bool.isRequired,
+    connectionsLoading: PropTypes.bool.isRequired,
     error: PropTypes.string,
     users: PropTypes.array,
     connections: PropTypes.array,
@@ -44,7 +45,9 @@ class Users extends Component {
 
   componentWillMount = () => {
     this.props.fetchUsers();
-    this.props.fetchConnections();
+    if (!this.props.connectionsLoading) {
+      this.props.fetchConnections();
+    }
   };
 
   onPageChange = (page) => {
@@ -77,7 +80,7 @@ class Users extends Component {
       error,
       users,
       total,
-      connections,
+      connectionsLoading,
       accessLevel,
       nextPage,
       pages,
@@ -102,7 +105,7 @@ class Users extends Component {
         <div className="row content-header">
           <div className="col-xs-12 user-table-content">
             <h1>{languageDictionary.usersTitle || 'Users'}</h1>
-            {( role > 0 && showCreateUser) ?
+            {( !connectionsLoading && role > 0 && showCreateUser) ?
               <button id="create-user-button" className="btn btn-success pull-right new" onClick={this.createUser}>
                 <i className="icon-budicon-473"></i>
                 {languageDictionary.createUserButtonText || 'Create User'}
@@ -158,6 +161,7 @@ function mapStateToProps(state) {
     loading: state.users.get('loading'),
     users: state.users.get('records').toJS(),
     connections: state.connections.get('records').toJS(),
+    connectionsLoading: state.connections.get('loading'),
     total: state.users.get('total'),
     nextPage: state.users.get('nextPage'),
     pages: state.users.get('pages'),
diff --git a/server/lib/multipartRequest.js b/server/lib/multipartRequest.js
index 8cbde8bdb..46b8076e9 100644
--- a/server/lib/multipartRequest.js
+++ b/server/lib/multipartRequest.js
@@ -21,8 +21,6 @@ export default function(client, entity, opts = {}, fetchOptions = {} ) {
   let total = 0;
   let pageCount = 0;
 
-  console.log({options})
-
   const getTotals = () =>
     getter({ ...options, include_totals: true, page: 0 })
       .then((response) => {
diff --git a/server/routes/connections.js b/server/routes/connections.js
index fb75d52f1..58d455a91 100644
--- a/server/routes/connections.js
+++ b/server/routes/connections.js
@@ -6,8 +6,8 @@ import multipartRequest from '../lib/multipartRequest';
 // This is the number of connections in a tenant which the DAE can reasonably handle. More than this and it fails to
 // finish loading connections and the "create user" button is never shown. If there are more connections than this
 // in the tenant, we will return zero connections to the front end, and it will use a free text box for connection name
-// in the create user dialogue. 
-const CONNECTIONS_FETCH_LIMIT = 200;
+// in the create user dialogue.
+const CONNECTIONS_FETCH_LIMIT = 20000;
 
 export default (scriptManager) => {
   const api = Router();
@@ -16,7 +16,7 @@ export default (scriptManager) => {
       req.auth0,
       'connections',
       { strategy: 'auth0', fields: 'id,name,strategy,options' },
-      { limit: CONNECTIONS_FETCH_LIMIT, perPage: 20 }
+      { limit: CONNECTIONS_FETCH_LIMIT, perPage: 100 }
     )
       .then((connections) => {
         global.connections = connections.map(conn => ({ name: conn.name, id: conn.id }));

From f85342327ee99cc28e403acb6d534cddc64e6a83 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Tue, 4 Jun 2024 11:05:57 +0100
Subject: [PATCH 12/13] Fix failing test

---
 tests/client/utils/useDefaultFields.tests.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/client/utils/useDefaultFields.tests.js b/tests/client/utils/useDefaultFields.tests.js
index f3b4558dc..11e2b492c 100644
--- a/tests/client/utils/useDefaultFields.tests.js
+++ b/tests/client/utils/useDefaultFields.tests.js
@@ -247,13 +247,24 @@ describe('Client-Utils-useDefaultFields', () => {
 
     it('empty array population skip', () => {
       const fields = [];
-      const target = [];
+      const target1 = [{
+        property: 'connection',
+        label: 'Connection Name',
+        edit: {
+          required: true,
+          type: 'text',
+          component: 'InputText',
+          options: undefined,
+          onChange: undefined
+        }
+      }];
+      const target2 = [];
 
       useDefaultFields.useConnectionsField(true, fields, []);
-      expect(fields).to.deep.equal(target);
+      expect(fields).to.deep.equal(target1);
 
       useDefaultFields.useConnectionsField(true, fields, connection);
-      expect(fields).to.deep.equal(target);
+      expect(fields).to.deep.equal(target2);
     });
 
     it('pre populated array', () => {

From de76206903b2ec9363c671e334f092bd4c2bb003 Mon Sep 17 00:00:00 2001
From: Tim Saunders <tim.saunders@okta.com>
Date: Tue, 4 Jun 2024 11:57:47 +0100
Subject: [PATCH 13/13] Fix test

---
 tests/client/components/Users/UserForm.tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/client/components/Users/UserForm.tests.js b/tests/client/components/Users/UserForm.tests.js
index d659c9cd8..9ed655e0f 100644
--- a/tests/client/components/Users/UserForm.tests.js
+++ b/tests/client/components/Users/UserForm.tests.js
@@ -249,7 +249,7 @@ describe('#Client-Components-UserForm', () => {
       someOtherKey: 'Some other value'
     };
 
-    const Component = renderComponent(languageDictionary);
+    const Component = renderComponent(everythingOptions, languageDictionary);
 
     expect(Component.length).to.be.greaterThan(0);
     expect(Component.find(Button).filterWhere(element => element.text() === 'Cancel').length).to.equal(1);