Converted login modal to FC. Added formik lib. #638
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dusanradovanovic
requested review from
aChanEP,
rostyk-kanafotskyy and
shaunmaharaj
aChanEP
reviewed
Mar 22, 2020
| @@ -19,232 +19,174 @@ | |||
| * | |||
| */ | |||
|
|
|||
| import React, { Component } from 'react'; | |||
| import React, { Component, useState, useEffect } from 'react'; | |||
There was a problem hiding this comment.
Remove unused import Component now that this is a functional component
| import { Link } from 'react-router-dom'; | ||
| import Modal from 'react-responsive-modal'; | ||
| import { FormikErrors, useFormik } from 'formik'; | ||
| import queryString from 'query-string'; |
| import { Link } from 'react-router-dom'; | ||
| import Modal from 'react-responsive-modal'; | ||
| import { FormikErrors, useFormik } from 'formik'; | ||
| import queryString from 'query-string'; | ||
| import { loginRegistered, loginRegisteredAuthService } from '../utils/AuthService'; |
There was a problem hiding this comment.
remove unused import loginRegisteredAuthService
aChanEP
reviewed
Mar 23, 2020
|
|
||
| const [failedLogin, setFailedLogin] = useState(false); | ||
|
|
||
| useEffect(() => { |
There was a problem hiding this comment.
Why are we resetting the configuration every time on each render?
| @@ -47,19 +47,21 @@ export class LoginRedirectPage extends React.Component<LoginRedirectPageProps, L | |||
| const locationData = window.location.search; | |||
| const url = locationData; | |||
| const params = queryString.parse(url); | |||
| if (Config.b2b.openId && Config.b2b.openId.enable && params.code && params.session_state) { | |||
| const b2bEnabled = Config.b2b.openId && Config.b2b.openId.enable; | |||
There was a problem hiding this comment.
This is checking if openID is enabled, not if b2b is enabled. We have a separate config for that
Suggested change
| const b2bEnabled = Config.b2b.openId && Config.b2b.openId.enable; | |
| const openidEnabled = Config.b2b.openId && Config.b2b.openId.enable; |
| if (Config.b2b.openId && Config.b2b.openId.enable && params.code && params.session_state) { | ||
| const b2bEnabled = Config.b2b.openId && Config.b2b.openId.enable; | ||
|
|
||
| if (b2bEnabled && params.code && params.session_state) { |
There was a problem hiding this comment.
Suggested change
| if (b2bEnabled && params.code && params.session_state) { | |
| if (openidEnabled && params.code && params.session_state) { |
| localStorage.setItem(`${Config.cortexApi.scope}_openIdcCode`, params.code); | ||
| localStorage.setItem(`${Config.cortexApi.scope}_openIdcSessionState`, params.session_state); | ||
| localStorage.removeItem('OidcSecret'); | ||
| } | ||
|
|
||
| const oidcParameters: OidcParameters = await LoginRedirectPage.discoverOIDCParameters(); | ||
| const redirectUri = encodeURIComponent(((Config.b2b.openId && Config.b2b.openId.enable) ? `${window.location.origin}/loggedin` : Config.b2b.keycloak.callbackUrl)); | ||
| const clientId = encodeURIComponent(((Config.b2b.openId && Config.b2b.openId.enable) ? oidcParameters.clientId : Config.b2b.keycloak.client_id)); | ||
| const redirectUri = encodeURIComponent((b2bEnabled ? `${window.location.origin}/loggedin` : Config.b2b.keycloak.callbackUrl)); |
There was a problem hiding this comment.
Suggested change
| const redirectUri = encodeURIComponent((b2bEnabled ? `${window.location.origin}/loggedin` : Config.b2b.keycloak.callbackUrl)); | |
| const redirectUri = encodeURIComponent((openidEnabled ? `${window.location.origin}/loggedin` : Config.b2b.keycloak.callbackUrl)); |
| const redirectUri = encodeURIComponent(((Config.b2b.openId && Config.b2b.openId.enable) ? `${window.location.origin}/loggedin` : Config.b2b.keycloak.callbackUrl)); | ||
| const clientId = encodeURIComponent(((Config.b2b.openId && Config.b2b.openId.enable) ? oidcParameters.clientId : Config.b2b.keycloak.client_id)); | ||
| const redirectUri = encodeURIComponent((b2bEnabled ? `${window.location.origin}/loggedin` : Config.b2b.keycloak.callbackUrl)); | ||
| const clientId = encodeURIComponent((b2bEnabled ? oidcParameters.clientId : Config.b2b.keycloak.client_id)); |
There was a problem hiding this comment.
Suggested change
| const clientId = encodeURIComponent((b2bEnabled ? oidcParameters.clientId : Config.b2b.keycloak.client_id)); | |
| const clientId = encodeURIComponent((openidEnabled ? oidcParameters.clientId : Config.b2b.keycloak.client_id)); |
|
|
||
| const [failedLogin, setFailedLogin] = useState(false); | ||
|
|
||
| useEffect(() => { |
There was a problem hiding this comment.
Do we want to grab this config again on every render?
There was a problem hiding this comment.
Ah nvm, the empty array implies a render count of only 1, and not "starting at 1". This looks great 😄
There was a problem hiding this comment.
ah true. But why is it wrapped in the useEffect() method if we only want to set it once? Couldn't we just place it as a constant at the top of the function?
|
Tested locally and added a few comments. No further comments to this one. Thanks for this one @dusanradovanovic !! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Converted AppModalLoginMain to be a functional component and removed problematic
componentWillMountlifecycle method. Also addedformiklibrary for handling login form.Linting:
Component Updates:
Tests:
e2e)Documentation: