Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions apps/chrome-extension/src/components/WalletTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useWalletContext } from "../contexts/WalletProvider";
import { useSnackbar } from "../contexts/SnackbarProvider";
import WarningModal from "../modals/WarningModal";
import MnemonicModal from "../modals/MnemonicModal";
import PassphraseModal from "../modals/PassphraseModal";
import WalletChrome from "@didcid/keymaster/wallet/chrome";

const WalletTab = () => {
Expand All @@ -17,6 +18,8 @@ const WalletTab = () => {
const [checkingWallet, setCheckingWallet] = useState<boolean>(false);
const [showFixModal, setShowFixModal] = useState<boolean>(false);
const [checkResultMessage, setCheckResultMessage] = useState<string>("");
const [showChangePassphrase, setShowChangePassphrase] = useState<boolean>(false);
const [changePassError, setChangePassError] = useState<string>("");
const {
keymaster,
initialiseWallet,
Expand Down Expand Up @@ -215,6 +218,21 @@ const WalletTab = () => {
}
}

async function handleChangePassphrase(newPassphrase: string) {
if (!keymaster) {
return;
}
try {
await keymaster.changePassphrase(newPassphrase);
await chrome.runtime.sendMessage({ action: "STORE_PASSPHRASE", passphrase: newPassphrase });
setShowChangePassphrase(false);
setChangePassError("");
setSuccess("Passphrase changed");
} catch (error: any) {
setChangePassError(error?.message || "Failed to change passphrase");
}
}

return (
<Box>
<WarningModal
Expand All @@ -239,6 +257,15 @@ const WalletTab = () => {
onClose={handleMnemonicModalClose}
/>

<PassphraseModal
isOpen={showChangePassphrase}
title="Change Passphrase"
errorText={changePassError}
onSubmit={handleChangePassphrase}
onClose={() => { setShowChangePassphrase(false); setChangePassError(""); }}
encrypt={true}
showCancel={true}
/>

<Box className="flex-box" sx={{ gap: 2 }}>
<Button
Expand Down Expand Up @@ -308,6 +335,15 @@ const WalletTab = () => {
</Button>
)}

<Button
className="mini-margin"
variant="contained"
color="primary"
onClick={() => setShowChangePassphrase(true)}
>
Change Passphrase
</Button>

<Button
className="mini-margin"
variant="contained"
Expand Down
40 changes: 39 additions & 1 deletion apps/react-wallet/src/components/WalletTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import { useWalletContext } from "../contexts/WalletProvider";
import { useSnackbar } from "../contexts/SnackbarProvider";
import WarningModal from "../modals/WarningModal";
import MnemonicModal from "../modals/MnemonicModal";
import PassphraseModal from "../modals/PassphraseModal";
import WalletWeb from "@didcid/keymaster/wallet/web";
import {clearSessionPassphrase} from "../utils/sessionPassphrase";
import { clearSessionPassphrase, setSessionPassphrase } from "../utils/sessionPassphrase";

const WalletTab = () => {
const [open, setOpen] = useState<boolean>(false);
Expand All @@ -18,6 +19,8 @@ const WalletTab = () => {
const [checkingWallet, setCheckingWallet] = useState<boolean>(false);
const [showFixModal, setShowFixModal] = useState<boolean>(false);
const [checkResultMessage, setCheckResultMessage] = useState<string>("");
const [showChangePassphrase, setShowChangePassphrase] = useState<boolean>(false);
const [changePassError, setChangePassError] = useState<string>("");
const {
keymaster,
initialiseWallet,
Expand Down Expand Up @@ -215,6 +218,21 @@ const WalletTab = () => {
}
}

async function handleChangePassphrase(newPassphrase: string) {
if (!keymaster) {
return;
}
try {
await keymaster.changePassphrase(newPassphrase);
setSessionPassphrase(newPassphrase);
setShowChangePassphrase(false);
setChangePassError("");
setSuccess("Passphrase changed");
} catch (error: any) {
setChangePassError(error?.message || "Failed to change passphrase");
}
}

return (
<Box sx={{ overflowX: "hidden" }}>
<WarningModal
Expand All @@ -239,6 +257,16 @@ const WalletTab = () => {
onClose={handleMnemonicModalClose}
/>

<PassphraseModal
isOpen={showChangePassphrase}
title="Change Passphrase"
errorText={changePassError}
onSubmit={handleChangePassphrase}
onClose={() => { setShowChangePassphrase(false); setChangePassError(""); }}
encrypt={true}
showCancel={true}
/>

<Box
sx={{
position: "sticky",
Expand Down Expand Up @@ -326,6 +354,16 @@ const WalletTab = () => {
</Button>
)}

<Button
className="mini-margin"
variant="contained"
color="primary"
onClick={() => setShowChangePassphrase(true)}
sx={{ width: '100%', mb: 1 }}
>
Change Passphrase
</Button>

<Button
className="mini-margin"
variant="contained"
Expand Down
23 changes: 23 additions & 0 deletions services/gatekeeper/client/src/KeymasterUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -1885,6 +1885,24 @@ function KeymasterUI({ keymaster, title, challengeDID, onWalletUpload }) {
}
}

async function changePassphrase() {
try {
const newPass = window.prompt("Enter new passphrase:");
if (!newPass) {
return;
}
const confirmPassphrase = window.prompt("Confirm new passphrase:");
if (newPass !== confirmPassphrase) {
showError("Passphrases do not match");
return;
}
await keymaster.changePassphrase(newPass);
showSuccess('Passphrase changed');
} catch (error) {
showError(error);
}
}

async function uploadImage(event) {
try {
const fileInput = event.target; // Reference to the input element
Expand Down Expand Up @@ -5361,6 +5379,11 @@ function KeymasterUI({ keymaster, title, challengeDID, onWalletUpload }) {
Upload...
</Button>
</Grid>
<Grid item>
<Button variant="contained" color="primary" onClick={changePassphrase}>
Change Passphrase...
</Button>
</Grid>
</Grid>
<p />
<Box>
Expand Down
23 changes: 23 additions & 0 deletions services/keymaster/client/src/KeymasterUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -1885,6 +1885,24 @@ function KeymasterUI({ keymaster, title, challengeDID, onWalletUpload }) {
}
}

async function changePassphrase() {
try {
const newPass = window.prompt("Enter new passphrase:");
if (!newPass) {
return;
}
const confirmPassphrase = window.prompt("Confirm new passphrase:");
if (newPass !== confirmPassphrase) {
showError("Passphrases do not match");
return;
}
await keymaster.changePassphrase(newPass);
showSuccess('Passphrase changed');
} catch (error) {
showError(error);
}
}

async function uploadImage(event) {
try {
const fileInput = event.target; // Reference to the input element
Expand Down Expand Up @@ -5361,6 +5379,11 @@ function KeymasterUI({ keymaster, title, challengeDID, onWalletUpload }) {
Upload...
</Button>
</Grid>
<Grid item>
<Button variant="contained" color="primary" onClick={changePassphrase}>
Change Passphrase...
</Button>
</Grid>
</Grid>
<p />
<Box>
Expand Down
Loading