From 6ed0fc145373c86d0e3ca540b03ca7dfbc600a93 Mon Sep 17 00:00:00 2001 From: Henri Koskenranta Date: Mon, 14 Oct 2019 15:58:57 +0300 Subject: [PATCH] Fix component prop type validation to use elementType --- packages/context/README.md | 8 ++++---- .../src/Context/AuthenticationContext.container.js | 8 ++++---- packages/core/src/routes/OidcRoutes.js | 4 ++-- packages/redux/README.md | 6 +++--- packages/redux/src/AuthenticationCallback.js | 2 +- packages/redux/src/Oidc.js | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/context/README.md b/packages/context/README.md index 410bb0e51..3df973ae2 100644 --- a/packages/context/README.md +++ b/packages/context/README.md @@ -49,10 +49,10 @@ render(, document.getElementById('root')); ```javascript const propTypes = { - notAuthenticated: PropTypes.node, // react component displayed during authentication - notAuthorized: PropTypes.node, // react component displayed in case user is not Authorised - authenticating: PropTypes.node, // react component displayed when about to redirect user to be authenticated - callbackComponentOverride: PropTypes.node, // react component displayed when user is connected + notAuthenticated: PropTypes.elementType, // react component displayed during authentication + notAuthorized: PropTypes.elementType, // react component displayed in case user is not Authorised + authenticating: PropTypes.elementType, // react component displayed when about to redirect user to be authenticated + callbackComponentOverride: PropTypes.elementType, // react component displayed when user is connected configuration: PropTypes.shape({ client_id: PropTypes.string.isRequired, // oidc client configuration, the same as oidc client library used internally https://github.com/IdentityModel/oidc-client-js redirect_uri: PropTypes.string.isRequired, diff --git a/packages/context/src/Context/AuthenticationContext.container.js b/packages/context/src/Context/AuthenticationContext.container.js index 9c9814212..b281faabf 100644 --- a/packages/context/src/Context/AuthenticationContext.container.js +++ b/packages/context/src/Context/AuthenticationContext.container.js @@ -9,10 +9,10 @@ import withServices from '../withServices'; export const AuthenticationContext = React.createContext(null); const propTypes = { - notAuthenticated: PropTypes.oneOfType([PropTypes.node, PropTypes.func]), - notAuthorized: PropTypes.oneOfType([PropTypes.node, PropTypes.func]), - authenticating: PropTypes.oneOfType([PropTypes.node, PropTypes.func]), - callbackComponentOverride: PropTypes.oneOfType([PropTypes.node, PropTypes.func]), + notAuthenticated: PropTypes.elementType, + notAuthorized: PropTypes.elementType, + authenticating: PropTypes.elementType, + callbackComponentOverride: PropTypes.elementType, configuration: PropTypes.shape({ client_id: PropTypes.string.isRequired, redirect_uri: PropTypes.string.isRequired, diff --git a/packages/core/src/routes/OidcRoutes.js b/packages/core/src/routes/OidcRoutes.js index d811338b3..b18695115 100644 --- a/packages/core/src/routes/OidcRoutes.js +++ b/packages/core/src/routes/OidcRoutes.js @@ -5,8 +5,8 @@ import { getPath } from './route-utils'; import { SilentCallback } from '../callbacks'; const propTypes = { - notAuthenticated: PropTypes.node, - notAuthorized: PropTypes.node, + notAuthenticated: PropTypes.elementType, + notAuthorized: PropTypes.elementType, callbackComponent: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired, configuration: PropTypes.shape({ redirect_uri: PropTypes.string.isRequired, diff --git a/packages/redux/README.md b/packages/redux/README.md index 187bb791c..444341f30 100644 --- a/packages/redux/README.md +++ b/packages/redux/README.md @@ -72,9 +72,9 @@ The optional parameter "isEnabled" allows you to enable or disable authenticatio ```javascript const propTypes = { - notAuthenticated: PropTypes.node, // react component displayed during authentication - callbackComponentOverride: PropTypes.node, // react component displayed when user is connected - notAuthorized: PropTypes.node, // react component displayed in case user is not Authorised + notAuthenticated: PropTypes.elementType, // react component displayed during authentication + callbackComponentOverride: PropTypes.elementType, // react component displayed when user is connected + notAuthorized: PropTypes.elementType, // react component displayed in case user is not Authorised configuration: PropTypes.shape({ client_id: PropTypes.string.isRequired, // oidc client configuration, the same as oidc client library used internally https://github.com/IdentityModel/oidc-client-js redirect_uri: PropTypes.string.isRequired, diff --git a/packages/redux/src/AuthenticationCallback.js b/packages/redux/src/AuthenticationCallback.js index 1c723a613..d4d726323 100644 --- a/packages/redux/src/AuthenticationCallback.js +++ b/packages/redux/src/AuthenticationCallback.js @@ -8,7 +8,7 @@ import PropTypes from 'prop-types'; const propTypes = { history: PropTypes.object.isRequired, userManager: PropTypes.object.isRequired, - callbackComponentOverride: PropTypes.node, + callbackComponentOverride: PropTypes.elementType, }; const defaultProps = { diff --git a/packages/redux/src/Oidc.js b/packages/redux/src/Oidc.js index c2e2b9e66..b0a8296d9 100644 --- a/packages/redux/src/Oidc.js +++ b/packages/redux/src/Oidc.js @@ -6,13 +6,13 @@ import { OidcRoutes, authenticationService, getUserManager } from '@axa-fr/react import AuthenticationCallback from './AuthenticationCallback'; const propTypes = { - notAuthenticated: PropTypes.oneOfType([PropTypes.node, PropTypes.func]), - notAuthorized: PropTypes.oneOfType([PropTypes.node, PropTypes.func]), + notAuthenticated: PropTypes.elementType, + notAuthorized: PropTypes.elementType, configuration: PropTypes.object.isRequired, store: PropTypes.object.isRequired, isEnabled: PropTypes.bool, children: PropTypes.node, - callbackComponentOverride: PropTypes.oneOfType([PropTypes.node, PropTypes.func]), + callbackComponentOverride: PropTypes.elementType, }; const defaultPropsObject = {