WebUI MFA types refactor

web/packages/shared/utils/createMfaOptions.ts

@@ -18,6 +18,8 @@
 
 import { Auth2faType, PreferredMfaType } from 'shared/services/types';
 
+// Deprecated: use getMfaRegisterOptions or getMfaChallengeOptions instead.
+// TODO(Joerger): Delete once no longer used.
 export default function createMfaOptions(opts: Options) {
   const { auth2faType, required = false } = opts;
   const mfaOptions: MfaOption[] = [];

web/packages/teleport/src/Account/Account.tsx

@@ -38,10 +38,10 @@ import {
 
 import cfg from 'teleport/config';
 
-import { DeviceUsage } from 'teleport/services/auth';
-
 import { PasswordState } from 'teleport/services/user';
 
+import { DeviceUsage } from 'teleport/services/mfa';
+
 import { AuthDeviceList } from './ManageDevices/AuthDeviceList/AuthDeviceList';
 import useManageDevices, {
   State as ManageDevicesState,

web/packages/teleport/src/Account/ManageDevices/useManageDevices.ts

@@ -21,8 +21,8 @@ import useAttempt from 'shared/hooks/useAttemptNext';
 
 import Ctx from 'teleport/teleportContext';
 import cfg from 'teleport/config';
-import auth, { DeviceUsage } from 'teleport/services/auth';
-import { MfaDevice } from 'teleport/services/mfa';
+import auth from 'teleport/services/auth';
+import { DeviceUsage, MfaDevice } from 'teleport/services/mfa';
 import { MfaChallengeScope } from 'teleport/services/auth/auth';
 
 export default function useManageDevices(ctx: Ctx) {

web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.story.tsx

@@ -24,12 +24,13 @@ import Dialog from 'design/Dialog';
 
 import { http, HttpResponse, delay } from 'msw';
 
-import { DeviceUsage } from 'teleport/services/auth';
 import { createTeleportContext } from 'teleport/mocks/contexts';
 import { ContextProvider } from 'teleport/index';
 
 import cfg from 'teleport/config';
 
+import { DeviceUsage } from 'teleport/services/mfa';
+
 import {
   AddAuthDeviceWizardStepProps,
   CreateDeviceStep,

web/packages/teleport/src/Account/ManageDevices/wizards/AddAuthDeviceWizard.tsx

@@ -40,10 +40,9 @@ import { StepHeader } from 'design/StepSlider';
 import { P } from 'design/Text/Text';
 
 import auth from 'teleport/services/auth/auth';
-import { DeviceUsage } from 'teleport/services/auth';
 import useTeleport from 'teleport/useTeleport';
 
-import { MfaDevice } from 'teleport/services/mfa';
+import { DeviceUsage, MfaDevice } from 'teleport/services/mfa';
 
 import { PasskeyBlurb } from '../../../components/Passkeys/PasskeyBlurb';
 

web/packages/teleport/src/Discover/ConnectMyComputer/TestConnection/TestConnection.tsx

@@ -57,7 +57,7 @@ import { NodeMeta } from '../../useDiscover';
 
 import type { Option } from 'shared/components/Select';
 import type { AgentStepProps } from '../../types';
-import type { MfaAuthnResponse } from 'teleport/services/mfa';
+import type { MfaChallengeResponse } from 'teleport/services/mfa';
 import type { ConnectionDiagnosticRequest } from 'teleport/services/agents';
 
 export function TestConnection(props: AgentStepProps) {
@@ -144,7 +144,7 @@ export function TestConnection(props: AgentStepProps) {
   function testConnection(args: {
     login: string;
     sshPrincipalSelectionMode: ConnectionDiagnosticRequest['sshPrincipalSelectionMode'];
-    mfaResponse?: MfaAuthnResponse;
+    mfaResponse?: MfaChallengeResponse;
   }) {
     return runConnectionDiagnostic(
       {

web/packages/teleport/src/Discover/Database/TestConnection/TestConnection.tsx

@@ -32,7 +32,7 @@ import { CustomInputFieldForAsterisks } from 'teleport/Discover/Shared/CustomInp
 
 import { MfaChallengeScope } from 'teleport/services/auth/auth';
 import { DbMeta, useDiscover } from 'teleport/Discover/useDiscover';
-import { MfaAuthnResponse } from 'teleport/services/mfa';
+import { MfaChallengeResponse } from 'teleport/services/mfa';
 import { WILD_CARD } from 'teleport/Discover/Shared/const';
 
 import {
@@ -93,7 +93,7 @@ export function TestConnection() {
 
   function testConnection(
     validator: Validator,
-    mfaResponse?: MfaAuthnResponse
+    mfaResponse?: MfaChallengeResponse
   ) {
     if (!validator.validate()) {
       return;

web/packages/teleport/src/Discover/Kubernetes/TestConnection/useTestConnection.ts

@@ -22,7 +22,7 @@ import { KubeMeta } from '../../useDiscover';
 
 import type { KubeImpersonation } from 'teleport/services/agents';
 import type { AgentStepProps } from '../../types';
-import type { MfaAuthnResponse } from 'teleport/services/mfa';
+import type { MfaChallengeResponse } from 'teleport/services/mfa';
 
 /**
  * @deprecated Refactor Discover/Kubernetes/TestConnection away from the container component
@@ -34,7 +34,7 @@ export function useTestConnection(props: AgentStepProps) {
 
   function testConnection(
     impersonate: KubeImpersonation,
-    mfaResponse?: MfaAuthnResponse
+    mfaResponse?: MfaChallengeResponse
   ) {
     runConnectionDiagnostic(
       {

web/packages/teleport/src/Discover/Server/TestConnection/TestConnection.tsx

@@ -39,7 +39,7 @@ import { NodeMeta } from '../../useDiscover';
 
 import type { Option } from 'shared/components/Select';
 import type { AgentStepProps } from '../../types';
-import type { MfaAuthnResponse } from 'teleport/services/mfa';
+import type { MfaChallengeResponse } from 'teleport/services/mfa';
 
 export function TestConnection(props: AgentStepProps) {
   const {
@@ -65,7 +65,7 @@ export function TestConnection(props: AgentStepProps) {
     openNewTab(url);
   }
 
-  function testConnection(login: string, mfaResponse?: MfaAuthnResponse) {
+  function testConnection(login: string, mfaResponse?: MfaChallengeResponse) {
     runConnectionDiagnostic(
       {
         resourceKind: 'node',

web/packages/teleport/src/Discover/Shared/ConnectionDiagnostic/useConnectionDiagnostic.ts

@@ -30,7 +30,7 @@ import type {
   ConnectionDiagnostic,
   ConnectionDiagnosticRequest,
 } from 'teleport/services/agents';
-import type { MfaAuthnResponse } from 'teleport/services/mfa';
+import type { MfaChallengeResponse } from 'teleport/services/mfa';
 import type { ResourceSpec } from 'teleport/Discover/SelectResource';
 
 export function useConnectionDiagnostic() {
@@ -60,7 +60,7 @@ export function useConnectionDiagnostic() {
    */
   async function runConnectionDiagnostic(
     req: ConnectionDiagnosticRequest,
-    mfaAuthnResponse?: MfaAuthnResponse
+    mfaAuthnResponse?: MfaChallengeResponse
   ): Promise<{ mfaRequired: boolean }> {
     setDiagnosis(null); // reset since user's can re-test connection.
     setRanDiagnosis(true);

web/packages/teleport/src/Welcome/NewCredentials/types.ts

@@ -24,8 +24,9 @@ import { NewFlow, StepComponentProps } from 'design/StepSlider';
 
 import { ReactElement } from 'react';
 
-import { DeviceUsage, RecoveryCodes, ResetToken } from 'teleport/services/auth';
+import { RecoveryCodes, ResetToken } from 'teleport/services/auth';
 import { RecoveryCodesProps } from 'teleport/components/RecoveryCodes';
+import { DeviceUsage } from 'teleport/services/mfa';
 
 export type UseTokenState = {
   auth2faType: Auth2faType;

web/packages/teleport/src/Welcome/useToken.ts

@@ -23,13 +23,13 @@ import cfg from 'teleport/config';
 import history from 'teleport/services/history';
 import auth, {
   ChangedUserAuthn,
-  DeviceUsage,
   RecoveryCodes,
   ResetPasswordReqWithEvent,
   ResetPasswordWithWebauthnReqWithEvent,
   ResetToken,
 } from 'teleport/services/auth';
 import { UseTokenState } from 'teleport/Welcome/NewCredentials/types';
+import { DeviceUsage } from 'teleport/services/mfa';
 
 export default function useToken(tokenId: string): UseTokenState {
   const [resetToken, setResetToken] = useState<ResetToken>();

web/packages/teleport/src/components/AuthnDialog/AuthnDialog.test.tsx

@@ -20,7 +20,8 @@ import React from 'react';
 import { render, screen, fireEvent } from 'design/utils/testing';
 
 import { makeDefaultMfaState, MfaState } from 'teleport/lib/useMfa';
-import { SSOChallenge } from 'teleport/services/auth';
+
+import { SSOChallenge } from 'teleport/services/mfa';
 
 import AuthnDialog from './AuthnDialog';
 

web/packages/teleport/src/components/ReAuthenticate/useReAuthenticate.ts

@@ -22,7 +22,7 @@ import cfg from 'teleport/config';
 import auth from 'teleport/services/auth';
 import { MfaChallengeScope } from 'teleport/services/auth/auth';
 
-import type { MfaAuthnResponse } from 'teleport/services/mfa';
+import type { MfaChallengeResponse } from 'teleport/services/mfa';
 
 // useReAuthenticate will have different "submit" behaviors depending on:
 //  - If prop field `onMfaResponse` is defined, after a user submits, the
@@ -121,7 +121,7 @@ type BaseProps = {
 // that accepts a MFA response. No
 // authentication has been done at this point.
 type MfaResponseProps = BaseProps & {
-  onMfaResponse(res: MfaAuthnResponse): void;
+  onMfaResponse(res: MfaChallengeResponse): void;
   /**
    * The MFA challenge scope of the action to perform, as defined in webauthn.proto.
    */

web/packages/teleport/src/config.ts

@@ -34,7 +34,7 @@ import type {
 
 import type { SortType } from 'teleport/services/agents';
 import type { RecordingType } from 'teleport/services/recordings';
-import type { WebauthnAssertionResponse } from './services/auth';
+import type { WebauthnAssertionResponse } from './services/mfa';
 import type {
   PluginKind,
   Regions,

web/packages/teleport/src/lib/EventEmitterMfaSender.ts

@@ -21,7 +21,7 @@ import { EventEmitter } from 'events';
 import {
   MfaChallengeResponse,
   WebauthnAssertionResponse,
-} from 'teleport/services/auth';
+} from 'teleport/services/mfa';
 
 class EventEmitterMfaSender extends EventEmitter {
   constructor() {

web/packages/teleport/src/lib/tdp/client.ts

@@ -57,7 +57,7 @@ import type {
   SyncKeys,
   SharedDirectoryTruncateResponse,
 } from './codec';
-import type { WebauthnAssertionResponse } from 'teleport/services/auth';
+import type { WebauthnAssertionResponse } from 'teleport/services/mfa';
 
 export enum TdpClientEvent {
   TDP_CLIENT_SCREEN_SPEC = 'tdp client screen spec',

web/packages/teleport/src/lib/term/tty.ts

@@ -19,12 +19,11 @@
 import Logger from 'shared/libs/logger';
 
 import { EventEmitterMfaSender } from 'teleport/lib/EventEmitterMfaSender';
-import {
-  MfaChallengeResponse,
-  WebauthnAssertionResponse,
-} from 'teleport/services/auth';
+import { WebauthnAssertionResponse } from 'teleport/services/mfa';
 import { AuthenticatedWebSocket } from 'teleport/lib/AuthenticatedWebSocket';
 
+import { MfaChallengeResponse } from 'teleport/services/mfa';
+
 import { EventType, TermEvent, WebsocketCloseCode } from './enums';
 import { Protobuf, MessageTypeEnum } from './protobuf';
 

web/packages/teleport/src/lib/useMfa.ts

@@ -21,10 +21,13 @@ import { useState, useEffect, useCallback } from 'react';
 import { EventEmitterMfaSender } from 'teleport/lib/EventEmitterMfaSender';
 import { TermEvent } from 'teleport/lib/term/enums';
 import {
-  makeMfaAuthenticateChallenge,
+  parseMfaChallengeJson as parseMfaChallenge,
   makeWebauthnAssertionResponse,
+} from 'teleport/services/mfa/makeMfa';
+import {
+  MfaAuthenticateChallengeJson,
   SSOChallenge,
-} from 'teleport/services/auth';
+} from 'teleport/services/mfa';
 
 export function useMfa(emitterSender: EventEmitterMfaSender): MfaState {
   const [state, setState] = useState<{
@@ -129,8 +132,12 @@ export function useMfa(emitterSender: EventEmitterMfaSender): MfaState {
   useEffect(() => {
     let ssoChallengeAbortController: AbortController | undefined;
     const challengeHandler = (challengeJson: string) => {
+      const challenge = JSON.parse(
+        challengeJson
+      ) as MfaAuthenticateChallengeJson;
+
       const { webauthnPublicKey, ssoChallenge, totpChallenge } =
-        makeMfaAuthenticateChallenge(challengeJson);
+        parseMfaChallenge(challenge);
 
       setState(prevState => ({
         ...prevState,

web/packages/teleport/src/services/agents/types.ts

@@ -26,7 +26,7 @@ import { Desktop } from 'teleport/services/desktops';
 
 import { UserGroup } from '../userGroups';
 
-import type { MfaAuthnResponse } from '../mfa';
+import type { MfaChallengeResponse } from '../mfa';
 import type { Platform } from 'design/platform';
 
 export type UnifiedResource =
@@ -142,7 +142,7 @@ export type ConnectionDiagnosticRequest = {
   sshNodeSetupMethod?: 'script' | 'connect_my_computer'; // `json:"ssh_node_setup_method"`
   kubeImpersonation?: KubeImpersonation; // `json:"kubernetes_impersonation"`
   dbTester?: DatabaseTester;
-  mfaAuthnResponse?: MfaAuthnResponse;
+  mfaAuthnResponse?: MfaChallengeResponse;
 };
 
 export type KubeImpersonation = {

web/packages/teleport/src/services/api/api.ts

@@ -21,7 +21,7 @@ import auth, { MfaChallengeScope } from 'teleport/services/auth/auth';
 import websession from 'teleport/services/websession';
 
 import { storageService } from '../storageService';
-import { WebauthnAssertionResponse } from '../auth';
+import { WebauthnAssertionResponse } from '../mfa';
 
 import parseError, { ApiError } from './parseError';
 

web/packages/teleport/src/services/auth/auth.ts

@@ -18,25 +18,25 @@
 
 import api from 'teleport/services/api';
 import cfg from 'teleport/config';
-import { DeviceType } from 'teleport/services/mfa';
+import { DeviceType, DeviceUsage } from 'teleport/services/mfa';
 
 import { CaptureEvent, userEventService } from 'teleport/services/userEvent';
 
-import makePasswordToken from './makePasswordToken';
-import { makeChangedUserAuthn } from './make';
 import {
-  makeMfaAuthenticateChallenge,
-  makeMfaRegistrationChallenge,
+  parseMfaChallengeJson,
+  parseMfaRegistrationChallengeJson,
   makeWebauthnAssertionResponse,
   makeWebauthnCreationResponse,
-} from './makeMfa';
+} from '../mfa/makeMfa';
+
+import makePasswordToken from './makePasswordToken';
+import { makeChangedUserAuthn } from './make';
 import {
   ResetPasswordReqWithEvent,
   ResetPasswordWithWebauthnReqWithEvent,
   UserCredentials,
   ChangePasswordReq,
   CreateNewHardwareDeviceRequest,
-  DeviceUsage,
   CreateAuthenticateChallengeRequest,
 } from './types';
 
@@ -65,7 +65,7 @@ const auth = {
         deviceType,
         deviceUsage,
       })
-      .then(makeMfaRegistrationChallenge);
+      .then(parseMfaRegistrationChallengeJson);
   },
 
   /**
@@ -94,7 +94,7 @@ const auth = {
   createMfaAuthnChallengeWithToken(tokenId: string) {
     return api
       .post(cfg.getAuthnChallengeWithTokenUrl(tokenId))
-      .then(makeMfaAuthenticateChallenge);
+      .then(parseMfaChallengeJson);
   },
 
   // mfaLoginBegin retrieves users mfa challenges for their
@@ -107,7 +107,7 @@ const auth = {
         user: creds?.username,
         pass: creds?.password,
       })
-      .then(makeMfaAuthenticateChallenge);
+      .then(parseMfaChallengeJson);
   },
 
   login(userId: string, password: string, otpCode: string) {
@@ -270,7 +270,7 @@ const auth = {
         },
         abortSignal
       )
-      .then(makeMfaAuthenticateChallenge);
+      .then(parseMfaChallengeJson);
   },
 
   async fetchWebAuthnChallenge(
@@ -291,7 +291,7 @@ const auth = {
             },
             abortSignal
           )
-          .then(makeMfaAuthenticateChallenge)
+          .then(parseMfaChallengeJson)
       )
       .then(res =>
         navigator.credentials.get({

web/packages/teleport/src/services/auth/index.ts

@@ -18,7 +18,7 @@
 
 import service from './auth';
 
-export * from './makeMfa';
+export * from '../mfa/makeMfa';
 export * from './make';
 export * from './types';
 export default service;