TCA-853 Clean up DICE store #time 15m

Author: brooketopcoder

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

@@ -1,5 +1,5 @@
 export {
-    getDiceStatusAsync as userStoreGetDiceStatusAsync,
+    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

@@ -3,6 +3,15 @@ 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,20 +21,8 @@ export interface UserPatchRequest {
     }
 }
 
-export async function getDiceStatusAsync(userId: number): Promise<boolean> {
-
-    interface DiceStatusResult {
-        result: {
-            content: {
-                mfaEnabled: boolean
-                diceEnabled: boolean
-            }
-        }
-    }
-    const result: DiceStatusResult
-        = await xhrGetAsync<DiceStatusResult>(`${userEndpoint(userId)}/2fa`)
-
-    return !!result.result.content.mfaEnabled && !!result.result.content.diceEnabled
+export async function getMfaStatusAsync(userId: number): Promise<MfaStatusResult> {
+    return xhrGetAsync<MfaStatusResult>(`${userEndpoint(userId)}/2fa`)
 }
 
 export async function patchAsync(userId: number, request: UserPatchRequest): Promise<User> {

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

@@ -1,7 +1,9 @@
-import { UserPatchRequest, userStoreGetDiceStatusAsync, userStorePatchAsync } 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> {
-    return userStoreGetDiceStatusAsync(userId)
+    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> {