@zengenti/contensis-react-base 3.0.0-beta.21 → 3.0.0-beta.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/cjs/{App-9522e75e.js → App-ce39a877.js} +6 -6
  2. package/cjs/{App-9522e75e.js.map → App-ce39a877.js.map} +1 -1
  3. package/cjs/{RouteLoader-0f7fb3d8.js → RouteLoader-2ed14766.js} +2 -2
  4. package/cjs/{RouteLoader-0f7fb3d8.js.map → RouteLoader-2ed14766.js.map} +1 -1
  5. package/cjs/{ToJs-5da8a85e.js → ToJs-09204afd.js} +17 -12
  6. package/cjs/ToJs-09204afd.js.map +1 -0
  7. package/cjs/client.js +6 -6
  8. package/cjs/contensis-react-base.js +6 -6
  9. package/cjs/{login-2346691a.js → login-d67b82aa.js} +88 -51
  10. package/cjs/login-d67b82aa.js.map +1 -0
  11. package/cjs/{reducers-60dafd94.js → reducers-3a4f8971.js} +25 -24
  12. package/cjs/reducers-3a4f8971.js.map +1 -0
  13. package/cjs/redux.js +2 -2
  14. package/cjs/routing.js +2 -2
  15. package/cjs/search.js +7 -4
  16. package/cjs/search.js.map +1 -1
  17. package/cjs/user.js +19 -10
  18. package/cjs/user.js.map +1 -1
  19. package/cjs/{version-270b678d.js → version-7c4ce67e.js} +2 -2
  20. package/cjs/{version-270b678d.js.map → version-7c4ce67e.js.map} +1 -1
  21. package/esm/{App-b320f938.js → App-0d28106a.js} +6 -6
  22. package/esm/{App-b320f938.js.map → App-0d28106a.js.map} +1 -1
  23. package/esm/{RouteLoader-31425b61.js → RouteLoader-d4b4d320.js} +2 -2
  24. package/esm/{RouteLoader-31425b61.js.map → RouteLoader-d4b4d320.js.map} +1 -1
  25. package/esm/{ToJs-1f2e6395.js → ToJs-2627ce21.js} +16 -10
  26. package/esm/ToJs-2627ce21.js.map +1 -0
  27. package/esm/client.js +7 -7
  28. package/esm/contensis-react-base.js +7 -7
  29. package/esm/{login-af3b93c4.js → login-f6dfbe1b.js} +88 -51
  30. package/esm/login-f6dfbe1b.js.map +1 -0
  31. package/esm/{reducers-6f6801ed.js → reducers-8e5d6232.js} +25 -24
  32. package/esm/reducers-8e5d6232.js.map +1 -0
  33. package/esm/redux.js +3 -3
  34. package/esm/routing.js +2 -2
  35. package/esm/search.js +7 -4
  36. package/esm/search.js.map +1 -1
  37. package/esm/user.js +21 -12
  38. package/esm/user.js.map +1 -1
  39. package/esm/{version-be00bbb4.js → version-e6a545e1.js} +2 -2
  40. package/esm/{version-be00bbb4.js.map → version-e6a545e1.js.map} +1 -1
  41. package/models/redux/appstate.d.ts +5 -6
  42. package/models/search/models/SearchActions.d.ts +1 -0
  43. package/models/search/models/index.d.ts +1 -0
  44. package/models/search/redux/sagas.d.ts +2 -2
  45. package/models/search/redux/selectors.d.ts +1 -0
  46. package/models/user/components/Login.d.ts +1 -2
  47. package/models/user/components/LoginForm.d.ts +1 -2
  48. package/models/user/hocs/withLogin.d.ts +2 -2
  49. package/models/user/hooks/useLogin.d.ts +5 -3
  50. package/models/user/redux/reducers.d.ts +4 -5
  51. package/models/user/redux/sagas/login.d.ts +11 -8
  52. package/models/user/redux/selectors.d.ts +7 -2
  53. package/models/user/util/LoginHelper.class.d.ts +4 -3
  54. package/package-lock.json +2 -2
  55. package/package.json +1 -1
  56. package/cjs/ToJs-5da8a85e.js.map +0 -1
  57. package/cjs/login-2346691a.js.map +0 -1
  58. package/cjs/reducers-60dafd94.js.map +0 -1
  59. package/esm/ToJs-1f2e6395.js.map +0 -1
  60. package/esm/login-af3b93c4.js.map +0 -1
  61. package/esm/reducers-6f6801ed.js.map +0 -1
@@ -15,9 +15,9 @@ import serialize from 'serialize-javascript';
15
15
  import minifyCssString from 'minify-css-string';
16
16
  import mapJson from 'jsonpath-mapper';
17
17
  import { ChunkExtractor, ChunkExtractorManager } from '@loadable/server';
18
- import { c as createStore, s as setVersionStatus, a as setVersion } from './version-be00bbb4.js';
19
- import { h as history, d as deliveryApi, p as pickProject, r as rootSaga } from './App-b320f938.js';
20
- export { A as ReactApp } from './App-b320f938.js';
18
+ import { c as createStore, s as setVersionStatus, a as setVersion } from './version-e6a545e1.js';
19
+ import { h as history, d as deliveryApi, p as pickProject, r as rootSaga } from './App-0d28106a.js';
20
+ export { A as ReactApp } from './App-0d28106a.js';
21
21
  import { s as setCurrentProject } from './actions-5437f43d.js';
22
22
  import { s as selectSurrogateKeys, a as selectRouteEntry, b as selectCurrentProject, g as getImmutableOrJS } from './selectors-65f0f31c.js';
23
23
  import '@redux-saga/core/effects';
@@ -27,18 +27,18 @@ import 'redux-saga';
27
27
  import 'redux-injectors';
28
28
  import 'immer';
29
29
  import 'deepmerge';
30
- import './reducers-6f6801ed.js';
30
+ import './reducers-8e5d6232.js';
31
31
  import 'history';
32
32
  import 'contensis-delivery-api';
33
33
  import './version-696796d7.js';
34
34
  import 'loglevel';
35
- import './login-af3b93c4.js';
36
- import './ToJs-1f2e6395.js';
35
+ import './login-f6dfbe1b.js';
36
+ import './ToJs-2627ce21.js';
37
37
  import 'await-to-js';
38
38
  import 'js-cookie';
39
39
  import 'react-hot-loader';
40
40
  import 'query-string';
41
- import './RouteLoader-31425b61.js';
41
+ import './RouteLoader-d4b4d320.js';
42
42
  import 'reselect';
43
43
 
44
44
  const servers$1 = SERVERS;
@@ -1,6 +1,6 @@
1
1
  import { takeEvery, put, call, select } from '@redux-saga/core/effects';
2
- import { L as LOGIN_USER, n as LOGOUT_USER, V as VALIDATE_USER, S as SET_AUTHENTICATION_STATE } from './reducers-6f6801ed.js';
3
- import { a as selectUserIsAuthenticated, b as selectUserGroups, m as matchUserGroup, s as selectClientCredentials } from './ToJs-1f2e6395.js';
2
+ import { L as LOGIN_USER, n as LOGOUT_USER, V as VALIDATE_USER, S as SET_AUTHENTICATION_STATE } from './reducers-8e5d6232.js';
3
+ import { a as selectUserIsAuthenticated, b as selectUserGroups, m as matchUserGroup, s as selectClientCredentials } from './ToJs-2627ce21.js';
4
4
  import { f as setRoute } from './actions-5437f43d.js';
5
5
  import { q as queryParams, i as selectCurrentSearch } from './selectors-65f0f31c.js';
6
6
  import mapJson from 'jsonpath-mapper';
@@ -164,6 +164,21 @@ class LoginHelper {
164
164
  static ClearCachedCredentials() {
165
165
  CookieHelper.DeleteCookie(LOGIN_COOKIE);
166
166
  CookieHelper.DeleteCookie(REFRESH_TOKEN_COOKIE);
167
+
168
+ if (LoginHelper.WSFED_LOGIN && typeof window !== 'undefined') {
169
+ // remove any oidc keys left over in localStorage
170
+ const {
171
+ localStorage
172
+ } = window;
173
+ const keys = [];
174
+
175
+ for (let i = 0; i < localStorage.length; i++) {
176
+ const key = localStorage.key(i);
177
+ if (typeof key === 'string' && key.startsWith('oidc.')) keys.push(localStorage.key(i));
178
+ }
179
+
180
+ keys.forEach(key => localStorage.removeItem(key));
181
+ }
167
182
  }
168
183
 
169
184
  static async LoginUser({
@@ -173,10 +188,10 @@ class LoginHelper {
173
188
  }) {
174
189
  let credentials = clientCredentials;
175
190
  let authenticationState = {
176
- authenticated: false,
177
- authenticationError: false,
178
- error: false,
179
- clientCredentials: null
191
+ clientCredentials: null,
192
+ isAuthenticated: false,
193
+ isAuthenticationError: false,
194
+ isError: false
180
195
  };
181
196
  let transientClient;
182
197
  let user;
@@ -191,14 +206,12 @@ class LoginHelper {
191
206
  const [loginError, clientBearerToken] = await to(transientClient.ensureBearerToken()); // Problem getting token with username and password
192
207
 
193
208
  if (loginError) {
194
- const authenticationError = loginError.name.includes('ContensisAuthenticationError');
195
209
  authenticationState = {
196
- authenticated: false,
197
- authenticationError: authenticationError,
198
- authenticationErrorMessage: authenticationError && loginError.message || null,
199
- error: !authenticationError,
200
- errorMessage: !authenticationError && loginError.message || null,
201
- clientCredentials: null
210
+ clientCredentials: null,
211
+ errorMessage: loginError.message || null,
212
+ isAuthenticated: false,
213
+ isAuthenticationError: loginError.name.includes('ContensisAuthenticationError'),
214
+ isError: true
202
215
  };
203
216
  LoginHelper.ClearCachedCredentials();
204
217
  } // Got a token using username and password
@@ -209,10 +222,10 @@ class LoginHelper {
209
222
  credentials = mapClientCredentials(transientClient);
210
223
  LoginHelper.SetLoginCookies(credentials);
211
224
  authenticationState = {
212
- authenticated: true,
213
- authenticationError: false,
214
- error: false,
215
- clientCredentials: credentials
225
+ clientCredentials: credentials,
226
+ isAuthenticated: true,
227
+ isAuthenticationError: false,
228
+ isError: false
216
229
  };
217
230
  }
218
231
  } // If we have credentials supplied by a successful username and password login
@@ -226,13 +239,11 @@ class LoginHelper {
226
239
 
227
240
  if (error) {
228
241
  authenticationState = {
229
- authenticated: false,
230
- authenticationError: false,
231
- error: {
232
- message: error.message,
233
- stack: error.stack
234
- },
235
- clientCredentials: null
242
+ clientCredentials: null,
243
+ errorMessage: error.message,
244
+ isAuthenticated: false,
245
+ isAuthenticationError: false,
246
+ isError: true
236
247
  };
237
248
  LoginHelper.ClearCachedCredentials();
238
249
  } else {
@@ -241,10 +252,10 @@ class LoginHelper {
241
252
  LoginHelper.SetLoginCookies(latestCredentials);
242
253
  user = userDetails;
243
254
  authenticationState = {
244
- authenticated: true,
245
- authenticationError: false,
246
- error: false,
247
- clientCredentials: latestCredentials
255
+ clientCredentials: latestCredentials,
256
+ isAuthenticated: true,
257
+ isAuthenticationError: false,
258
+ isError: false
248
259
  };
249
260
  }
250
261
  }
@@ -316,6 +327,16 @@ class LoginHelper {
316
327
  });
317
328
  }
318
329
 
330
+ static RemoveSecurityTokenQuery() {
331
+ const params = new URLSearchParams(window.location.search);
332
+
333
+ if (params.has('securitytoken') || params.has('securityToken')) {
334
+ params.delete('securitytoken');
335
+ params.delete('securityToken');
336
+ window.location = `${window.location.pathname}${params.toString() ? `?${params}` : ''}`;
337
+ }
338
+ }
339
+
319
340
  static async WsFedLogout(redirectPath) {
320
341
  await fetch(`${LoginHelper.CMS_URL}/authenticate/logout?jsonResponseRequired=true`, {
321
342
  credentials: 'include'
@@ -323,6 +344,10 @@ class LoginHelper {
323
344
 
324
345
  if (redirectPath) {
325
346
  window.location = redirectPath;
347
+ } else {
348
+ // Explicitly check and remove any stale
349
+ // security token that may be in the query string
350
+ LoginHelper.RemoveSecurityTokenQuery();
326
351
  }
327
352
  }
328
353
 
@@ -482,32 +507,45 @@ function* handleRequiresLoginSaga(action) {
482
507
  function* validateUserSaga({
483
508
  securityToken
484
509
  }) {
485
- if (securityToken) {
486
- // If we have just a security token we will call a CMS endpoint
510
+ // Check for refreshToken in cookies
511
+ let clientCredentials = LoginHelper.GetCachedCredentials();
512
+
513
+ if (securityToken || clientCredentials.refreshToken) {
514
+ // We only attempt to validate the user if one of the stored
515
+ // tokens are found, in this case we set loading state manually
516
+ // so we don't need to set and unset loading if there are no stored
517
+ yield put({
518
+ type: SET_AUTHENTICATION_STATE,
519
+ authenticationState: {
520
+ isLoading: true
521
+ }
522
+ }); // If we have just a security token we will call a CMS endpoint
487
523
  // and provide us with a RefreshToken cookie we can use during login
524
+
488
525
  const [error, refreshToken] = yield LoginHelper.GetCredentialsForSecurityToken(securityToken);
489
- if (refreshToken) LoginHelper.SetLoginCookies({
490
- contensisClassicToken: securityToken,
491
- refreshToken
492
- });
493
- if (error) yield put({
526
+
527
+ if (refreshToken) {
528
+ // Set cookies and reload values
529
+ LoginHelper.SetLoginCookies({
530
+ contensisClassicToken: securityToken,
531
+ refreshToken
532
+ });
533
+ clientCredentials = LoginHelper.GetCachedCredentials();
534
+ } // Log the user in if a refreshToken is found
535
+
536
+
537
+ if (clientCredentials.refreshToken) yield call(loginUserSaga, {
538
+ clientCredentials
539
+ });else if (error) yield put({
494
540
  type: SET_AUTHENTICATION_STATE,
495
541
  authenticationState: {
496
- error: {
497
- message: error.message,
498
- stack: error.stack
499
- }
542
+ isError: true,
543
+ errorMessage: (error === null || error === void 0 ? void 0 : error.message) || error && 'toString' in error && error.toString()
500
544
  }
501
545
  });
502
- } // Check for refreshToken in cookies
546
+ } // Tell any callers have we successfully logged in?
503
547
 
504
548
 
505
- const clientCredentials = LoginHelper.GetCachedCredentials(); // Log the user in if a refreshToken is found
506
-
507
- if (clientCredentials.refreshToken) yield call(loginUserSaga, {
508
- clientCredentials
509
- }); // Tell any callers have we successfully logged in?
510
-
511
549
  return yield select(selectUserIsAuthenticated);
512
550
  }
513
551
 
@@ -577,15 +615,14 @@ function* refreshSecurityToken() {
577
615
  if (Object.keys(clientCredentials).length > 0) {
578
616
  const client = yield getManagementApiClient(clientCredentials);
579
617
  yield client.authenticate();
580
- const authenticationState = {};
581
- const newClientCredentials = mapClientCredentials(client);
582
- authenticationState.clientCredentials = newClientCredentials;
583
618
  yield put({
584
619
  type: SET_AUTHENTICATION_STATE,
585
- authenticationState
620
+ authenticationState: {
621
+ clientCredentials: mapClientCredentials(client)
622
+ }
586
623
  });
587
624
  }
588
625
  }
589
626
 
590
627
  export { LoginHelper as L, findContentTypeMapping as f, getManagementApiClient as g, handleRequiresLoginSaga as h, loginSagas as l, refreshSecurityToken as r };
591
- //# sourceMappingURL=login-af3b93c4.js.map
628
+ //# sourceMappingURL=login-f6dfbe1b.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"login-f6dfbe1b.js","sources":["../src/routing/util/find-contenttype-mapping.ts","../src/user/transformations/mapClientCredentials.js","../src/user/util/ContensisManagementApi.js","../src/user/util/CookieHelper.class.js","../src/user/util/OidcUserManager.js","../src/user/util/LoginHelper.class.js","../src/user/redux/sagas/login.js"],"sourcesContent":["import { ContentTypeMapping } from '../routes';\n\nexport const findContentTypeMapping = (\n ContentTypeMappings: ContentTypeMapping[],\n contentTypeId: string\n) => ContentTypeMappings.find(ct => ct.contentTypeID === contentTypeId);\n","import { mapJson } from '~/util/json-mapper';\n\nconst clientCredentials = {\n bearerToken: 'bearerToken',\n bearerTokenExpiryDate: ({ bearerTokenExpiryDate }) =>\n bearerTokenExpiryDate.toISOString(),\n refreshToken: 'refreshToken',\n refreshTokenExpiryDate: ({ refreshTokenExpiryDate }) =>\n refreshTokenExpiryDate.toISOString(),\n contensisClassicToken: 'contensisClassicToken',\n};\nexport default obj => mapJson(obj, clientCredentials);\n","// import { Client } from 'contensis-management-api';\n\nexport const getManagementApiClient = async ({\n bearerToken,\n bearerTokenExpiryDate,\n refreshToken,\n refreshTokenExpiryDate,\n contensisClassicToken,\n username,\n password,\n}) => {\n const rootUrl = SERVERS.api || SERVERS.cms; /* global SERVERS */\n const projectId = PROJECTS[0].id; /* global PROJECTS */\n\n let config = {};\n if (refreshToken) {\n config = {\n clientType: 'contensis_classic_refresh_token',\n clientDetails: {\n refreshToken,\n },\n };\n } else {\n config = {\n clientType: 'contensis_classic',\n clientDetails: {\n username,\n password,\n },\n };\n }\n const { Client } = await import('contensis-management-api');\n\n const client = Client.create({\n ...config,\n projectId,\n rootUrl,\n });\n\n if (bearerToken) client.bearerToken = bearerToken;\n if (bearerTokenExpiryDate)\n client.bearerTokenExpiryDate = bearerTokenExpiryDate;\n if (refreshToken) client.refreshToken = refreshToken;\n if (refreshTokenExpiryDate)\n client.refreshTokenExpiryDate = refreshTokenExpiryDate;\n if (contensisClassicToken)\n client.contensisClassicToken = contensisClassicToken;\n\n return client;\n};\n","import Cookies from 'js-cookie';\n\nconst COOKIE_VALID_DAYS = 1; // 0 = Session cookie\n\n// Override the default js-cookie conversion / encoding\n// methods so the written values work with Contensis sites\nconst _cookie = Cookies.withConverter({\n read: value => decodeURIComponent(value),\n write: value => encodeURIComponent(value),\n});\n\nexport class CookieHelper {\n static GetCookie(name) {\n let cookie = _cookie.get(name);\n if (typeof cookie == 'undefined') {\n return null;\n }\n return cookie;\n }\n\n static SetCookie(name, value, maxAgeDays = COOKIE_VALID_DAYS) {\n maxAgeDays === 0\n ? _cookie.set(name, value)\n : _cookie.set(name, value, { expires: maxAgeDays });\n }\n\n static DeleteCookie(name) {\n _cookie.remove(name);\n }\n}\n","const context = typeof window != 'undefined' ? window : global;\nconst requireOidc =\n process.env.NODE_ENV === 'development'\n ? WSFED_LOGIN === 'true' /* global WSFED_LOGIN */\n : context.WSFED_LOGIN === 'true';\n\nconst servers = SERVERS; /* global SERVERS */\n\nexport const userManagerConfig =\n typeof window !== 'undefined'\n ? {\n authority: `${servers.cms}/authenticate/`,\n client_id: 'WebsiteAdfsClient',\n redirect_uri: window.location.toString(),\n post_logout_redirect_uri: window.location.toString(),\n response_type: 'id_token',\n scope: 'openid',\n filterProtocolClaims: false,\n }\n : {};\n\nexport const createUserManager = async config => {\n if (typeof window !== 'undefined' && requireOidc) {\n try {\n const { UserManager } = await import(\n /* webpackChunkName: \"oidcclient\" */ 'oidc-client'\n );\n return new UserManager(config);\n } catch (e) {\n // eslint-disable-next-line no-console\n console.log('Exception in createUserManager: ', e);\n }\n } else return {};\n};\n\n//const userManager = createUserManager(userManagerConfig);\n\n// export default userManager;\n","/* eslint-disable require-atomic-updates */\nimport { getManagementApiClient } from './ContensisManagementApi';\nimport { to } from 'await-to-js';\n\nimport { CookieHelper } from './CookieHelper.class';\n\nimport mapClientCredentials from '../transformations/mapClientCredentials';\nimport { createUserManager, userManagerConfig } from './OidcUserManager';\n\nexport const LOGIN_COOKIE = 'ContensisCMSUserName';\nexport const REFRESH_TOKEN_COOKIE = 'RefreshToken';\n\nconst context = typeof window != 'undefined' ? window : global;\n\nexport class LoginHelper {\n static CMS_URL = SERVERS.cms /* global SERVERS */;\n static WSFED_LOGIN =\n process.env.NODE_ENV === 'development'\n ? WSFED_LOGIN === 'true' /* global WSFED_LOGIN */\n : context.WSFED_LOGIN === 'true';\n static LOGIN_ROUTE = '/account/login';\n static ACCESS_DENIED_ROUTE = '/account/access-denied';\n\n static SetLoginCookies({ contensisClassicToken, refreshToken }) {\n console.info(\n 'SetLoginCookies:',\n LOGIN_COOKIE,\n contensisClassicToken,\n REFRESH_TOKEN_COOKIE,\n refreshToken\n );\n if (contensisClassicToken)\n CookieHelper.SetCookie(LOGIN_COOKIE, contensisClassicToken);\n if (refreshToken)\n CookieHelper.SetCookie(REFRESH_TOKEN_COOKIE, refreshToken);\n }\n\n static GetCachedCredentials() {\n return {\n bearerToken: null,\n bearerTokenExpiryDate: null,\n refreshToken: CookieHelper.GetCookie(REFRESH_TOKEN_COOKIE),\n refreshTokenExpiryDate: null,\n contensisClassicToken: CookieHelper.GetCookie(LOGIN_COOKIE),\n };\n }\n\n static ClearCachedCredentials() {\n CookieHelper.DeleteCookie(LOGIN_COOKIE);\n CookieHelper.DeleteCookie(REFRESH_TOKEN_COOKIE);\n\n if (LoginHelper.WSFED_LOGIN && typeof window !== 'undefined') {\n // remove any oidc keys left over in localStorage\n const { localStorage } = window;\n const keys = [];\n for (let i = 0; i < localStorage.length; i++) {\n const key = localStorage.key(i);\n if (typeof key === 'string' && key.startsWith('oidc.'))\n keys.push(localStorage.key(i));\n }\n keys.forEach(key => localStorage.removeItem(key));\n }\n }\n\n static async LoginUser({ username, password, clientCredentials }) {\n let credentials = clientCredentials;\n let authenticationState = {\n clientCredentials: null,\n isAuthenticated: false,\n isAuthenticationError: false,\n isError: false,\n };\n let transientClient;\n let user;\n\n if (username && password) {\n // Get a management client with username and password\n transientClient = await getManagementApiClient({\n username,\n password,\n });\n\n // Ensure the client has requested a bearer token\n const [loginError, clientBearerToken] = await to(\n transientClient.ensureBearerToken()\n );\n\n // Problem getting token with username and password\n if (loginError) {\n authenticationState = {\n clientCredentials: null,\n errorMessage: loginError.message || null,\n isAuthenticated: false,\n isAuthenticationError: loginError.name.includes(\n 'ContensisAuthenticationError'\n ),\n isError: true,\n };\n LoginHelper.ClearCachedCredentials();\n }\n\n // Got a token using username and password\n if (clientBearerToken) {\n // Set credentials so we can continue to GetUserDetails\n credentials = mapClientCredentials(transientClient);\n LoginHelper.SetLoginCookies(credentials);\n authenticationState = {\n clientCredentials: credentials,\n isAuthenticated: true,\n isAuthenticationError: false,\n isError: false,\n };\n }\n }\n\n // If we have credentials supplied by a successful username and password login\n // or clientCredentials supplied in the options argument we can continue to\n // fetch the user's details\n if (credentials) {\n const client =\n transientClient || (await getManagementApiClient(credentials));\n const [error, userDetails] = await LoginHelper.GetUserDetails(client);\n\n if (error) {\n authenticationState = {\n clientCredentials: null,\n errorMessage: error.message,\n isAuthenticated: false,\n isAuthenticationError: false,\n isError: true,\n };\n LoginHelper.ClearCachedCredentials();\n } else {\n // Ensure we get latest refreshToken and contensisClassicToken from the latest client\n const latestCredentials = mapClientCredentials(client);\n LoginHelper.SetLoginCookies(latestCredentials);\n\n user = userDetails;\n authenticationState = {\n clientCredentials: latestCredentials,\n isAuthenticated: true,\n isAuthenticationError: false,\n isError: false,\n };\n }\n }\n\n return { authenticationState, user };\n }\n\n static GetUserDetails = async client => {\n let userError,\n groupsError,\n user = {},\n groupsResult;\n\n [userError, user] = await to(client.security.users.getCurrent());\n if (user && user.id) {\n [groupsError, groupsResult] = await to(\n client.security.users.getUserGroups({\n userId: user.id,\n includeInherited: true,\n })\n );\n // Set groups attribute in user object to be the items\n // array from the getUserGroups result\n if (groupsResult && groupsResult.items) user.groups = groupsResult.items;\n\n //If groups call fails then log the error but allow the user to login still\n // eslint-disable-next-line no-console\n if (groupsError) console.log(groupsError);\n }\n return [userError, user];\n };\n\n static LogoutUser(redirectPath) {\n LoginHelper.ClearCachedCredentials();\n if (LoginHelper.WSFED_LOGIN) {\n LoginHelper.WsFedLogout(redirectPath);\n } else {\n if (redirectPath) LoginHelper.ClientRedirectToPath(redirectPath);\n else LoginHelper.ClientRedirectToSignInPage();\n }\n }\n\n static ClientRedirectToHome(location) {\n if (typeof window != 'undefined') {\n let url = '/';\n if (location) {\n const { search, hash } = location;\n url = search ? `${url}${search}` : url;\n url = hash ? `${url}${hash}` : url;\n }\n window.location.href = url;\n }\n }\n\n static async ClientRedirectToSignInPage(redirectPath) {\n if (LoginHelper.WSFED_LOGIN) {\n await LoginHelper.WsFedLogout();\n await LoginHelper.WsFedLogin();\n } else {\n // Standard Contensis Login\n let url = LoginHelper.LOGIN_ROUTE;\n if (typeof redirectPath === 'string')\n url = `${url}?redirect_uri=${redirectPath}`;\n if (\n typeof location !== 'undefined' &&\n redirectPath !== LoginHelper.LOGIN_ROUTE\n )\n location.replace(url);\n }\n }\n\n static ClientRedirectToAccessDeniedPage(originalPath) {\n let url = LoginHelper.ACCESS_DENIED_ROUTE;\n if (originalPath === url) return;\n\n if (typeof originalPath === 'string')\n url = `${url}?original_uri=${originalPath}`;\n if (typeof location !== 'undefined') location.href = url;\n }\n\n static ClientRedirectToPath(redirectPath) {\n if (typeof redirectPath === 'string') {\n if (typeof location !== 'undefined') window.location.href = redirectPath;\n } else LoginHelper.ClientRedirectToHome();\n }\n\n static async WsFedLogin(redirectUri) {\n const userManager = await createUserManager(userManagerConfig);\n userManager.signinRedirect({\n scope: 'openid',\n response_type: 'id_token',\n redirect_uri: redirectUri || window.location.toString(),\n });\n }\n\n static RemoveSecurityTokenQuery() {\n const params = new URLSearchParams(window.location.search);\n if (params.has('securitytoken') || params.has('securityToken')) {\n params.delete('securitytoken');\n params.delete('securityToken');\n window.location = `${window.location.pathname}${\n params.toString() ? `?${params}` : ''\n }`;\n }\n }\n\n static async WsFedLogout(redirectPath) {\n await fetch(\n `${LoginHelper.CMS_URL}/authenticate/logout?jsonResponseRequired=true`,\n {\n credentials: 'include',\n }\n );\n if (redirectPath) {\n window.location = redirectPath;\n } else {\n // Explicitly check and remove any stale\n // security token that may be in the query string\n LoginHelper.RemoveSecurityTokenQuery();\n }\n }\n\n static async GetCredentialsForSecurityToken(securityToken) {\n const [error, response] = await to(\n fetch(`${LoginHelper.CMS_URL}/REST/Contensis/Security/IsAuthenticated`, {\n method: 'POST',\n headers: {\n Accept: 'application/json',\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify({\n securityToken: encodeURIComponent(securityToken),\n }),\n })\n );\n if (error) return [{ message: 'Failed to fetch credentials' }];\n if (response.ok) {\n const [parseError, body] = await to(response.json());\n if (parseError) return [parseError];\n\n const { LogonResult, ApplicationData = [] } = body;\n if (LogonResult !== 0) {\n return [\n { message: 'Security token is invalid', data: ApplicationData },\n ];\n }\n if (ApplicationData.length > 0) {\n let refreshToken;\n ApplicationData.forEach(item => {\n if (item.Key === 'ContensisSecurityRefreshToken')\n refreshToken = item.Value;\n });\n if (!refreshToken) {\n return [\n {\n message:\n 'Fetch credentials: Unable to find ContensisSecurityRefreshToken',\n },\n ];\n }\n return [undefined, refreshToken];\n } else {\n return [\n {\n message:\n 'Fetch credentials: Unable to find ContensisSecurityRefreshToken',\n },\n ];\n }\n } else {\n return [\n {\n message: `Fetch credentials error: ${response.status} ${response.statusText}`,\n },\n ];\n }\n }\n\n static isZengentiStaff(email) {\n const emailRefs = ['@zengenti', '@contensis'];\n\n return emailRefs.some(emailRef => {\n if (email.includes(emailRef)) {\n return true;\n }\n });\n }\n}\n","import { takeEvery, select, put, call } from 'redux-saga/effects';\nimport {\n SET_AUTHENTICATION_STATE,\n LOGIN_USER,\n LOGOUT_USER,\n VALIDATE_USER,\n} from '../types';\nimport {\n selectUserIsAuthenticated,\n selectClientCredentials,\n selectUserGroups,\n} from '../selectors';\n\nimport { setRoute } from '~/routing/redux/actions';\nimport { selectCurrentSearch } from '~/routing/redux/selectors';\nimport { findContentTypeMapping } from '~/routing/util/find-contenttype-mapping';\n\nimport mapClientCredentials from '~/user/transformations/mapClientCredentials';\n\nimport { getManagementApiClient } from '~/user/util/ContensisManagementApi';\nimport { LoginHelper } from '~/user/util/LoginHelper.class';\nimport { matchUserGroup } from '~/user/util/matchGroups';\nimport { queryParams } from '~/util/navigation';\n\nexport const loginSagas = [\n takeEvery(LOGIN_USER, loginUserSaga),\n takeEvery(LOGOUT_USER, logoutUserSaga),\n takeEvery(VALIDATE_USER, validateUserSaga),\n takeEvery(SET_AUTHENTICATION_STATE, redirectAfterSuccessfulLoginSaga),\n];\n\nexport function* handleRequiresLoginSaga(action) {\n const {\n entry,\n requireLogin,\n routes: { ContentTypeMappings },\n staticRoute,\n } = action;\n let userLoggedIn = yield select(selectUserIsAuthenticated);\n\n // Check for a securityToken in querystring\n const currentQs = queryParams(yield select(selectCurrentSearch));\n const securityToken = currentQs.securityToken || currentQs.securitytoken;\n\n // Check if any of the defined routes have \"requireLogin\" attribute\n const { requireLogin: authRoute } = (staticRoute && staticRoute.route) || {};\n const { requireLogin: authContentType } =\n (entry &&\n findContentTypeMapping(ContentTypeMappings, entry?.sys?.contentTypeId)) ||\n {};\n\n // If requireLogin, authRoute or authContentType has been specified as an\n // array of groups we can merge all the arrays and match on any group supplied\n const routeRequiresGroups = [\n ...((Array.isArray(authContentType) && authContentType) || []),\n ...((Array.isArray(authRoute) && authRoute) || []),\n ...((Array.isArray(requireLogin) && requireLogin) || []),\n ];\n const routeRequiresLogin = !!authContentType || !!authRoute || !!requireLogin;\n\n if (!userLoggedIn) {\n // If cookies or securityToken are found on any route change\n // always validate and login the user\n if (routeRequiresLogin) {\n // If routeRequiresLogin do a blocking call that returns userLoggedIn\n userLoggedIn = yield call(validateUserSaga, { securityToken });\n }\n // otherwise do a non blocking put to handle validation in the background\n else yield put({ type: VALIDATE_USER, securityToken });\n }\n\n if (routeRequiresLogin) {\n // If a security token is in the querystring and we are not already\n // logged in something is wrong and we won't bother going on another redirect loop\n if (!userLoggedIn && !securityToken) {\n LoginHelper.ClientRedirectToSignInPage(action.location.pathname);\n } else if (routeRequiresGroups.length > 0) {\n const userGroups = yield select(selectUserGroups, 'js');\n const groupMatch = matchUserGroup(userGroups, routeRequiresGroups);\n\n if (!groupMatch)\n LoginHelper.ClientRedirectToAccessDeniedPage(action.location.pathname);\n }\n }\n}\n\nfunction* validateUserSaga({ securityToken }) {\n // Check for refreshToken in cookies\n let clientCredentials = LoginHelper.GetCachedCredentials();\n\n if (securityToken || clientCredentials.refreshToken) {\n // We only attempt to validate the user if one of the stored\n // tokens are found, in this case we set loading state manually\n // so we don't need to set and unset loading if there are no stored\n yield put({\n type: SET_AUTHENTICATION_STATE,\n authenticationState: {\n isLoading: true,\n },\n });\n // If we have just a security token we will call a CMS endpoint\n // and provide us with a RefreshToken cookie we can use during login\n const [error, refreshToken] =\n yield LoginHelper.GetCredentialsForSecurityToken(securityToken);\n if (refreshToken) {\n // Set cookies and reload values\n LoginHelper.SetLoginCookies({\n contensisClassicToken: securityToken,\n refreshToken,\n });\n clientCredentials = LoginHelper.GetCachedCredentials();\n }\n\n // Log the user in if a refreshToken is found\n if (clientCredentials.refreshToken)\n yield call(loginUserSaga, { clientCredentials });\n else if (error)\n yield put({\n type: SET_AUTHENTICATION_STATE,\n authenticationState: {\n isError: true,\n errorMessage:\n error?.message ||\n (error && 'toString' in error && error.toString()),\n },\n });\n }\n\n // Tell any callers have we successfully logged in?\n return yield select(selectUserIsAuthenticated);\n}\n\nfunction* loginUserSaga(action = {}) {\n const { username, password, clientCredentials } = action;\n\n // If a WSFED_LOGIN site has dispatched the loginUser action\n // just redirect them to the Identity Provider sign in\n if (action.type === LOGIN_USER && LoginHelper.WSFED_LOGIN)\n LoginHelper.ClientRedirectToSignInPage();\n\n const { authenticationState, user } = yield LoginHelper.LoginUser({\n username,\n password,\n clientCredentials,\n });\n\n yield put({\n type: SET_AUTHENTICATION_STATE,\n authenticationState,\n user,\n });\n}\nconst removeHostnamePart = path => {\n // eslint-disable-next-line no-console\n console.log(path);\n const relativePath = '/' + path.split('/').splice(3).join('/');\n // eslint-disable-next-line no-console\n console.log(relativePath);\n return relativePath;\n};\n\nfunction* redirectAfterSuccessfulLoginSaga() {\n const isLoggedIn = yield select(selectUserIsAuthenticated);\n const { redirect_uri: redirectPath, ReturnURL: assetRedirectPath } =\n queryParams(yield select(selectCurrentSearch));\n\n if (isLoggedIn && assetRedirectPath && typeof window != 'undefined') {\n const path = removeHostnamePart(assetRedirectPath);\n // This has to be a hard href to get the app to\n // leave React and hit the server for the IIS hosted assets\n window.location.href = path;\n // yield put(setRoute(path)); // does not work in this scenario\n } else if (isLoggedIn && redirectPath) {\n yield put(setRoute(redirectPath));\n }\n}\n\nfunction* logoutUserSaga({ redirectPath }) {\n yield put({\n type: SET_AUTHENTICATION_STATE,\n user: null,\n });\n yield LoginHelper.LogoutUser(redirectPath);\n}\n\nexport function* refreshSecurityToken() {\n const clientCredentials = yield select(selectClientCredentials, 'js');\n if (Object.keys(clientCredentials).length > 0) {\n const client = yield getManagementApiClient(clientCredentials);\n yield client.authenticate();\n\n yield put({\n type: SET_AUTHENTICATION_STATE,\n authenticationState: {\n clientCredentials: mapClientCredentials(client),\n },\n });\n }\n}\n"],"names":["findContentTypeMapping","ContentTypeMappings","contentTypeId","find","ct","contentTypeID","clientCredentials","bearerToken","bearerTokenExpiryDate","toISOString","refreshToken","refreshTokenExpiryDate","contensisClassicToken","obj","mapJson","getManagementApiClient","username","password","rootUrl","SERVERS","api","cms","projectId","PROJECTS","id","config","clientType","clientDetails","Client","client","create","COOKIE_VALID_DAYS","_cookie","Cookies","withConverter","read","value","decodeURIComponent","write","encodeURIComponent","CookieHelper","GetCookie","name","cookie","get","SetCookie","maxAgeDays","set","expires","DeleteCookie","remove","context","window","global","requireOidc","process","env","NODE_ENV","WSFED_LOGIN","servers","userManagerConfig","authority","client_id","redirect_uri","location","toString","post_logout_redirect_uri","response_type","scope","filterProtocolClaims","createUserManager","UserManager","e","console","log","LOGIN_COOKIE","REFRESH_TOKEN_COOKIE","LoginHelper","SetLoginCookies","info","GetCachedCredentials","ClearCachedCredentials","localStorage","keys","i","length","key","startsWith","push","forEach","removeItem","LoginUser","credentials","authenticationState","isAuthenticated","isAuthenticationError","isError","transientClient","user","loginError","clientBearerToken","to","ensureBearerToken","errorMessage","message","includes","mapClientCredentials","error","userDetails","GetUserDetails","latestCredentials","LogoutUser","redirectPath","WsFedLogout","ClientRedirectToPath","ClientRedirectToSignInPage","ClientRedirectToHome","url","search","hash","href","WsFedLogin","LOGIN_ROUTE","replace","ClientRedirectToAccessDeniedPage","originalPath","ACCESS_DENIED_ROUTE","redirectUri","userManager","signinRedirect","RemoveSecurityTokenQuery","params","URLSearchParams","has","delete","pathname","fetch","CMS_URL","GetCredentialsForSecurityToken","securityToken","response","method","headers","Accept","body","JSON","stringify","ok","parseError","json","LogonResult","ApplicationData","data","item","Key","Value","undefined","status","statusText","isZengentiStaff","email","emailRefs","some","emailRef","userError","groupsError","groupsResult","security","users","getCurrent","getUserGroups","userId","includeInherited","items","groups","loginSagas","takeEvery","LOGIN_USER","loginUserSaga","LOGOUT_USER","logoutUserSaga","VALIDATE_USER","validateUserSaga","SET_AUTHENTICATION_STATE","redirectAfterSuccessfulLoginSaga","handleRequiresLoginSaga","action","entry","requireLogin","routes","staticRoute","userLoggedIn","select","selectUserIsAuthenticated","currentQs","queryParams","selectCurrentSearch","securitytoken","authRoute","route","authContentType","sys","routeRequiresGroups","Array","isArray","routeRequiresLogin","call","put","type","userGroups","selectUserGroups","groupMatch","matchUserGroup","isLoading","removeHostnamePart","path","relativePath","split","splice","join","isLoggedIn","ReturnURL","assetRedirectPath","setRoute","refreshSecurityToken","selectClientCredentials","Object","authenticate"],"mappings":"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"}
@@ -49,13 +49,12 @@ var types = /*#__PURE__*/Object.freeze({
49
49
  });
50
50
 
51
51
  const defaultAuthenticationState = {
52
- authenticated: false,
53
- authenticationError: false,
54
- authenticationErrorMessage: null,
55
52
  clientCredentials: null,
56
- error: false,
57
53
  errorMessage: null,
58
- loading: false
54
+ isAuthenticated: false,
55
+ isAuthenticationError: false,
56
+ isError: false,
57
+ isLoading: false
59
58
  };
60
59
  const defaultPasswordResetRequestValues = {
61
60
  isSending: false,
@@ -73,7 +72,7 @@ const defaultChangePasswordValues = {
73
72
  error: null
74
73
  };
75
74
  const defaultRegistrationValues = {
76
- loading: false,
75
+ isLoading: false,
77
76
  success: false,
78
77
  error: null
79
78
  };
@@ -86,8 +85,12 @@ const initialUserState = {
86
85
  };
87
86
  var UserReducer = produce((state, action) => {
88
87
  switch (action.type) {
89
- case LOGIN_USER:
90
88
  case LOGOUT_USER:
89
+ {
90
+ return initialUserState;
91
+ }
92
+
93
+ case LOGIN_USER:
91
94
  case SET_AUTHENTICATION_STATE:
92
95
  {
93
96
  var _state, _state$authentication;
@@ -96,43 +99,41 @@ var UserReducer = produce((state, action) => {
96
99
  action.authenticationState = defaultAuthenticationState;
97
100
  }
98
101
 
99
- const loading = action.type === LOGIN_USER;
100
102
  const {
101
103
  authenticationState: {
102
- error = false,
104
+ clientCredentials = null,
103
105
  errorMessage = null,
104
- authenticated,
105
- authenticationError = false,
106
- authenticationErrorMessage = null,
107
- clientCredentials = null
106
+ isAuthenticated,
107
+ isAuthenticationError = false,
108
+ isError = false,
109
+ isLoading = action.type === LOGIN_USER
108
110
  },
109
111
  user
110
112
  } = action;
111
113
 
112
114
  if (user) {
113
- user.name = `${user.firstName} ${user.lastName}`;
115
+ user.name = `${user.firstName}${user.lastName ? ` ${user.lastName}` : ''}` || null;
114
116
  user.isZengentiStaff = user.email.includes('@zengenti.com');
115
117
  }
116
118
 
117
119
  state = { ...initialUserState,
118
120
  ...(user || state),
119
121
  authenticationState: {
120
- authenticated: authenticated || ((_state = state) === null || _state === void 0 ? void 0 : (_state$authentication = _state.authenticationState) === null || _state$authentication === void 0 ? void 0 : _state$authentication.authenticated),
121
- authenticationError,
122
- authenticationErrorMessage,
123
122
  clientCredentials,
124
- error,
125
123
  errorMessage,
126
- loading
124
+ isAuthenticated: isAuthenticated || ((_state = state) === null || _state === void 0 ? void 0 : (_state$authentication = _state.authenticationState) === null || _state$authentication === void 0 ? void 0 : _state$authentication.isAuthenticated),
125
+ isAuthenticationError,
126
+ isError,
127
+ isLoading
127
128
  }
128
129
  };
129
130
  return state;
130
131
  }
131
132
  // REGISTER_USER is the trigger to set the user.registration initial state
132
- // and will set user.registration.loading to true
133
- // REGISTER_USER_FAILED will unset user.registration.loading and will set
133
+ // and will set user.registration.isLoading to true
134
+ // REGISTER_USER_FAILED will unset user.registration.isLoading and will set
134
135
  // the value in user.registration.error
135
- // REGISTER_USER_SUCCESS will unset user.registration.loading and will
136
+ // REGISTER_USER_SUCCESS will unset user.registration.isLoading and will
136
137
  // set user.registration to the created user from the api response
137
138
 
138
139
  case REGISTER_USER:
@@ -149,7 +150,7 @@ var UserReducer = produce((state, action) => {
149
150
 
150
151
  state.registration.success = action.type === REGISTER_USER_SUCCESS;
151
152
  state.registration.error = error || false;
152
- state.registration.loading = action.type === REGISTER_USER;
153
+ state.registration.isLoading = action.type === REGISTER_USER;
153
154
  return;
154
155
  }
155
156
 
@@ -226,4 +227,4 @@ var UserReducer = produce((state, action) => {
226
227
  }, initialUserState);
227
228
 
228
229
  export { CHANGE_USER_PASSWORD as C, LOGIN_USER as L, REGISTER_USER as R, SET_AUTHENTICATION_STATE as S, UserReducer as U, VALIDATE_USER as V, REGISTER_USER_SUCCESS as a, REGISTER_USER_FAILED as b, REQUEST_USER_PASSWORD_RESET as c, RESET_USER_PASSWORD as d, REQUEST_USER_PASSWORD_RESET_SENDING as e, REQUEST_USER_PASSWORD_RESET_SUCCESS as f, REQUEST_USER_PASSWORD_RESET_ERROR as g, RESET_USER_PASSWORD_SENDING as h, RESET_USER_PASSWORD_SUCCESS as i, RESET_USER_PASSWORD_ERROR as j, CHANGE_USER_PASSWORD_ERROR as k, CHANGE_USER_PASSWORD_SENDING as l, CHANGE_USER_PASSWORD_SUCCESS as m, LOGOUT_USER as n, initialUserState as o, types as t };
229
- //# sourceMappingURL=reducers-6f6801ed.js.map
230
+ //# sourceMappingURL=reducers-8e5d6232.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"reducers-8e5d6232.js","sources":["../src/user/redux/types.js","../src/user/redux/reducers.ts"],"sourcesContent":["const ACTION_PREFIX = '@USER/';\nexport const VALIDATE_USER = `${ACTION_PREFIX}VALIDATE_USER`;\nexport const SET_AUTHENTICATION_STATE = `${ACTION_PREFIX}SET_AUTHENTICATION_STATE`;\nexport const LOGIN_USER = `${ACTION_PREFIX}LOGIN_USER`;\nexport const LOGIN_SUCCESSFUL = `${ACTION_PREFIX}LOGIN_SUCCESSFUL`;\nexport const LOGIN_FAILED = `${ACTION_PREFIX}LOGIN_FAILED`;\nexport const LOGOUT_USER = `${ACTION_PREFIX}LOGOUT_USER`;\nexport const REGISTER_USER = `${ACTION_PREFIX}REGISTER_USER`;\nexport const REGISTER_USER_SUCCESS = `${ACTION_PREFIX}REGISTER_USER_SUCCESS`;\nexport const REGISTER_USER_FAILED = `${ACTION_PREFIX}REGISTER_USER_FAILED`;\n\nexport const REQUEST_USER_PASSWORD_RESET = `${ACTION_PREFIX}REQUEST_USER_PASSWORD_RESET`;\nexport const RESET_USER_PASSWORD = `${ACTION_PREFIX}RESET_USER_PASSWORD`;\nexport const REQUEST_USER_PASSWORD_RESET_SENDING = `${ACTION_PREFIX}REQUEST_USER_PASSWORD_RESET_SENDING`;\nexport const REQUEST_USER_PASSWORD_RESET_SUCCESS = `${ACTION_PREFIX}REQUEST_USER_PASSWORD_RESET_SUCCESS`;\nexport const REQUEST_USER_PASSWORD_RESET_ERROR = `${ACTION_PREFIX}REQUEST_USER_PASSWORD_RESET_ERROR`;\nexport const RESET_USER_PASSWORD_SENDING = `${ACTION_PREFIX}RESET_USER_PASSWORD_SENDING`;\nexport const RESET_USER_PASSWORD_SUCCESS = `${ACTION_PREFIX}RESET_USER_PASSWORD_SUCCESS`;\nexport const RESET_USER_PASSWORD_ERROR = `${ACTION_PREFIX}RESET_USER_PASSWORD_ERROR`;\n\nexport const CHANGE_USER_PASSWORD = `${ACTION_PREFIX}CHANGE_USER_PASSWORD`;\nexport const CHANGE_USER_PASSWORD_SENDING = `${ACTION_PREFIX}CHANGE_USER_PASSWORD_SENDING`;\nexport const CHANGE_USER_PASSWORD_SUCCESS = `${ACTION_PREFIX}CHANGE_USER_PASSWORD_SUCCESS`;\nexport const CHANGE_USER_PASSWORD_ERROR = `${ACTION_PREFIX}CHANGE_USER_PASSWORD_ERROR`;\n","import { Draft, produce } from 'immer';\nimport { AppState } from '~/redux/appstate';\nimport {\n REGISTER_USER,\n REGISTER_USER_FAILED,\n REGISTER_USER_SUCCESS,\n SET_AUTHENTICATION_STATE,\n LOGIN_USER,\n LOGOUT_USER,\n REQUEST_USER_PASSWORD_RESET_SENDING,\n REQUEST_USER_PASSWORD_RESET_SUCCESS,\n REQUEST_USER_PASSWORD_RESET_ERROR,\n RESET_USER_PASSWORD_SENDING,\n RESET_USER_PASSWORD_SUCCESS,\n RESET_USER_PASSWORD_ERROR,\n CHANGE_USER_PASSWORD_SENDING,\n CHANGE_USER_PASSWORD_SUCCESS,\n CHANGE_USER_PASSWORD_ERROR,\n} from './types';\n\nconst defaultAuthenticationState = {\n clientCredentials: null,\n errorMessage: null,\n isAuthenticated: false,\n isAuthenticationError: false,\n isError: false,\n isLoading: false,\n};\n\nconst defaultPasswordResetRequestValues = {\n isSending: false,\n sent: false,\n error: null,\n};\n\nconst defaultResetPasswordValues = {\n isSending: false,\n sent: false,\n error: null,\n};\n\nconst defaultChangePasswordValues = {\n isSending: false,\n sent: false,\n error: null,\n};\n\nconst defaultRegistrationValues = {\n isLoading: false,\n success: false,\n error: null,\n};\n\nexport const initialUserState = {\n authenticationState: defaultAuthenticationState,\n passwordResetRequest: defaultPasswordResetRequestValues,\n resetPassword: defaultResetPasswordValues,\n changePassword: defaultChangePasswordValues,\n groups: [],\n};\n\nexport default produce((state: Draft<AppState['user']>, action) => {\n switch (action.type) {\n case LOGOUT_USER: {\n return initialUserState;\n }\n case LOGIN_USER:\n case SET_AUTHENTICATION_STATE: {\n if (!action.authenticationState) {\n action.authenticationState = defaultAuthenticationState;\n }\n\n const {\n authenticationState: {\n clientCredentials = null,\n errorMessage = null,\n isAuthenticated,\n isAuthenticationError = false,\n isError = false,\n isLoading = action.type === LOGIN_USER,\n },\n user,\n } = action;\n\n if (user) {\n user.name =\n `${user.firstName}${user.lastName ? ` ${user.lastName}` : ''}` ||\n null;\n user.isZengentiStaff = user.email.includes('@zengenti.com');\n }\n\n state = {\n ...initialUserState,\n ...(user || state),\n authenticationState: {\n clientCredentials,\n errorMessage,\n isAuthenticated:\n isAuthenticated || state?.authenticationState?.isAuthenticated,\n isAuthenticationError,\n isError,\n isLoading,\n },\n };\n return state;\n }\n // REGISTER_USER is the trigger to set the user.registration initial state\n // and will set user.registration.isLoading to true\n // REGISTER_USER_FAILED will unset user.registration.isLoading and will set\n // the value in user.registration.error\n // REGISTER_USER_SUCCESS will unset user.registration.isLoading and will\n // set user.registration to the created user from the api response\n case REGISTER_USER:\n case REGISTER_USER_FAILED:\n case REGISTER_USER_SUCCESS: {\n const { error, user } = action;\n\n // Set registration object from the supplied action.user\n // so we can call these values back later\n state.registration = (user ||\n state.registration ||\n defaultRegistrationValues) as typeof defaultRegistrationValues;\n\n // Set registration flags so the UI can track the status\n state.registration.success = action.type === REGISTER_USER_SUCCESS;\n state.registration.error = error || false;\n state.registration.isLoading = action.type === REGISTER_USER;\n return;\n }\n case REQUEST_USER_PASSWORD_RESET_SENDING:\n state.passwordResetRequest = defaultPasswordResetRequestValues;\n state.passwordResetRequest.isSending = true;\n return;\n case REQUEST_USER_PASSWORD_RESET_SUCCESS:\n if (state.passwordResetRequest) {\n state.passwordResetRequest.isSending = false;\n state.passwordResetRequest.sent = true;\n }\n return;\n case REQUEST_USER_PASSWORD_RESET_ERROR:\n if (state.passwordResetRequest) {\n state.passwordResetRequest.isSending = false;\n state.passwordResetRequest.error = action.error;\n }\n return;\n case RESET_USER_PASSWORD_SENDING:\n if (state.resetPassword) {\n state.resetPassword.isSending = true;\n }\n return;\n case RESET_USER_PASSWORD_SUCCESS:\n if (state.resetPassword) {\n state.resetPassword.isSending = false;\n state.resetPassword.sent = true;\n }\n return;\n case RESET_USER_PASSWORD_ERROR:\n if (state.resetPassword) {\n state.resetPassword.isSending = false;\n state.resetPassword.error = action.error;\n }\n return;\n case CHANGE_USER_PASSWORD_SENDING:\n if (state.changePassword) {\n state.changePassword.isSending = true;\n }\n return;\n case CHANGE_USER_PASSWORD_SUCCESS:\n if (state.changePassword) {\n state.changePassword.isSending = false;\n state.changePassword.sent = true;\n }\n return;\n case CHANGE_USER_PASSWORD_ERROR:\n if (state.changePassword) {\n state.changePassword.isSending = false;\n state.changePassword.error = action.error;\n }\n return;\n default:\n return;\n }\n}, initialUserState);\n"],"names":["ACTION_PREFIX","VALIDATE_USER","SET_AUTHENTICATION_STATE","LOGIN_USER","LOGIN_SUCCESSFUL","LOGIN_FAILED","LOGOUT_USER","REGISTER_USER","REGISTER_USER_SUCCESS","REGISTER_USER_FAILED","REQUEST_USER_PASSWORD_RESET","RESET_USER_PASSWORD","REQUEST_USER_PASSWORD_RESET_SENDING","REQUEST_USER_PASSWORD_RESET_SUCCESS","REQUEST_USER_PASSWORD_RESET_ERROR","RESET_USER_PASSWORD_SENDING","RESET_USER_PASSWORD_SUCCESS","RESET_USER_PASSWORD_ERROR","CHANGE_USER_PASSWORD","CHANGE_USER_PASSWORD_SENDING","CHANGE_USER_PASSWORD_SUCCESS","CHANGE_USER_PASSWORD_ERROR","defaultAuthenticationState","clientCredentials","errorMessage","isAuthenticated","isAuthenticationError","isError","isLoading","defaultPasswordResetRequestValues","isSending","sent","error","defaultResetPasswordValues","defaultChangePasswordValues","defaultRegistrationValues","success","initialUserState","authenticationState","passwordResetRequest","resetPassword","changePassword","groups","produce","state","action","type","user","name","firstName","lastName","isZengentiStaff","email","includes","registration"],"mappings":";;AAAA,MAAMA,aAAa,GAAG,QAAtB;MACaC,aAAa,GAAI,GAAED,aAAc;MACjCE,wBAAwB,GAAI,GAAEF,aAAc;MAC5CG,UAAU,GAAI,GAAEH,aAAc;AACpC,MAAMI,gBAAgB,GAAI,GAAEJ,aAAc,kBAA1C;AACA,MAAMK,YAAY,GAAI,GAAEL,aAAc,cAAtC;MACMM,WAAW,GAAI,GAAEN,aAAc;MAC/BO,aAAa,GAAI,GAAEP,aAAc;MACjCQ,qBAAqB,GAAI,GAAER,aAAc;MACzCS,oBAAoB,GAAI,GAAET,aAAc;MAExCU,2BAA2B,GAAI,GAAEV,aAAc;MAC/CW,mBAAmB,GAAI,GAAEX,aAAc;MACvCY,mCAAmC,GAAI,GAAEZ,aAAc;MACvDa,mCAAmC,GAAI,GAAEb,aAAc;MACvDc,iCAAiC,GAAI,GAAEd,aAAc;MACrDe,2BAA2B,GAAI,GAAEf,aAAc;MAC/CgB,2BAA2B,GAAI,GAAEhB,aAAc;MAC/CiB,yBAAyB,GAAI,GAAEjB,aAAc;MAE7CkB,oBAAoB,GAAI,GAAElB,aAAc;MACxCmB,4BAA4B,GAAI,GAAEnB,aAAc;MAChDoB,4BAA4B,GAAI,GAAEpB,aAAc;MAChDqB,0BAA0B,GAAI,GAAErB,aAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;ACH3D,MAAMsB,0BAA0B,GAAG;AACjCC,EAAAA,iBAAiB,EAAE,IADc;AAEjCC,EAAAA,YAAY,EAAE,IAFmB;AAGjCC,EAAAA,eAAe,EAAE,KAHgB;AAIjCC,EAAAA,qBAAqB,EAAE,KAJU;AAKjCC,EAAAA,OAAO,EAAE,KALwB;AAMjCC,EAAAA,SAAS,EAAE;AANsB,CAAnC;AASA,MAAMC,iCAAiC,GAAG;AACxCC,EAAAA,SAAS,EAAE,KAD6B;AAExCC,EAAAA,IAAI,EAAE,KAFkC;AAGxCC,EAAAA,KAAK,EAAE;AAHiC,CAA1C;AAMA,MAAMC,0BAA0B,GAAG;AACjCH,EAAAA,SAAS,EAAE,KADsB;AAEjCC,EAAAA,IAAI,EAAE,KAF2B;AAGjCC,EAAAA,KAAK,EAAE;AAH0B,CAAnC;AAMA,MAAME,2BAA2B,GAAG;AAClCJ,EAAAA,SAAS,EAAE,KADuB;AAElCC,EAAAA,IAAI,EAAE,KAF4B;AAGlCC,EAAAA,KAAK,EAAE;AAH2B,CAApC;AAMA,MAAMG,yBAAyB,GAAG;AAChCP,EAAAA,SAAS,EAAE,KADqB;AAEhCQ,EAAAA,OAAO,EAAE,KAFuB;AAGhCJ,EAAAA,KAAK,EAAE;AAHyB,CAAlC;MAMaK,gBAAgB,GAAG;AAC9BC,EAAAA,mBAAmB,EAAEhB,0BADS;AAE9BiB,EAAAA,oBAAoB,EAAEV,iCAFQ;AAG9BW,EAAAA,aAAa,EAAEP,0BAHe;AAI9BQ,EAAAA,cAAc,EAAEP,2BAJc;AAK9BQ,EAAAA,MAAM,EAAE;AALsB;AAQhC,kBAAeC,OAAO,CAAC,CAACC,KAAD,EAAiCC,MAAjC,KAA4C;AACjE,UAAQA,MAAM,CAACC,IAAf;AACE,SAAKxC,WAAL;AAAkB;AAChB,eAAO+B,gBAAP;AACD;;AACD,SAAKlC,UAAL;AACA,SAAKD,wBAAL;AAA+B;AAAA;;AAC7B,YAAI,CAAC2C,MAAM,CAACP,mBAAZ,EAAiC;AAC/BO,UAAAA,MAAM,CAACP,mBAAP,GAA6BhB,0BAA7B;AACD;;AAED,cAAM;AACJgB,UAAAA,mBAAmB,EAAE;AACnBf,YAAAA,iBAAiB,GAAG,IADD;AAEnBC,YAAAA,YAAY,GAAG,IAFI;AAGnBC,YAAAA,eAHmB;AAInBC,YAAAA,qBAAqB,GAAG,KAJL;AAKnBC,YAAAA,OAAO,GAAG,KALS;AAMnBC,YAAAA,SAAS,GAAGiB,MAAM,CAACC,IAAP,KAAgB3C;AANT,WADjB;AASJ4C,UAAAA;AATI,YAUFF,MAVJ;;AAYA,YAAIE,IAAJ,EAAU;AACRA,UAAAA,IAAI,CAACC,IAAL,GACG,GAAED,IAAI,CAACE,SAAU,GAAEF,IAAI,CAACG,QAAL,GAAiB,IAAGH,IAAI,CAACG,QAAS,EAAlC,GAAsC,EAAG,EAA7D,IACA,IAFF;AAGAH,UAAAA,IAAI,CAACI,eAAL,GAAuBJ,IAAI,CAACK,KAAL,CAAWC,QAAX,CAAoB,eAApB,CAAvB;AACD;;AAEDT,QAAAA,KAAK,GAAG,EACN,GAAGP,gBADG;AAEN,cAAIU,IAAI,IAAIH,KAAZ,CAFM;AAGNN,UAAAA,mBAAmB,EAAE;AACnBf,YAAAA,iBADmB;AAEnBC,YAAAA,YAFmB;AAGnBC,YAAAA,eAAe,EACbA,eAAe,eAAImB,KAAJ,oEAAI,OAAON,mBAAX,0DAAI,sBAA4Bb,eAAhC,CAJE;AAKnBC,YAAAA,qBALmB;AAMnBC,YAAAA,OANmB;AAOnBC,YAAAA;AAPmB;AAHf,SAAR;AAaA,eAAOgB,KAAP;AACD;AACD;AACA;AACA;AACA;AACA;AACA;;AACA,SAAKrC,aAAL;AACA,SAAKE,oBAAL;AACA,SAAKD,qBAAL;AAA4B;AAC1B,cAAM;AAAEwB,UAAAA,KAAF;AAASe,UAAAA;AAAT,YAAkBF,MAAxB,CAD0B;AAI1B;;AACAD,QAAAA,KAAK,CAACU,YAAN,GAAsBP,IAAI,IACxBH,KAAK,CAACU,YADc,IAEpBnB,yBAFF,CAL0B;;AAU1BS,QAAAA,KAAK,CAACU,YAAN,CAAmBlB,OAAnB,GAA6BS,MAAM,CAACC,IAAP,KAAgBtC,qBAA7C;AACAoC,QAAAA,KAAK,CAACU,YAAN,CAAmBtB,KAAnB,GAA2BA,KAAK,IAAI,KAApC;AACAY,QAAAA,KAAK,CAACU,YAAN,CAAmB1B,SAAnB,GAA+BiB,MAAM,CAACC,IAAP,KAAgBvC,aAA/C;AACA;AACD;;AACD,SAAKK,mCAAL;AACEgC,MAAAA,KAAK,CAACL,oBAAN,GAA6BV,iCAA7B;AACAe,MAAAA,KAAK,CAACL,oBAAN,CAA2BT,SAA3B,GAAuC,IAAvC;AACA;;AACF,SAAKjB,mCAAL;AACE,UAAI+B,KAAK,CAACL,oBAAV,EAAgC;AAC9BK,QAAAA,KAAK,CAACL,oBAAN,CAA2BT,SAA3B,GAAuC,KAAvC;AACAc,QAAAA,KAAK,CAACL,oBAAN,CAA2BR,IAA3B,GAAkC,IAAlC;AACD;;AACD;;AACF,SAAKjB,iCAAL;AACE,UAAI8B,KAAK,CAACL,oBAAV,EAAgC;AAC9BK,QAAAA,KAAK,CAACL,oBAAN,CAA2BT,SAA3B,GAAuC,KAAvC;AACAc,QAAAA,KAAK,CAACL,oBAAN,CAA2BP,KAA3B,GAAmCa,MAAM,CAACb,KAA1C;AACD;;AACD;;AACF,SAAKjB,2BAAL;AACE,UAAI6B,KAAK,CAACJ,aAAV,EAAyB;AACvBI,QAAAA,KAAK,CAACJ,aAAN,CAAoBV,SAApB,GAAgC,IAAhC;AACD;;AACD;;AACF,SAAKd,2BAAL;AACE,UAAI4B,KAAK,CAACJ,aAAV,EAAyB;AACvBI,QAAAA,KAAK,CAACJ,aAAN,CAAoBV,SAApB,GAAgC,KAAhC;AACAc,QAAAA,KAAK,CAACJ,aAAN,CAAoBT,IAApB,GAA2B,IAA3B;AACD;;AACD;;AACF,SAAKd,yBAAL;AACE,UAAI2B,KAAK,CAACJ,aAAV,EAAyB;AACvBI,QAAAA,KAAK,CAACJ,aAAN,CAAoBV,SAApB,GAAgC,KAAhC;AACAc,QAAAA,KAAK,CAACJ,aAAN,CAAoBR,KAApB,GAA4Ba,MAAM,CAACb,KAAnC;AACD;;AACD;;AACF,SAAKb,4BAAL;AACE,UAAIyB,KAAK,CAACH,cAAV,EAA0B;AACxBG,QAAAA,KAAK,CAACH,cAAN,CAAqBX,SAArB,GAAiC,IAAjC;AACD;;AACD;;AACF,SAAKV,4BAAL;AACE,UAAIwB,KAAK,CAACH,cAAV,EAA0B;AACxBG,QAAAA,KAAK,CAACH,cAAN,CAAqBX,SAArB,GAAiC,KAAjC;AACAc,QAAAA,KAAK,CAACH,cAAN,CAAqBV,IAArB,GAA4B,IAA5B;AACD;;AACD;;AACF,SAAKV,0BAAL;AACE,UAAIuB,KAAK,CAACH,cAAV,EAA0B;AACxBG,QAAAA,KAAK,CAACH,cAAN,CAAqBX,SAArB,GAAiC,KAAjC;AACAc,QAAAA,KAAK,CAACH,cAAN,CAAqBT,KAArB,GAA6Ba,MAAM,CAACb,KAApC;AACD;;AACD;;AACF;AACE;AAtHJ;AAwHD,CAzHqB,EAyHnBK,gBAzHmB,CAAtB;;;;"}
package/esm/redux.js CHANGED
@@ -1,5 +1,5 @@
1
- import { n as navigation$2, v as version$1, G as GET_NODE_TREE, d as version$2, e as navigation$3 } from './version-be00bbb4.js';
2
- export { f as convertSagaArray, g as injectReducer, i as injectRedux, j as injectSaga, r as store, u as useInjectRedux } from './version-be00bbb4.js';
1
+ import { n as navigation$2, v as version$1, G as GET_NODE_TREE, d as version$2, e as navigation$3 } from './version-e6a545e1.js';
2
+ export { f as convertSagaArray, g as injectReducer, i as injectRedux, j as injectSaga, r as store, u as useInjectRedux } from './version-e6a545e1.js';
3
3
  import { r as routing$1, j as routing$2 } from './actions-5437f43d.js';
4
4
  import { r as action, t as routing$3 } from './selectors-65f0f31c.js';
5
5
  export { r as action, g as getIn, u as getJS } from './selectors-65f0f31c.js';
@@ -11,7 +11,7 @@ import 'redux-saga';
11
11
  import 'redux-injectors';
12
12
  import 'immer';
13
13
  import 'deepmerge';
14
- import './reducers-6f6801ed.js';
14
+ import './reducers-8e5d6232.js';
15
15
  import 'jsonpath-mapper';
16
16
  import 'query-string';
17
17
 
package/esm/routing.js CHANGED
@@ -1,6 +1,6 @@
1
1
  export { j as actions, r as types } from './actions-5437f43d.js';
2
2
  export { t as selectors } from './selectors-65f0f31c.js';
3
- export { R as RouteLoader } from './RouteLoader-31425b61.js';
3
+ export { R as RouteLoader } from './RouteLoader-d4b4d320.js';
4
4
  import 'jsonpath-mapper';
5
5
  import 'query-string';
6
6
  import 'react';
@@ -9,5 +9,5 @@ import 'react-hot-loader';
9
9
  import 'react-router-dom';
10
10
  import 'react-router-config';
11
11
  import 'reselect';
12
- import './ToJs-1f2e6395.js';
12
+ import './ToJs-2627ce21.js';
13
13
  //# sourceMappingURL=routing.js.map
package/esm/search.js CHANGED
@@ -418,6 +418,7 @@ const selectListing = {
418
418
  getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, Context$1.listings)
419
419
  };
420
420
  const selectCurrentPath = state => getImmutableOrJS(state, ['routing', 'currentPath']);
421
+ const selectCurrentProject = state => getImmutableOrJS(state, ['routing', 'currentProject']);
421
422
  const selectVersionStatus = state => getImmutableOrJS(state, ['version', 'contensisVersionStatus']);
422
423
 
423
424
  var selectors = /*#__PURE__*/Object.freeze({
@@ -460,6 +461,7 @@ var selectors = /*#__PURE__*/Object.freeze({
460
461
  selectFacets: selectFacets,
461
462
  selectListing: selectListing,
462
463
  selectCurrentPath: selectCurrentPath,
464
+ selectCurrentProject: selectCurrentProject,
463
465
  selectVersionStatus: selectVersionStatus
464
466
  });
465
467
 
@@ -1431,7 +1433,7 @@ const queryParamsTemplate = {
1431
1433
  }) => {
1432
1434
  var _getFacet;
1433
1435
 
1434
- return (_getFacet = getFacet(state, facet, context)) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId;
1436
+ return ((_getFacet = getFacet(state, facet, context)) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId) || selectCurrentProject(state);
1435
1437
  },
1436
1438
  searchTerm: root => root.context !== Context$1.minilist || getQueryParameter(root, 'useSearchTerm', false) ? getSearchTerm(root.state) : '',
1437
1439
  selectedFilters: ({
@@ -1545,9 +1547,10 @@ const filterParamsChanged = (action, state) => {
1545
1547
  const debugExecuteSearch = (action, state) => {
1546
1548
  const [queryParams, runSearch] = generateQueryParams(action, state);
1547
1549
  console.log('runSearch', runSearch, 'action', action, 'filterParamsChanged', filterParamsChanged(action, state), 'getIsLoaded(state, context, facet)', getIsLoaded(state, action.context, action.facet));
1548
- const stateParams = getQueryParams(action.ogState || state, action.facet, action.context);
1549
- stateParams.pageIndex = getPageIndex(action.ogState || state, action.facet, action.context);
1550
- stateParams.searchTerm = getSearchTerm(action.ogState || state);
1550
+ const stateParams = { ...getQueryParams(action.ogState || state, action.facet, action.context),
1551
+ pageIndex: getPageIndex(action.ogState || state, action.facet, action.context),
1552
+ searchTerm: getSearchTerm(action.ogState || state)
1553
+ };
1551
1554
  console.log(stateParams, queryParams);
1552
1555
  console.log('getSelectedFilters', getSelectedFilters(action.ogState || state, action.facet, action.context, 'js'), 'params', action.params);
1553
1556
  };