bitty-tui 0.0.13 → 0.0.15

package/dist/cli.js

@@ -5,9 +5,13 @@ import App from "./app.js";
 import { StatusMessageProvider } from "./hooks/status-message.js";
 import { readPackageUpSync } from "read-package-up";
 import { art } from "./theme/art.js";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 const args = process.argv.slice(2);
 if (args.includes("--version") || args.includes("-v")) {
-    const pkg = readPackageUpSync();
+    const __filename = fileURLToPath(import.meta.url);
+    const __dirname = path.dirname(__filename);
+    const pkg = readPackageUpSync({ cwd: __dirname });
     console.log(pkg?.packageJson.version ?? "unknown");
     process.exit(0);
 }

package/dist/clients/bw.d.ts

@@ -239,4 +239,5 @@ export declare class Client {
             type: number;
         }[] | undefined;
     };
+    logout(): void;
 }

package/dist/clients/bw.js

@@ -101,9 +101,12 @@ export var KeyType;
 export const TwoFactorProvider = {
     "0": "Authenticator",
     "1": "Email",
-    "2": "Fido2",
+    "2": "Duo",
     "3": "Yubikey",
-    "4": "Duo",
+    "4": "U2f",
+    "6": "Org Duo",
+    "7": "Fido2",
+    "8": "Recovery Code",
 };
 export var KdfType;
 (function (KdfType) {
@@ -449,7 +452,7 @@ export class Client {
         this.orgKeys = {};
     }
     async sendEmailMfaCode(email) {
-        fetch("https://vault.bitwarden.eu/api/two-factor/send-email-login", {
+        fetch(`${this.apiUrl}/two-factor/send-email-login`, {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
@@ -798,4 +801,13 @@ export class Client {
         }
         return ret;
     }
+    logout() {
+        this.token = null;
+        this.refreshToken = null;
+        this.tokenExpiration = null;
+        this.keys = {};
+        this.orgKeys = {};
+        this.decryptedSyncCache = null;
+        this.syncCache = null;
+    }
 }

package/dist/dashboard/DashboardView.js

@@ -42,6 +42,7 @@ export function DashboardView({ onLogout }) {
     }, [listSelected, filteredCiphers]);
     const selectedCipher = detailMode === "new" ? editedCipher : filteredCiphers[listIndex];
     const logout = async () => {
+        bwClient.logout();
         await clearConfig();
         onLogout();
     };

package/dist/login/LoginView.js

@@ -16,10 +16,17 @@ export function LoginView({ onLogin }) {
     const [password, setPassword] = useState("");
     const [mfaParams, setMfaParams] = useState(null);
     const [askMfa, setAskMfa] = useState(null);
+    const [mfaProviderData, setMfaProviderData] = useState(null);
     const [rememberMe, setRememberMe] = useState(false);
+    const [resendTimeout, setResendTimeout] = useState(0);
     const { stdout } = useStdout();
     const { focusNext, focusPrevious } = useFocusManager();
     const { statusMessage, statusMessageColor, showStatusMessage } = useStatusMessage();
+    const getProviderLabel = (provider) => TwoFactorProvider[String(provider)] ?? `Provider ${provider}`;
+    const getProviderData = (provider) => mfaProviderData?.[String(provider)] ?? null;
+    const isEmailProvider = (provider) => String(provider) === "1";
+    const isDuoProvider = (provider) => String(provider) === "2" || String(provider) === "6";
+    const isWebAuthnProvider = (provider) => String(provider) === "7";
     useInput(async (_, key) => {
         if (key.upArrow) {
             focusPrevious();
@@ -47,14 +54,29 @@ export function LoginView({ onLogin }) {
             catch (e) {
                 if (e instanceof FetchError) {
                     const data = e.json();
+                    if (data.TwoFactorProviders2) {
+                        setMfaProviderData(data.TwoFactorProviders2);
+                    }
                     if (data.TwoFactorProviders) {
-                        if (data.TwoFactorProviders.length === 1) {
+                        const providers = data.TwoFactorProviders;
+                        if (providers.length === 1) {
                             setMfaParams({
-                                twoFactorProvider: data.TwoFactorProviders[0],
+                                twoFactorProvider: providers[0],
                             });
                         }
-                        else if (data.TwoFactorProviders.length > 1) {
-                            setAskMfa(data.TwoFactorProviders);
+                        else if (providers.length > 1) {
+                            setAskMfa(providers);
+                        }
+                    }
+                    else if (data.TwoFactorProviders2) {
+                        const providers = Object.keys(data.TwoFactorProviders2);
+                        if (providers.length === 1) {
+                            setMfaParams({
+                                twoFactorProvider: providers[0],
+                            });
+                        }
+                        else if (providers.length > 1) {
+                            setAskMfa(providers);
                         }
                     }
                 }
@@ -93,8 +115,20 @@ export function LoginView({ onLogin }) {
             }
         })();
     }, []);
+    useEffect(() => {
+        let interval;
+        if (resendTimeout > 0) {
+            interval = setInterval(() => {
+                setResendTimeout((t) => t - 1);
+            }, 1000);
+        }
+        return () => {
+            if (interval)
+                clearInterval(interval);
+        };
+    }, [resendTimeout]);
     return (_jsxs(Box, { flexDirection: "column", alignItems: "center", padding: 1, flexGrow: 1, minHeight: stdout.rows - 2, children: [_jsx(Box, { marginBottom: 2, children: _jsx(Text, { color: primary, children: art }) }), loading ? (_jsx(Text, { children: "Loading..." })) : askMfa ? (_jsx(Box, { flexDirection: "column", width: "50%", children: Object.values(askMfa).map((provider) => (_jsx(Button, { autoFocus: true, onClick: () => {
-                        if (provider === "1" &&
+                        if (isEmailProvider(provider) &&
                             (Object.values(askMfa).length > 1 ||
                                 !bwClient.isVaultWarden())) {
                             bwClient.sendEmailMfaCode(email);
@@ -104,7 +138,19 @@ export function LoginView({ onLogin }) {
                             twoFactorProvider: provider,
                         }));
                         setAskMfa(null);
-                    }, children: TwoFactorProvider[provider] }, provider))) })) : mfaParams && mfaParams.twoFactorProvider ? (_jsx(Box, { flexDirection: "column", width: "50%", children: _jsx(TextInput, { autoFocus: true, placeholder: `Enter your ${TwoFactorProvider[mfaParams.twoFactorProvider]} code`, value: mfaParams.twoFactorToken || "", onChange: (value) => setMfaParams((p) => ({ ...p, twoFactorToken: value })), onSubmit: () => handleLogin() }) })) : (_jsxs(Box, { flexDirection: "column", width: "50%", children: [_jsx(TextInput, { placeholder: "Server URL", value: url, onChange: setUrl }), _jsx(TextInput, { autoFocus: true, placeholder: "Email address", value: email, onChange: setEmail }), _jsx(TextInput, { placeholder: "Master password", value: password, onChange: setPassword, onSubmit: () => {
+                    }, children: getProviderLabel(provider) }, provider))) })) : mfaParams && mfaParams.twoFactorProvider ? (_jsxs(Box, { flexDirection: "column", width: "50%", children: [isDuoProvider(mfaParams.twoFactorProvider) && (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { children: "Open the Duo URL in a browser and approve the request." }), _jsx(Text, { children: "Then paste the `code` and `state` from the final URL as `code|state`." }), getProviderData(mfaParams.twoFactorProvider)?.AuthUrl && (_jsxs(Text, { children: ["Auth URL:", " ", getProviderData(mfaParams.twoFactorProvider).AuthUrl] }))] })), isWebAuthnProvider(mfaParams.twoFactorProvider) && (_jsx(Box, { flexDirection: "column", marginBottom: 1, children: _jsx(Text, { children: "Use your FIDO2/WebAuthn security key to generate a response, then paste it here." }) })), _jsx(TextInput, { autoFocus: true, placeholder: `Enter your ${getProviderLabel(mfaParams.twoFactorProvider)} ${isWebAuthnProvider(mfaParams.twoFactorProvider)
+                            ? "response"
+                            : "code"}`, value: mfaParams.twoFactorToken || "", onChange: (value) => setMfaParams((p) => ({ ...p, twoFactorToken: value })), onSubmit: () => handleLogin() }), isEmailProvider(mfaParams.twoFactorProvider) && (_jsx(Button, { marginTop: 1, isActive: resendTimeout === 0, onClick: () => {
+                            bwClient
+                                .sendEmailMfaCode(email)
+                                .then(() => {
+                                showStatusMessage("Sent new MFA code to your email.", "success");
+                            })
+                                .catch(() => {
+                                showStatusMessage("Failed to resend MFA code.", "error");
+                            });
+                            setResendTimeout(30);
+                        }, children: "Resend Code" }))] })) : (_jsxs(Box, { flexDirection: "column", width: "50%", children: [_jsx(TextInput, { placeholder: "Server URL", value: url, onChange: setUrl }), _jsx(TextInput, { autoFocus: true, placeholder: "Email address", value: email, onChange: setEmail }), _jsx(TextInput, { placeholder: "Master password", value: password, onChange: setPassword, onSubmit: () => {
                             if (email?.length && password?.length) {
                                 handleLogin();
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitty-tui",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "license": "MIT",
   "repository": "https://github.com/mceck/bitty",
   "keywords": [