Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: lay groundwork for cross-platform login #750

Merged
merged 3 commits into from
Jun 9, 2023
Merged

feat: lay groundwork for cross-platform login #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c21360f
feat: lay groundwork for cross-platform login
ericbolikowski Jun 8, 2023
6be1158
Revert "feat: lay groundwork for cross-platform login"
ericbolikowski Jun 9, 2023
127bf03
implement cross-platform login
ericbolikowski Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 68 additions & 8 deletions apps/redi-connect/src/pages/front/login/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
import { useLoadMyProfileQuery } from '@talent-connect/data-access'
import {
LoadMyProfileDocument,
LoadMyProfileQuery,
LoadMyProfileQueryVariables,
MyTpDataDocument,
MyTpDataQuery,
MyTpDataQueryVariables,
RediLocation,
UserType,
fetcher,
useConProfileSignUpMutation,
useLoadMyProfileQuery,
} from '@talent-connect/data-access'
import {
Button,
FormInput,
Heading
Heading,
} from '@talent-connect/shared-atomic-design-components'
import { REDI_LOCATION_NAMES } from '@talent-connect/shared-config'
import { RediLocation } from '@talent-connect/shared-types'
import { buildFrontendUrl } from '@talent-connect/shared-utils'
import { useFormik } from 'formik'
import { capitalize } from 'lodash'
Expand All @@ -17,7 +28,8 @@ import Teaser from '../../../components/molecules/Teaser'
import AccountOperation from '../../../components/templates/AccountOperation'
import { login } from '../../../services/api/api'
import {
getAccessTokenFromLocalStorage, purgeAllSessionData
getAccessTokenFromLocalStorage,
purgeAllSessionData,
} from '../../../services/auth/auth'
import { envRediLocation } from '../../../utils/env-redi-location'

Expand All @@ -36,6 +48,20 @@ const validationSchema = Yup.object({
password: Yup.string().required().label('Password').max(255),
})

// This is copied directly from the file that contains the auto-codegenerated useMyTpDataQuery.
// We have a need to use the underlying data fetcher function directly. If we were to use the
// react queries directly, the logic inside of our component would be needlessly complex.
// Believe us. We tried. (Kate, Eric, 9 June 2023)
const myTpDataFetcher = fetcher<MyTpDataQuery, MyTpDataQueryVariables>(
MyTpDataDocument
)
// Same for the useLoadMyProfileQuery that loads CON data:
const buildMyConProfileDataFetcher = () =>
fetcher<LoadMyProfileQuery, LoadMyProfileQueryVariables>(
LoadMyProfileDocument,
{ loopbackUserId: getAccessTokenFromLocalStorage()?.userId }
)

export default function Login() {
const history = useHistory()
const accessToken = getAccessTokenFromLocalStorage()
Expand All @@ -45,6 +71,7 @@ export default function Login() {
{ loopbackUserId: stateLoopbackUserId },
{ enabled: Boolean(stateLoopbackUserId) }
)
const conProfileSignUpMutation = useConProfileSignUpMutation()

const [loginError, setLoginError] = useState<string>('')

Expand All @@ -63,8 +90,40 @@ export default function Login() {
formik.values.password
)
setStateLoopbackUserId(accessToken.userId)
formik.setSubmitting(false)
history.push('/app/me')

// Note: we have to "build" the con profile data fetcher here because it
// relies on the access token, which is not available until after the user
// has logged in.
const fetchMyConProfileOrFail = buildMyConProfileDataFetcher()
try {
await fetchMyConProfileOrFail()
return history.push('/app/me')
} catch (err) {
// If the user does not have a con profile, we will try to create one
// for them using the data from the TP.
// If the user does not have a TP profile, we will show them an error.
const tpUserData = await myTpDataFetcher()
const tpJobseekerDirectoryEntry =
tpUserData.tpCurrentUserDataGet?.tpJobseekerDirectoryEntry
const userHasATpJobseekerProfile = Boolean(tpJobseekerDirectoryEntry)

if (userHasATpJobseekerProfile) {
await conProfileSignUpMutation.mutateAsync({
input: {
email: tpJobseekerDirectoryEntry.email,
firstName: tpJobseekerDirectoryEntry.firstName,
lastName: tpJobseekerDirectoryEntry.lastName,
userType: UserType.Mentee,
rediLocation: envRediLocation() as RediLocation,
mentee_currentlyEnrolledInCourse:
tpJobseekerDirectoryEntry.currentlyEnrolledInCourse,
},
})
return history.push(`/front/signup-complete/mentee`)
} else {
throw err
}
}
} catch (err) {
formik.setSubmitting(false)
setLoginError('You entered an incorrect email, password, or both.')
Expand Down Expand Up @@ -96,8 +155,9 @@ export default function Login() {
{/* Commented and replaced with different text until the cross-platform log-in feature is implemented. */}
{/* Got a ReDI Talent Pool user account? You can use the same username
and password here. */}
Got a ReDI Talent Pool user account? To log in with the same username
and password get in contact with @Kate in ReDI Slack or write an e-mail
Got a ReDI Talent Pool user account? To log in with the same
username and password get in contact with @Kate in ReDI Slack or
write an e-mail
<a href="mailto:[email protected]"> here</a>.
</Content>

Expand Down
104 changes: 83 additions & 21 deletions apps/redi-talent-pool/src/pages/front/login/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import {
LoadMyProfileDocument,
LoadMyProfileQuery,
LoadMyProfileQueryVariables,
MyTpDataDocument,
MyTpDataQuery,
MyTpDataQueryVariables,
fetcher,
} from '@talent-connect/data-access'
import {
Button,
FormInput,
Heading
Heading,
} from '@talent-connect/shared-atomic-design-components'
import { FormikHelpers as FormikActions, FormikValues, useFormik } from 'formik'
import { useCallback, useState } from 'react'
Expand All @@ -11,8 +20,12 @@ import * as Yup from 'yup'
import TpTeaser from '../../../components/molecules/TpTeaser'
import AccountOperation from '../../../components/templates/AccountOperation'
import { login } from '../../../services/api/api'
import { saveAccessTokenToLocalStorage } from '../../../services/auth/auth'
import {
getAccessTokenFromLocalStorage,
saveAccessTokenToLocalStorage,
} from '../../../services/auth/auth'
import { history } from '../../../services/history/history'
import { useSignUpJobseekerMutation } from '../signup/SignUp.generated'

interface LoginFormValues {
username: string
Expand All @@ -29,26 +42,74 @@ const validationSchema = Yup.object({
password: Yup.string().required().label('Password').max(255),
})

// This is copied directly from the file that contains the auto-codegenerated useMyTpDataQuery.
// We have a need to use the underlying data fetcher function directly. If we were to use the
// react queries directly, the logic inside of our component would be needlessly complex.
// Believe us. We tried. (Kate, Eric, 9 June 2023)
const myTpDataFetcher = fetcher<MyTpDataQuery, MyTpDataQueryVariables>(
MyTpDataDocument
)
// Same for the useLoadMyProfileQuery that loads CON data:
const buildMyConProfileDataFetcher = () =>
fetcher<LoadMyProfileQuery, LoadMyProfileQueryVariables>(
LoadMyProfileDocument,
{ loopbackUserId: getAccessTokenFromLocalStorage()?.userId }
)

export default function Login() {
const [loginError, setLoginError] = useState<string>('')
const tpJobseekerSignupMutation = useSignUpJobseekerMutation()

const submitForm = useCallback((values, actions) => {
;(async (values: FormikValues, actions: FormikActions<LoginFormValues>) => {
const formValues = values as LoginFormValues
try {
const accessToken = await login(
formValues.username,
formValues.password
)
saveAccessTokenToLocalStorage(accessToken)
actions.setSubmitting(false)
history.push('/app/me')
} catch (err) {
actions.setSubmitting(false)
setLoginError('You entered an incorrect email, password, or both.')
}
})(values, actions)
}, [])
const submitForm = useCallback(
(values, actions) => {
;(async (
values: FormikValues,
actions: FormikActions<LoginFormValues>
) => {
const formValues = values as LoginFormValues
try {
const accessToken = await login(
formValues.username,
formValues.password
)
saveAccessTokenToLocalStorage(accessToken)

const tpUserData = await myTpDataFetcher()
// Note: we have to "build" the con profile data fetcher here because it
// relies on the access token, which is not available until after the user
// has logged in.
const myConProfileDataFetcher = buildMyConProfileDataFetcher()
const conUserData = await myConProfileDataFetcher()
const userHasATpProfile =
Boolean(
tpUserData.tpCurrentUserDataGet.tpJobseekerDirectoryEntry
) || Boolean(tpUserData.tpCurrentUserDataGet.representedCompany)
const userDoesNotHaveTpProfile = !userHasATpProfile
const userHasConProfile = Boolean(conUserData.conProfile)

if (userHasATpProfile) {
return history.push('/app/me')
}
if (userDoesNotHaveTpProfile && userHasConProfile) {
await tpJobseekerSignupMutation.mutateAsync({
input: {
firstName: conUserData.conProfile.firstName,
lastName: conUserData.conProfile.lastName,
currentlyEnrolledInCourse:
conUserData.conProfile.mentee_currentlyEnrolledInCourse,
rediLocation: conUserData.conProfile.rediLocation,
},
})
return history.push('/app/me')
}
} catch (err) {
actions.setSubmitting(false)
setLoginError('You entered an incorrect email, password, or both.')
}
})(values, actions)
},
[tpJobseekerSignupMutation]
)

const formik = useFormik({
initialValues,
Expand All @@ -75,8 +136,9 @@ export default function Login() {
{/* Commented and replaced with different text until the cross-platform log-in feature is implemented. */}
{/* Got a ReDI Connect user account? You can use the same username and
password here. */}
Got a ReDI Connect user account? To log in with the same username
and password get in contact with @Kate in ReDI Slack or write an e-mail
Got a ReDI Connect user account? To log in with the same username
and password get in contact with @Kate in ReDI Slack or write an
e-mail
<a href="mailto:[email protected]"> here</a>.
</Content>

Expand Down