cleanup

Author: langleyd

src/CryptoSetup/EnablingRecoveryStepViewModel.ts

@@ -92,10 +92,6 @@ export class EnablingRecoveryStepViewModel
                             });
                             break;
                         case EnableRecoveryProgress_Tags.Done:
-                            console.log(
-                                "Recovery setup complete! Recovery key:",
-                                progress.inner.recoveryKey,
-                            );
                             this.complete({
                                 outcome: "complete",
                                 recoveryKey: progress.inner.recoveryKey,

src/CryptoSetup/EncryptionFlowViewModel.ts

@@ -116,7 +116,6 @@ export class EncryptionFlowViewModel
     }
 
     private cleanup(): void {
-        console.log("[EncryptionFlow] cleanup - clearing state");
         this.snapshot.merge({
             currentScreen: null,
             screenType: null,
@@ -128,22 +127,18 @@ export class EncryptionFlowViewModel
      * Start the encryption flow. Runs until complete or user cancels.
      */
     public async startFlow(): Promise<EncryptionFlowResult> {
-        console.log("[EncryptionFlow] startFlow called");
         this.cancelled = false;
         this.snapshot.merge({ isActive: true, isLoading: true });
-        console.log("[EncryptionFlow] Set isActive: true, isLoading: true");
 
         try {
             // Check initial state to determine available options
-            console.log("[EncryptionFlow] Checking initial state...");
             const [backupExistsOnServer, hasDevicesToVerifyAgainst] = await Promise.all([
                 this.checkBackupExistsOnServer(),
                 this.checkHasDevicesToVerifyAgainst(),
             ]);
 
             const recoveryState = this.encryption.recoveryState();
             // RecoveryState: Unknown=0, Enabled=1, Disabled=2, Incomplete=3
-            console.log("[EncryptionFlow] Initial state:", { backupExistsOnServer, hasDevicesToVerifyAgainst, recoveryState });
 
             // Compute available actions
             const availableActions: IdentityConfirmationAction[] = [];
@@ -157,11 +152,8 @@ export class EncryptionFlowViewModel
                 availableActions.push(IdentityConfirmationAction.Recovery);
             }
 
-            console.log("[EncryptionFlow] Available actions:", availableActions);
-
             // Always run the confirm identity flow - even if no actions available,
             // the user can still choose "Can't confirm" which leads to reset
-            console.log("[EncryptionFlow] Starting confirm identity flow");
             while (!this.cancelled) {
                 const confirmResult = await this.runConfirmIdentityStep(availableActions);
 
@@ -196,7 +188,6 @@ export class EncryptionFlowViewModel
                 if (outcome === "interactiveVerification") {
                     // TODO: Implement interactive verification
                     // For now, just continue the loop
-                    console.log("Interactive verification not yet implemented");
                     continue;
                 }
 
@@ -221,7 +212,6 @@ export class EncryptionFlowViewModel
             return { type: "cancelled" };
         } catch (e) {
             printRustError("Encryption flow failed", e);
-            console.log("[EncryptionFlow] Error in startFlow:", e);
             this.cleanup();
             return { type: "cancelled" };
         }
@@ -252,18 +242,15 @@ export class EncryptionFlowViewModel
         | { type: "back" }
         | { type: "cancel" }
     > {
-        console.log("[EncryptionFlow] runConfirmIdentityStep - creating VM");
         const vm = new ConfirmIdentityStepViewModel({
             availableActions,
         });
 
-        console.log("[EncryptionFlow] runConfirmIdentityStep - setting currentScreen and isLoading: false");
         this.snapshot.merge({
             currentScreen: vm as FlowStepViewModel<unknown, unknown, unknown>,
             screenType: vm.screenType,
             isLoading: false,
         });
-        console.log("[EncryptionFlow] runConfirmIdentityStep - state updated, waiting for result");
 
         return vm.result as Promise<
             | { type: "success"; data: { outcome: "useRecoveryKey" | "interactiveVerification" | "resetIdentity" } }
@@ -406,7 +393,6 @@ export class EncryptionFlowViewModel
             const raceResult = await Promise.race([oidcPromise, userActionPromise]);
 
             if (raceResult.type === "oidc-complete") {
-                console.log("OIDC reset complete");
                 if (popup && !popup.closed) {
                     popup.close();
                 }
@@ -469,20 +455,16 @@ export class EncryptionFlowViewModel
     }
 
     private async runSetupRecoveryFlow(): Promise<EncryptionFlowResult> {
-        console.log("[EncryptionFlow] runSetupRecoveryFlow - creating SetupRecoveryStepViewModel");
         // Show setup recovery step
         const setupVm = new SetupRecoveryStepViewModel({});
 
-        console.log("[EncryptionFlow] runSetupRecoveryFlow - setting currentScreen and isLoading: false");
         this.snapshot.merge({
             currentScreen: setupVm as FlowStepViewModel<unknown, unknown, unknown>,
             screenType: setupVm.screenType,
             isLoading: false,
         });
 
-        console.log("[EncryptionFlow] runSetupRecoveryFlow - waiting for setupVm.result");
         const setupResult = await setupVm.result;
-        console.log("[EncryptionFlow] runSetupRecoveryFlow - setupResult:", setupResult);
 
         if (setupResult.type !== "success") {
             return { type: "cancelled" };

src/CryptoSetup/RecoveryKeyEntryStepViewModel.ts

@@ -77,7 +77,6 @@ export class RecoveryKeyEntryStepViewModel
 
         try {
             await this.props.encryption.recover(recoveryKey);
-            console.log("Recovery successful");
             this.complete({ outcome: "verified" });
         } catch (e) {
             printRustError("Failed to recover", e);

src/CryptoSetup/ResetIdentityExecuteStepViewModel.ts

@@ -75,19 +75,16 @@ export class ResetIdentityExecuteStepViewModel
         this.snapshot.merge({ isResetting: true, error: null });
 
         try {
-            console.log("Executing identity reset...");
             const handle = await this.props.encryption.resetIdentity();
 
             if (!handle) {
                 // Reset completed without auth
-                console.log("Reset completed without auth");
                 this.complete({ outcome: "resetComplete" });
                 return;
             }
 
             // Check auth type
             const authType = handle.authType();
-            console.log("Reset auth type:", authType);
 
             if (authType?.tag === "Oidc") {
                 // OIDC: Return to flow to handle - will go back to warning screen

src/CryptoSetup/ResetIdentityPasswordStepViewModel.ts

@@ -88,7 +88,6 @@ export class ResetIdentityPasswordStepViewModel
             const authData = AuthData.Password.new({ passwordDetails });
 
             await this.props.resetHandle.reset(authData);
-            console.log("Password reset complete");
             this.complete({ outcome: "resetComplete" });
         } catch (e) {
             printRustError("Failed to reset with password", e);

src/CryptoSetup/encryption-view.types.ts

@@ -104,7 +104,3 @@ export type { FlowStepResult } from "./FlowStepViewModel";
 
 // Types
 export type { ScreenProps } from "./screenRegistry.types";
-export {
-    EncryptionFlow,
-} from "./encryption-view.types";
-export type { EncryptionViewSnapshot } from "./encryption-view.types";

src/CryptoSetup/index.ts

@@ -54,12 +54,9 @@ export const Encryption: React.FC<EncryptionProps> = ({
         encryptionFlowViewModel.setPopupOpener(popupOpener);
     }, [encryptionFlowViewModel, popupOpener]);
 
-    console.log("[Encryption] Render:", { isLoading, isActive, hasCurrentScreen: !!currentScreen, screenType });
-
     useEffect(() => {
         if (!flowStartedRef.current) {
             flowStartedRef.current = true;
-            console.log("[Encryption] Starting flow");
             // Start the encryption flow - runs async
             encryptionFlowViewModel.startFlow();
         }
@@ -70,8 +67,6 @@ export const Encryption: React.FC<EncryptionProps> = ({
     // 2. Flow is active but no screen is set yet (race condition protection)
     const showLoading = isLoading || (isActive && !currentScreen);
 
-    console.log("[Encryption] showLoading:", showLoading, "willShowModal:", isActive && currentScreen && !showLoading);
-
     // Loading state shown in a dialog
     const loadingContent = showLoading
         ? createPortal(

src/Encryption.module.css

@@ -93,8 +93,6 @@ export class OidcLoginViewModel
             const authData = await this.props.onGetOidcAuthUrl(server);
             const loginUrl = authData.loginUrl();
 
-            console.log("Opening OIDC login URL:", loginUrl);
-
             // Open OIDC provider in a popup window
             const width = 600;
             const height = 700;
@@ -140,7 +138,6 @@ export class OidcLoginViewModel
                 if (popup.closed) {
                     cleanup();
                     if (!loginCompleted) {
-                        console.log("OIDC popup closed - user cancelled");
                         await this.props.onAbortOidcLogin();
                         this.snapshot.merge({ loggingIn: false });
                     }
@@ -172,7 +169,6 @@ export class OidcLoginViewModel
 
             // Check if this is a user cancellation error
             if (errorMessage.includes("OidcError.Cancelled")) {
-                console.log("OIDC login cancelled by user");
                 await this.props.onAbortOidcLogin();
                 this.snapshot.merge({ loggingIn: false });
                 return;