Merge pull request #459 from topcoder-platform/dev

2.6 Wipro DICE IDs Release - 2023-01-04 -> master

Author: brooketopcoder

src-ts/.eslintrc.js

@@ -251,6 +251,12 @@ module.exports = {
             2,
             4,
         ],
+        'react/jsx-no-bind': [
+            'error',
+            {
+                allowFunctions: true,
+            }
+        ],
         'react/jsx-no-useless-fragment': [
             0
         ],

src-ts/config/environments/environment.default.config.ts

@@ -36,6 +36,7 @@ export const EnvironmentConfigDefault: EnvironmentConfigModel = {
             'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg',
     },
     TOPCODER_URLS: {
+        ACCOUNT_SETTINGS: `${COMMUNITY_WEBSITE}/settings/account`,
         API_BASE: `${COMMUNITY_WEBSITE}/api`,
         BLOG_PAGE: `${COMMUNITY_WEBSITE}/blog`,
         CHALLENGES_PAGE: `${COMMUNITY_WEBSITE}/challenges`,

src-ts/config/environments/environment.prod.config.ts

@@ -34,6 +34,7 @@ export const EnvironmentConfigProd: EnvironmentConfigModel = {
             'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg',
     },
     TOPCODER_URLS: {
+        ACCOUNT_SETTINGS: `${COMMUNITY_WEBSITE}/settings/account`,
         API_BASE: `${COMMUNITY_WEBSITE}/api`,
         BLOG_PAGE: `${COMMUNITY_WEBSITE}/blog`,
         CHALLENGES_PAGE: `${COMMUNITY_WEBSITE}/challenges`,

src-ts/lib/functions/token-functions/token.functions.ts

@@ -15,9 +15,10 @@ export async function getAsync(): Promise<TokenModel> {
     }
 
     try {
-        const { handle, roles }: {
+        const { handle, roles, userId }: {
             handle?: string
             roles?: Array<string>
+            userId?: number
         } = decodeToken(token)
 
         // if we didn't find the handle, we have a bad token
@@ -26,8 +27,9 @@ export async function getAsync(): Promise<TokenModel> {
             return Promise.resolve({})
         }
 
-        return Promise.resolve({ handle, roles, token })
+        return Promise.resolve({ handle, roles, token, userId })
 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
         logError(error)
         return Promise.resolve({})

src-ts/lib/functions/token-functions/token.model.ts

@@ -2,4 +2,5 @@ export interface TokenModel {
     handle?: string
     roles?: Array<string>
     token?: string
+    userId?: number
 }

src-ts/lib/functions/user-functions/index.ts

@@ -1 +1,4 @@
-export { updatePasswordAsync as userUpdatePasswordAsync } from './user.functions'
+export {
+    getDiceStatusAsync as userGetDiceStatusAsync,
+    updatePasswordAsync as userUpdatePasswordAsync,
+} from './user.functions'

src-ts/lib/functions/user-functions/user-store/index.ts

@@ -1,2 +1,5 @@
-export { patchAsync as userPatchAsync } from './user-xhr.store'
+export {
+    getMfaStatusAsync as userStoreGetMfaStatusAsync,
+    patchAsync as userStorePatchAsync,
+} from './user-xhr.store'
 export { type UserPatchRequest } from './user-xhr.store'

src-ts/lib/functions/user-functions/user-store/user-xhr.store.ts

@@ -1,8 +1,17 @@
 import { User } from '../../../../../types/tc-auth-lib'
-import { xhrPatchAsync } from '../../xhr-functions'
+import { xhrGetAsync, xhrPatchAsync } from '../../xhr-functions'
 
 import { user as userEndpoint } from './user-endpoint.config'
 
+export interface MfaStatusResult {
+    result: {
+        content: {
+            diceEnabled: boolean
+            mfaEnabled: boolean
+        }
+    }
+}
+
 export interface UserPatchRequest {
     param: {
         credential: {
@@ -12,6 +21,10 @@ export interface UserPatchRequest {
     }
 }
 
+export async function getMfaStatusAsync(userId: number): Promise<MfaStatusResult> {
+    return xhrGetAsync<MfaStatusResult>(`${userEndpoint(userId)}/2fa`)
+}
+
 export async function patchAsync(userId: number, request: UserPatchRequest): Promise<User> {
     const url: string = userEndpoint(userId)
     return xhrPatchAsync(url, request)

src-ts/lib/functions/user-functions/user.functions.ts

@@ -1,4 +1,10 @@
-import { userPatchAsync, UserPatchRequest } from './user-store'
+import { UserPatchRequest, userStoreGetMfaStatusAsync, userStorePatchAsync } from './user-store'
+import { MfaStatusResult } from './user-store/user-xhr.store'
+
+export async function getDiceStatusAsync(userId: number): Promise<boolean> {
+    const result: MfaStatusResult = await userStoreGetMfaStatusAsync(userId)
+    return !!result.result.content.mfaEnabled && !!result.result.content.diceEnabled
+}
 
 export async function updatePasswordAsync(userId: number, currentPassword: string, password: string): Promise<void> {
     const request: UserPatchRequest = {
@@ -9,6 +15,6 @@ export async function updatePasswordAsync(userId: number, currentPassword: strin
             },
         },
     }
-    return userPatchAsync(userId, request)
+    return userStorePatchAsync(userId, request)
         .then(() => undefined)
 }

src-ts/lib/global-config.model.ts

@@ -29,6 +29,7 @@ export interface GlobalConfig {
         CUSTOMER_TOKEN: string
     }
     TOPCODER_URLS: {
+        ACCOUNT_SETTINGS: string
         API_BASE: string
         BLOG_PAGE: string
         CHALLENGES_PAGE: string