Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhancing the profile manager to selectively show the password tab, contingent upon the presence of securely hashed credentials stored in the local storage. #509

Merged
merged 8 commits into from
Jun 12, 2023
Merged

Enhancing the profile manager to selectively show the password tab, contingent upon the presence of securely hashed credentials stored in the local storage. #509

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f733e32
Updating the profile manager to display the password tab only if ther…
Mahmoud-Emad Jun 11, 2023
18ea52b
Update the tab to be
Mahmoud-Emad Jun 11, 2023
8c5f222
Fix comments, used nextTick instead of setTimeout, and removed the on…
Mahmoud-Emad Jun 11, 2023
b8218c4
Merge branch 'development' of https://github.com/threefoldtech/tfgrid…
Mahmoud-Emad Jun 12, 2023
44dac7b
Merge branch 'development' into development_profile_manager_view
Mahmoud-Emad Jun 12, 2023
468b501
Change the 'Store and login' button text to 'Connect'
Mahmoud-Emad Jun 12, 2023
9a91234
Clear profile manager fields when the user switches between Login and…
Mahmoud-Emad Jun 12, 2023
5a1e979
Merge pull request #525 from threefoldtech/development_profile_manage…
Mahmoud-Emad Jun 12, 2023
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
297 changes: 187 additions & 110 deletions packages/playground/src/weblets/profile_manager.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@

<DTabs
v-if="!profileManager.profile"
:tabs="[
{ title: 'Login', value: 'login' },
{ title: 'Connect', value: 'register' },
]"
:tabs="getTabs()"
v-model="activeTab"
:disabled="creatingAccount || activating"
@tab:change="
Expand All @@ -54,102 +51,104 @@
"
>
<VContainer>
<FormValidator v-model="isValidForm">
<VTooltip
v-if="activeTab === 1"
text="Mnemonic are your private key. They are used to represent you on the ThreeFold Grid. You can paste existing mnemonic or click the 'Create Account' button to create an account and generate mnemonic."
location="bottom"
max-width="700px"
>
<template #activator="{ props: tooltipProps }">
<PasswordInputWrapper #="{ props: passwordInputProps }">
<InputValidator
:value="mnemonic"
:rules="[
validators.required('Mnemonic is required.'),
v => (validateMnemonic(v) ? undefined : { message: `Mnemonic doesn't seem to be valid.` }),
]"
:async-rules="[validateMnInput]"
valid-message="Mnemonic is valid."
#="{ props: validationProps }"
>
<div v-bind="tooltipProps" v-show="!profileManager.profile" class="d-flex">
<VTextField
class="mb-2"
label="Mnemonic"
placeholder="Please insert your mnemonic"
autofocus
v-model="mnemonic"
v-bind="{ ...passwordInputProps, ...validationProps }"
:disabled="creatingAccount || activating"
/>
<VBtn
class="mt-2 ml-3"
color="secondary"
variant="tonal"
:disabled="isValidForm"
:loading="creatingAccount"
@click="createNewAccount"
>
generate account
</VBtn>
</div>
</InputValidator>
</PasswordInputWrapper>
</template>
</VTooltip>

<v-alert type="error" variant="tonal" class="mb-4" v-if="createAccountError && activeTab === 1">
{{ createAccountError }}
</v-alert>

<PasswordInputWrapper #="{ props: passwordInputProps }">
<InputValidator
:value="password"
:rules="[
validators.required('Password is required.'),
validators.minLength('Password must be at least 6 characters.', 6),
validatePassword,
]"
#="{ props: validationProps }"
ref="passwordInput"
<form @submit.prevent="activeTab === 0 ? login() : storeAndLogin()">
<FormValidator v-model="isValidForm">
<VTooltip
v-if="activeTab === 1"
text="Mnemonic are your private key. They are used to represent you on the ThreeFold Grid. You can paste existing mnemonic or click the 'Create Account' button to create an account and generate mnemonic."
location="bottom"
max-width="700px"
>
<v-tooltip
location="bottom"
text="used to encrypt your mnemonic on your local system, and is used to login from the same device."
<template #activator="{ props: tooltipProps }">
<PasswordInputWrapper #="{ props: passwordInputProps }">
<InputValidator
:value="mnemonic"
:rules="[
validators.required('Mnemonic is required.'),
v => (validateMnemonic(v) ? undefined : { message: `Mnemonic doesn't seem to be valid.` }),
]"
:async-rules="[validateMnInput]"
valid-message="Mnemonic is valid."
#="{ props: validationProps }"
>
<div v-bind="tooltipProps" v-show="!profileManager.profile" class="d-flex">
<VTextField
class="mb-2"
label="Mnemonic"
placeholder="Please insert your mnemonic"
autofocus
v-model="mnemonic"
v-bind="{ ...passwordInputProps, ...validationProps }"
:disabled="creatingAccount || activating"
/>
<VBtn
class="mt-2 ml-3"
color="secondary"
variant="tonal"
:disabled="isValidForm"
:loading="creatingAccount"
@click="createNewAccount"
>
generate account
</VBtn>
</div>
</InputValidator>
</PasswordInputWrapper>
</template>
</VTooltip>

<v-alert type="error" variant="tonal" class="mb-4" v-if="createAccountError && activeTab === 1">
{{ createAccountError }}
</v-alert>

<PasswordInputWrapper #="{ props: passwordInputProps }">
<InputValidator
:value="password"
:rules="[
validators.required('Password is required.'),
validators.minLength('Password must be at least 6 characters.', 6),
validatePassword,
]"
#="{ props: validationProps }"
ref="passwordInput"
>
<template #activator="{ props: tooltipProps }">
<div v-bind="tooltipProps">
<VTextField
label="Password"
:autofocus="activeTab === 0"
v-model="password"
v-bind="{ ...passwordInputProps, ...validationProps }"
:disabled="creatingAccount || activating"
/>
</div>
</template>
</v-tooltip>
</InputValidator>
</PasswordInputWrapper>

<v-alert type="error" variant="tonal" class="mt-2 mb-4" v-if="loginError">
{{ loginError }}
</v-alert>
</FormValidator>

<div class="d-flex justify-center">
<VBtn
color="primary"
variant="tonal"
@click="activeTab === 0 ? login() : storeAndLogin()"
:loading="activating"
:disabled="!isValidForm || creatingAccount"
size="large"
>
{{ activeTab === 0 ? "Login" : "Store and login" }}
</VBtn>
</div>
<v-tooltip
location="bottom"
text="used to encrypt your mnemonic on your local system, and is used to login from the same device."
>
<template #activator="{ props: tooltipProps }">
<div v-bind="tooltipProps">
<VTextField
label="Password"
:autofocus="activeTab === 0"
v-model="password"
v-bind="{ ...passwordInputProps, ...validationProps }"
:disabled="creatingAccount || activating"
/>
</div>
</template>
</v-tooltip>
</InputValidator>
</PasswordInputWrapper>

<v-alert type="error" variant="tonal" class="mt-2 mb-4" v-if="loginError">
{{ loginError }}
</v-alert>
</FormValidator>

<div class="d-flex justify-center">
<VBtn
type="submit"
color="primary"
variant="tonal"
:loading="activating"
:disabled="!isValidForm || creatingAccount"
size="large"
>
{{ activeTab === 0 ? "Login" : "Connect" }}
</VBtn>
</div>
</form>
</VContainer>
</DTabs>

Expand Down Expand Up @@ -269,14 +268,20 @@ import { validateMnemonic } from "bip39";
import Cryptr from "cryptr";
import md5 from "md5";
import { onMounted, type Ref, ref, watch } from "vue";
import { nextTick } from "vue";
import { generateKeyPair } from "web-ssh-keygen";

import { useProfileManager } from "../stores";
import { type Balance, createAccount, getGrid, loadBalance, loadProfile, storeSSH } from "../utils/grid";
import { normalizeError } from "../utils/helpers";
import { downloadAsFile, normalizeBalance } from "../utils/helpers";

defineProps({
interface Credentials {
passwordHash?: string;
mnemonicHash?: string;
}

const props = defineProps({
modelValue: {
required: false,
default: () => true,
Expand All @@ -285,13 +290,78 @@ defineProps({
});
defineEmits<{ (event: "update:modelValue", value: boolean): void }>();

watch(
() => props.modelValue,
m => {
if (m) {
nextTick().then(mounted);
}
},
);

function mounted() {
if (isStoredCredentials()) {
activeTab.value = 0;
const credentials: Credentials = getCredentials();
const sessionPassword = sessionStorage.getItem("password");

if (!sessionPassword) return;

password.value = sessionPassword;

if (credentials.passwordHash) {
return login();
}
} else {
activeTab.value = 1;
return;
}
}

function getCredentials() {
const getCredentials = localStorage.getItem(WALLET_KEY);
let credentials: Credentials = {};

if (getCredentials) {
credentials = JSON.parse(getCredentials);
}
return credentials;
}

function setCredentials(passwordHash: string, mnemonicHash: string): Credentials {
const credentials: Credentials = {
passwordHash: passwordHash,
mnemonicHash: mnemonicHash,
};
localStorage.setItem(WALLET_KEY, JSON.stringify(credentials));
return credentials;
}

function isStoredCredentials() {
return localStorage.getItem(WALLET_KEY) ? true : false;
}

function getTabs() {
let tabs = [];
if (isStoredCredentials()) {
tabs = [
{ title: "Login", value: "login" },
{ title: "Connect your Wallet", value: "register" },
];
} else {
tabs = [{ title: "Connect your Wallet", value: "register" }];
}
return tabs;
}

const profileManager = useProfileManager();

const mnemonic = ref("");
const isValidForm = ref(false);
const SSHKeyHint = ref("");
const ssh = ref("");
let sshTimeout: any;

watch(SSHKeyHint, hint => {
if (hint) {
if (sshTimeout) {
Expand All @@ -309,6 +379,9 @@ const activeTab = ref(0);
const password = ref("");
const passwordInput = ref() as Ref<{ validate(value: string): Promise<boolean> }>;

const version = 1;
const WALLET_KEY = "wallet.v" + version;

let interval: any;
watch(
() => profileManager.profile,
Expand Down Expand Up @@ -364,10 +437,7 @@ function validateMnInput(mnemonic: string) {
}

onMounted(async () => {
const maybePassword = sessionStorage.getItem("password");
if (!maybePassword) return;
password.value = maybePassword;
login();
mounted();
});

const creatingAccount = ref(false);
Expand Down Expand Up @@ -425,23 +495,30 @@ async function __loadBalance(profile: Profile) {
}

function login() {
const mnemonicHash = localStorage.getItem(md5(password.value)) as string;
const cryptr = new Cryptr(password.value, { pbkdf2Iterations: 10, saltLength: 10 });
const mnemonic = cryptr.decrypt(mnemonicHash);
activate(mnemonic);
const credentials: Credentials = getCredentials();
if (credentials.mnemonicHash && credentials.passwordHash) {
if (credentials.passwordHash === md5(password.value)) {
const cryptr = new Cryptr(password.value, { pbkdf2Iterations: 10, saltLength: 10 });
const mnemonic = cryptr.decrypt(credentials.mnemonicHash);
activate(mnemonic);
}
}
}

function storeAndLogin() {
const cryptr = new Cryptr(password.value, { pbkdf2Iterations: 10, saltLength: 10 });
const mnemonicHash = cryptr.encrypt(mnemonic.value);
localStorage.setItem(md5(password.value), mnemonicHash);
setCredentials(md5(password.value), mnemonicHash);
activate(mnemonic.value);
}

function validatePassword(value: string) {
if (activeTab.value === 0) {
if (!localStorage.getItem(md5(value))) {
return { message: "Please provide a valid password." };
if (!localStorage.getItem(WALLET_KEY)) {
return { message: "We couldn't find a matching wallet for this password. Please connect your wallet first." };
}
if (getCredentials().passwordHash !== md5(password.value)) {
return { message: "We couldn't find a matching wallet for this password. Please connect your wallet first." };
}
}
}
Expand Down