bitty-tui 0.0.10 → 0.0.12

package/dist/clients/bw.d.ts

@@ -139,6 +139,7 @@ export declare class Client {
     syncCache: SyncResponse | null;
     constructor(uri?: ClientConfig);
     private patchObject;
+    isVaultWarden(): boolean;
     setUrls(uri: ClientConfig): void;
     /**
      * Authenticates a user with the Bitwarden server using their email and password.

package/dist/clients/bw.js

@@ -375,6 +375,10 @@ export class Client {
         }
         return result;
     }
+    isVaultWarden() {
+        return (!this.apiUrl.endsWith("bitwarden.eu/api") &&
+            !this.apiUrl.endsWith("bitwarden.com/api"));
+    }
     setUrls(uri) {
         if (uri.baseUrl) {
             this.apiUrl = uri.baseUrl + "/api";
@@ -695,7 +699,12 @@ export class Client {
     decrypt(value, key) {
         if (!value)
             return value;
-        return mcbw.decrypt(value, key ?? this.keys.userKey);
+        try {
+            return mcbw.decrypt(value, key ?? this.keys.userKey);
+        }
+        catch (error) {
+            return value;
+        }
     }
     encryptCipher(obj, key) {
         const { ...ret } = obj;

package/dist/dashboard/components/CipherDetail.js

@@ -5,7 +5,7 @@ import { CipherType } from "../../clients/bw.js";
 import { Button } from "../../components/Button.js";
 import { useState } from "react";
 import { MoreInfoTab } from "./MoreInfoTab.js";
-import { MainTab } from "./MainInfoTab.js";
+import { MainTab } from "./MainTab.js";
 export function CipherDetail({ selectedCipher, isFocused, mode, onChange, onSave, }) {
     const [isMoreInfoTab, setIsMoreInfoTab] = useState(false);
     return (_jsx(Box, { flexDirection: "column", width: "60%", flexGrow: 1, paddingX: 1, borderStyle: "round", borderColor: isFocused ? primaryLight : "gray", borderLeftColor: "gray", children: selectedCipher && (_jsxs(Box, { flexDirection: "column", justifyContent: "space-between", flexGrow: 1, children: [isMoreInfoTab ? (_jsx(MoreInfoTab, { isFocused: isFocused, selectedCipher: selectedCipher, onChange: onChange })) : (_jsx(MainTab, { isFocused: isFocused, selectedCipher: selectedCipher, onChange: onChange })), _jsxs(Box, { marginTop: 1, flexShrink: 0, gap: 1, children: [mode !== "new" && (_jsx(Button, { width: "50%", isActive: isFocused, onClick: () => setIsMoreInfoTab(!isMoreInfoTab), children: "More" })), selectedCipher.type !== CipherType.SSHKey && (_jsx(Button, { doubleConfirm: true, width: "50%", isActive: isFocused, onClick: () => onSave(selectedCipher), children: "Save" }))] })] })) }));

package/dist/dashboard/components/MainInfoTab.js

@@ -14,9 +14,7 @@ export function MainTab({ isFocused, selectedCipher, onChange, }) {
             interval = setInterval(() => {
                 setOtpTimeout((t) => {
                     if (t <= 1) {
-                        const totp = authenticator.generate(selectedCipher.login.totp);
-                        selectedCipher.login.currentTotp = totp;
-                        setOtpCode(totp);
+                        setOtpCode(authenticator.generate(selectedCipher.login.totp));
                         return 30;
                     }
                     return t - 1;

package/dist/dashboard/components/MainTab.d.ts

@@ -0,0 +1,6 @@
+import { Cipher } from "../../clients/bw.js";
+export declare function MainTab({ isFocused, selectedCipher, onChange, }: {
+    isFocused: boolean;
+    selectedCipher: Cipher;
+    onChange: (cipher: Cipher) => void;
+}): import("react/jsx-runtime").JSX.Element;

package/dist/dashboard/components/MainTab.js

@@ -0,0 +1,93 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from "ink";
+import { CipherType } from "../../clients/bw.js";
+import { primaryLight } from "../../theme/style.js";
+import { TextInput } from "../../components/TextInput.js";
+import { useEffect, useState } from "react";
+import { authenticator } from "otplib";
+const OTP_INTERVAL = 30;
+export function MainTab({ isFocused, selectedCipher, onChange, }) {
+    const [otpCode, setOtpCode] = useState("");
+    const [otpTimeout, setOtpTimeout] = useState(0);
+    const genOtp = () => {
+        if (selectedCipher.login?.totp) {
+            const totp = authenticator.generate(selectedCipher.login.totp);
+            selectedCipher.login.currentTotp = totp;
+            setOtpCode(totp);
+        }
+    };
+    useEffect(() => {
+        let interval = null;
+        if (selectedCipher?.login?.totp) {
+            genOtp();
+            setOtpTimeout(OTP_INTERVAL);
+            interval = setInterval(() => {
+                setOtpTimeout((t) => {
+                    if (t <= 1) {
+                        genOtp();
+                        return OTP_INTERVAL;
+                    }
+                    return t - 1;
+                });
+            }, 1000);
+        }
+        else {
+            setOtpCode("");
+        }
+        return () => {
+            if (interval)
+                clearInterval(interval);
+        };
+    }, [selectedCipher?.login?.totp]);
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Name:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.name, onChange: (value) => onChange({ ...selectedCipher, name: value }) }) })] }), selectedCipher.type === CipherType.Login && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Username:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.login?.username ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                login: { ...selectedCipher.login, username: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Login && (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Box, { flexDirection: "row", flexGrow: 1, children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Password:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isPassword: true, showPasswordOnFocus: true, isActive: isFocused, value: selectedCipher.login?.password ?? "", onChange: (value) => onChange({
+                                        ...selectedCipher,
+                                        login: { ...selectedCipher.login, password: value },
+                                    }) }) })] }), selectedCipher.login?.totp && (_jsxs(Box, { flexDirection: "row", flexGrow: 1, children: [_jsx(Box, { marginRight: 2, flexShrink: 0, children: _jsxs(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: ["OTP (", otpTimeout.toString().padStart(2, "0"), "s):"] }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: otpCode }) })] }))] })), selectedCipher.type === CipherType.Login && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "URL:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.login?.uris?.[0]?.uri ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                login: {
+                                    ...selectedCipher.login,
+                                    uris: [
+                                        { uri: value },
+                                        ...selectedCipher.login.uris.slice(1),
+                                    ],
+                                },
+                            }) }) })] })), selectedCipher.type === CipherType.SSHKey && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Private Key:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.sshKey?.privateKey ?? "" }) })] })), selectedCipher.type === CipherType.SSHKey && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Public Key:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.sshKey?.publicKey ?? "" }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.firstName && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "First Name:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.firstName ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, firstName: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.lastName && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Last Name:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.lastName ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, lastName: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.username && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Username:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.username ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, username: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.city && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "City:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.city ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, city: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.address1 && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Address:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.address1 ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, address1: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.country && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Country:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.country ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, country: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.email && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Email:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.email ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, email: value },
+                            }) }) })] })), selectedCipher.type === CipherType.Identity &&
+                selectedCipher.identity?.phone && (_jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, marginRight: 2, flexShrink: 0, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Phone:" }) }), _jsx(Box, { flexGrow: 1, paddingLeft: 1, children: _jsx(TextInput, { inline: true, isActive: isFocused, value: selectedCipher.identity?.phone ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                identity: { ...selectedCipher.identity, phone: value },
+                            }) }) })] })), _jsxs(Box, { flexDirection: "row", children: [_jsx(Box, { width: 12, flexShrink: 0, marginRight: 2, children: _jsx(Text, { bold: true, color: isFocused ? primaryLight : "gray", children: "Notes:" }) }), _jsx(Box, { flexGrow: 1, minHeight: 7, children: _jsx(TextInput, { multiline: true, maxLines: 5, isActive: isFocused, value: selectedCipher.notes ?? "", onChange: (value) => onChange({
+                                ...selectedCipher,
+                                notes: value,
+                            }) }) })] })] }));
+}

package/dist/login/LoginView.js

@@ -103,7 +103,9 @@ export function LoginView({ onLogin }) {
         })();
     }, []);
     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 (provider === "1" &&
+                            (Object.values(askMfa).length > 1 ||
+                                !bwClient.isVaultWarden())) {
                             bwClient.sendEmailMfaCode(email);
                         }
                         setMfaParams((p) => ({

package/package.json

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