Skip to content

manual entry improvements (#306) #357

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

Merged
merged 3 commits into from
Aug 10, 2019
Merged

manual entry improvements (#306) #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b978842
manual entry improvements (#306)
mymindstorm Jul 11, 2019
16f20c8
NaN => undefined
mymindstorm Aug 8, 2019
6becd92
Merge branch 'dev' into manual-improve
mymindstorm Aug 8, 2019
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
11 changes: 10 additions & 1 deletion _locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"description": "Account."
},
"accountName": {
"message": "Account Name",
"message": "Username",
"description": "Account Name."
},
"issuer": {
Expand Down Expand Up @@ -303,5 +303,14 @@
},
"loading": {
"message": "Loading..."
},
"advanced": {
"message": "Advanced"
},
"period": {
"message": "Period"
},
"type": {
"message": "Type"
}
}
62 changes: 50 additions & 12 deletions src/components/Popup/AddAccountPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
<template>
<div>
<label>{{ i18n.accountName }}</label>
<input type="text" class="input" v-model="newAccount.account" />
<label>{{ i18n.issuer }}</label>
<input type="text" class="input" v-model="newAccount.issuer" />
<label>{{ i18n.secret }}</label>
<input type="text" class="input" v-model="newAccount.secret" />
<select v-model="newAccount.type">
<option v-bind:value="OTPType.totp">{{ i18n.based_on_time }}</option>
<option v-bind:value="OTPType.hotp">{{ i18n.based_on_counter }}</option>
<option v-bind:value="OTPType.battle">Battle.net</option>
<option v-bind:value="OTPType.steam">Steam</option>
</select>
<details>
<summary>{{ i18n.advanced }}</summary>
<label>{{ i18n.accountName }}</label>
<input type="text" class="input" v-model="newAccount.account" />
<label>{{ i18n.period }}</label>
<input
type="number"
min="1"
class="input"
v-model.number="newAccount.period"
v-bind:disabled="newAccount.type === OTPType.hotp"
/>
<label class="combo-label">{{ i18n.type }}</label>
<select v-model="newAccount.type">
<option v-bind:value="OTPType.totp">{{ i18n.based_on_time }}</option>
<option v-bind:value="OTPType.hotp">{{ i18n.based_on_counter }}</option>
<option v-bind:value="OTPType.battle">Battle.net</option>
<option v-bind:value="OTPType.steam">Steam</option>
</select>
</details>
<div class="button-small" v-on:click="addNewAccount()">{{ i18n.ok }}</div>
</div>
</template>
Expand All @@ -20,19 +34,30 @@ import { OTPType, OTPEntry } from "../../models/otp";
import * as CryptoJS from "crypto-js";

export default Vue.extend({
data: function() {
data: function(): {
newAccount: {
issuer: string;
account: string;
secret: string;
type: OTPType;
period: number | undefined;
};
} {
return {
newAccount: {
issuer: "",
account: "",
secret: "",
type: OTPType.totp
type: OTPType.totp,
period: undefined
}
};
},
computed: mapState("accounts", ["OTPType"]),
methods: {
async addNewAccount() {
this.newAccount.secret = this.newAccount.secret.replace(/ /g, "");

if (
!/^[a-z2-7]+=*$/i.test(this.newAccount.secret) &&
!/^[0-9a-f]+$/i.test(this.newAccount.secret)
Expand All @@ -56,20 +81,33 @@ export default Vue.extend({
} else {
type = this.newAccount.type;
}

if (type === OTPType.hhex || type === OTPType.hotp) {
this.newAccount.period = undefined;
} else if (
typeof this.newAccount.period !== "number" ||
this.newAccount.period < 1
) {
this.newAccount.period = undefined;
}

const entry = new OTPEntry({
type,
index: 0,
issuer: "",
issuer: this.newAccount.issuer,
account: this.newAccount.account,
encrypted: false,
hash: CryptoJS.MD5(this.newAccount.secret).toString(),
secret: this.newAccount.secret,
counter: 0
counter: 0,
period: this.newAccount.period
});

await entry.create(this.$store.state.accounts.encryption);
await this.$store.dispatch("accounts/updateEntries");
this.$store.commit("style/hideInfo");
this.$store.commit("style/toggleEdit");

const codes = document.getElementById("codes");
if (codes) {
// wait vue apply changes to dom
Expand Down