Skip to content

Commit 5f03e7a

Browse files
authored
Merge pull request #1220 from topcoder-platform/PM-1764_remove-2fa-and-diceid
PM-1764 - remove all instances of 2fa and diceid
2 parents d0f3439 + 37a0adc commit 5f03e7a

File tree

39 files changed

+9
-301
lines changed

39 files changed

+9
-301
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
import { ReactComponent as MFAImage } from './mfa.svg'
21
import { ReactComponent as AppleStore } from './apple-store.svg'
32
import credentialImage from './credential.png'
4-
import diceIdLogo from './dicelogo.png'
5-
import diceIdLogoBig from './dicelogobig.png'
6-
import diceIdLogoSmall from './dicelogosmall.png'
73
import googlePlay from './google-play.png'
84

95
export {
106
AppleStore,
117
credentialImage,
12-
diceIdLogo,
13-
diceIdLogoBig,
14-
diceIdLogoSmall,
158
googlePlay,
16-
MFAImage,
179
}

src/apps/accounts/src/lib/assets/security/mfa.svg

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/apps/learn/src/certification-details/enroll-cta-btn/EnrollCtaBtn.tsx

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import { Dispatch, FC, SetStateAction, useCallback, useContext, useState } from 'react'
1+
import { FC, useCallback, useContext } from 'react'
22
import { NavigateFunction, useNavigate } from 'react-router-dom'
33

44
import { Button } from '~/libs/ui'
55
import { profileContext, ProfileContextData } from '~/libs/core'
66

77
import { getAuthenticateAndEnrollRoute, getTCACertificationEnrollPath } from '../../learn.routes'
8-
import { LearnConfig } from '../../config'
9-
import { DiceModal } from '../../course-details/course-curriculum/dice-modal'
108

119
interface EnrollCtaBtnProps {
1210
certification: string
@@ -15,15 +13,9 @@ interface EnrollCtaBtnProps {
1513
const EnrollCtaBtn: FC<EnrollCtaBtnProps> = (props: EnrollCtaBtnProps) => {
1614
const navigate: NavigateFunction = useNavigate()
1715
const { initialized: profileReady, profile }: ProfileContextData = useContext(profileContext)
18-
const [isDiceModalOpen, setIsDiceModalOpen]: [boolean, Dispatch<SetStateAction<boolean>>]
19-
= useState<boolean>(false)
2016

2117
const isLoggedIn: boolean = profileReady && !!profile
2218

23-
function onDiceModalClose(): void {
24-
setIsDiceModalOpen(false)
25-
}
26-
2719
/**
2820
* Handle user click on start course/resume/login button
2921
*/
@@ -37,15 +29,8 @@ const EnrollCtaBtn: FC<EnrollCtaBtnProps> = (props: EnrollCtaBtnProps) => {
3729
return
3830
}
3931

40-
// if the user is wipro and s/he hasn't set up DICE,
41-
// let the user know
42-
if (LearnConfig.REQUIRE_DICE_ID && profile?.isWipro && !profile.diceEnabled) {
43-
setIsDiceModalOpen(true)
44-
return
45-
}
46-
4732
navigate(getTCACertificationEnrollPath(props.certification))
48-
}, [isLoggedIn, profile?.isWipro, profile?.diceEnabled, props, navigate])
33+
}, [isLoggedIn, props, navigate])
4934

5035
return (
5136
<>
@@ -55,11 +40,6 @@ const EnrollCtaBtn: FC<EnrollCtaBtnProps> = (props: EnrollCtaBtnProps) => {
5540
label={isLoggedIn ? 'Enroll Now' : 'Log in to enroll'}
5641
onClick={handleEnrollClick}
5742
/>
58-
59-
<DiceModal
60-
isOpen={isDiceModalOpen}
61-
onClose={onDiceModalClose}
62-
/>
6343
</>
6444
)
6545
}

src/apps/learn/src/config/learn-config.model.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ export interface LearnConfigModel {
77
value: string,
88
}
99
CLIENT: string
10-
REQUIRE_DICE_ID: boolean | undefined
1110
}

src/apps/learn/src/config/learn.default.config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { EnvironmentConfig } from '~/config'
2-
import { getReactEnv } from '~/config/environments/react-env'
32

43
import { LearnConfigModel } from './learn-config.model'
54

@@ -14,5 +13,4 @@ export const LearnConfigDefault: LearnConfigModel = {
1413
value: 'certificate-container',
1514
},
1615
CLIENT: 'https://fcc.topcoder-dev.com:4431',
17-
REQUIRE_DICE_ID: `${getReactEnv<string>('REQUIRE_DICE_ID', '')}` === 'true',
1816
}

src/apps/learn/src/course-details/course-curriculum/CourseCurriculum.tsx

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ import {
2222
getLessonPathFromCurrentLesson,
2323
LEARN_PATHS,
2424
} from '../../learn.routes'
25-
import { LearnConfig } from '../../config'
2625

2726
import { CurriculumSummary } from './curriculum-summary'
2827
import { TcAcademyPolicyModal } from './tc-academy-policy-modal'
29-
import { DiceModal } from './dice-modal'
3028
import styles from './CourseCurriculum.module.scss'
3129

3230
interface CourseCurriculumProps {
@@ -47,8 +45,6 @@ const CourseCurriculum: FC<CourseCurriculumProps> = (props: CourseCurriculumProp
4745

4846
const [isTcAcademyPolicyModal, setIsTcAcademyPolicyModal]: [boolean, Dispatch<SetStateAction<boolean>>]
4947
= useState<boolean>(false)
50-
const [isDiceModalOpen, setIsDiceModalOpen]: [boolean, Dispatch<SetStateAction<boolean>>]
51-
= useState<boolean>(false)
5248

5349
const status: string = props.progress?.status ?? UserCertificationProgressStatus.inititialized
5450
const completedPercentage: number = (props.progress?.courseProgressPercentage ?? 0) / 100
@@ -98,17 +94,6 @@ const CourseCurriculum: FC<CourseCurriculumProps> = (props: CourseCurriculumProp
9894
return
9995
}
10096

101-
// if the user is wipro and s/he hasn't set up DICE,
102-
// let the user know
103-
if (
104-
LearnConfig.REQUIRE_DICE_ID
105-
&& props.profile?.isWipro
106-
&& !props.profile.diceEnabled
107-
) {
108-
setIsDiceModalOpen(true)
109-
return
110-
}
111-
11297
// Check if user accepted policy and resume(or start) the course
11398
if (props.progress?.academicHonestyPolicyAcceptedAt) {
11499
handleStartCourse()
@@ -188,10 +173,6 @@ const CourseCurriculum: FC<CourseCurriculumProps> = (props: CourseCurriculumProp
188173
setIsTcAcademyPolicyModal(false)
189174
}
190175

191-
function onDiceModalClose(): void {
192-
setIsDiceModalOpen(false)
193-
}
194-
195176
return (
196177
<>
197178
<div className={styles.wrap}>
@@ -232,11 +213,6 @@ const CourseCurriculum: FC<CourseCurriculumProps> = (props: CourseCurriculumProp
232213
onClose={onAcademicHonestyModalClose}
233214
onConfirm={handlePolicyAccept}
234215
/>
235-
236-
<DiceModal
237-
isOpen={isDiceModalOpen}
238-
onClose={onDiceModalClose}
239-
/>
240216
</>
241217
)
242218
}

src/apps/learn/src/course-details/course-curriculum/dice-modal/DiceModal.module.scss

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)