add digits support

Author: mymindstorm

_locales/en/messages.json

@@ -321,5 +321,8 @@
     },
     "invalid": {
         "message": "Invalid"
+    },
+    "digits": {
+        "message": "Digits"
     }
 }

src/background.ts

@@ -126,10 +126,11 @@ async function getTotp(text: string) {
     if (!label || !parameterPart) {
       chrome.tabs.sendMessage(id, { action: "errorqr" });
     } else {
-      let account = "";
       let secret = "";
-      let issuer = "";
-      let period: number | undefined = undefined;
+      let account: string | undefined;
+      let issuer: string | undefined;
+      let period: number | undefined;
+      let digits: number | undefined;
 
       try {
         label = decodeURIComponent(label);
@@ -163,6 +164,9 @@ async function getTotp(text: string) {
             isNaN(period) || period < 0 || period > 60 || 60 % period !== 0
               ? undefined
               : period;
+        } else if (parameter[0].toLowerCase() === "digits") {
+          digits = Number(parameter[1]);
+          digits = isNaN(digits) ? 6 : digits;
         }
       });
 
@@ -203,6 +207,9 @@ async function getTotp(text: string) {
         if (period) {
           entryData[hash].period = period;
         }
+        if (digits) {
+          entryData[hash].digits = digits;
+        }
         if (
           (await EntryStorage.hasEncryptedEntry()) !==
           encryption.getEncryptionStatus()

src/components/Popup/AddAccountPage.vue

@@ -16,6 +16,12 @@
         v-model.number="newAccount.period"
         v-bind:disabled="newAccount.type === OTPType.hotp"
       />
+      <label class="combo-label">{{ i18n.digits }}</label>
+      <select v-model="newAccount.digits">
+        <option v-bind:value="6">6</option>
+        <option v-bind:value="8">8</option>
+      </select>
+      <br>
       <label class="combo-label">{{ i18n.type }}</label>
       <select v-model="newAccount.type">
         <option v-bind:value="OTPType.totp">{{ i18n.based_on_time }}</option>
@@ -40,6 +46,7 @@ export default Vue.extend({
       secret: string;
       type: OTPType;
       period: number | undefined;
+      digits: number;
     };
   } {
     return {
@@ -48,7 +55,8 @@ export default Vue.extend({
         account: "",
         secret: "",
         type: OTPType.totp,
-        period: undefined
+        period: undefined,
+        digits: 6
       }
     };
   },
@@ -104,7 +112,8 @@ export default Vue.extend({
           encrypted: false,
           secret: this.newAccount.secret,
           counter: 0,
-          period: this.newAccount.period
+          period: this.newAccount.period,
+          digits: this.newAccount.digits
         },
         this.$store.state.accounts.encryption
       );

src/components/Popup/ExportPage.vue

@@ -106,8 +106,8 @@ function getOneLineOtpBackupFile(entryData: { [hash: string]: OTPStorage }) {
       otpStorage.account = removeUnsafeData(otpStorage.account);
     }
     const label = otpStorage.issuer
-      ? otpStorage.issuer + ":" + otpStorage.account
-      : otpStorage.account;
+      ? otpStorage.issuer + ":" + (otpStorage.account || "")
+      : otpStorage.account || "";
     let type = "";
     if (otpStorage.type === "totp" || otpStorage.type === "hex") {
       type = "totp";
@@ -128,7 +128,8 @@ function getOneLineOtpBackupFile(entryData: { [hash: string]: OTPStorage }) {
       (type === "hotp" ? "&counter=" + otpStorage.counter : "") +
       (type === "totp" && otpStorage.period
         ? "&period=" + otpStorage.period
-        : "");
+        : "") +
+      (otpStorage.digits ? "&digits=" + otpStorage.digits : "");
 
     otpAuthLines.push(otpAuthLine);
   }

src/definitions/otp.d.ts

@@ -9,6 +9,7 @@ interface IOTPEntry {
   counter: number;
   code: string;
   period: number;
+  digits: number;
   create(): Promise<void>;
   update(): Promise<void>;
   next(): Promise<void>;
@@ -36,4 +37,5 @@ interface OTPStorage {
   type: string;
   counter?: number;
   period?: number;
+  digits?: number;
 }

src/import.ts

@@ -108,6 +108,7 @@ export async function getEntryDataFromOTPAuthPerLine(importCode: string) {
       let account: string | undefined;
       let issuer: string | undefined;
       let period: number | undefined;
+      let digits: number | undefined;
 
       try {
         label = decodeURIComponent(label);
@@ -141,6 +142,9 @@ export async function getEntryDataFromOTPAuthPerLine(importCode: string) {
             isNaN(period) || period < 0 || period > 60 || 60 % period !== 0
               ? undefined
               : period;
+        } else if (parameter[0].toLowerCase() === "digits") {
+          digits = Number(parameter[1]);
+          digits = isNaN(digits) ? 6 : digits;
         }
       });
 
@@ -180,6 +184,9 @@ export async function getEntryDataFromOTPAuthPerLine(importCode: string) {
         if (period) {
           exportData[hash].period = period;
         }
+        if (digits) {
+          exportData[hash].digits = digits;
+        }
       }
     }
   }

src/models/key-utilities.ts

@@ -95,10 +95,13 @@ export class KeyUtilities {
     type: OTPType,
     secret: string,
     counter: number,
-    period: number
+    period: number,
+    len?: number
   ) {
     secret = secret.replace(/\s/g, "");
-    let len = 6;
+    if (!len) {
+      len = 6;
+    }
     let b26 = false;
     let key: string;
     switch (type) {

src/models/otp.ts

@@ -27,6 +27,7 @@ export class OTPEntry implements IOTPEntry {
   hash: string;
   counter: number;
   period: number;
+  digits: number;
   code = "••••••";
 
   constructor(
@@ -40,6 +41,7 @@ export class OTPEntry implements IOTPEntry {
       counter?: number;
       period?: number;
       hash?: string;
+      digits?: number;
     },
     encryption?: Encryption
   ) {
@@ -65,7 +67,6 @@ export class OTPEntry implements IOTPEntry {
         this.encSecret = encryption.getEncryptedString(this.secret);
       }
     }
-
     if (entry.hash) {
       this.hash = entry.hash;
     } else {
@@ -76,6 +77,11 @@ export class OTPEntry implements IOTPEntry {
     } else {
       this.counter = 0;
     }
+    if (entry.digits) {
+      this.digits = entry.digits;
+    } else {
+      this.digits = 6;
+    }
     if (this.type === OTPType.totp && entry.period) {
       this.period = entry.period;
     } else {
@@ -155,7 +161,8 @@ export class OTPEntry implements IOTPEntry {
           this.type,
           this.secret,
           this.counter,
-          this.period
+          this.period,
+          this.digits
         );
       } catch (error) {
         this.code = CodeState.Invalid;

src/models/storage.ts

@@ -185,6 +185,10 @@ export class EntryStorage {
       storageItem.account = entry.account;
     }
 
+    if (entry.digits && entry.digits !== 6) {
+      storageItem.digits = entry.digits;
+    }
+
     return storageItem;
   }
 
@@ -348,6 +352,7 @@ export class EntryStorage {
               data[hash].issuer = data[hash].issuer || "";
               data[hash].type = data[hash].type || OTPType[OTPType.totp];
               data[hash].counter = data[hash].counter || 0;
+              data[hash].digits = data[hash].digits || 6;
               const period = data[hash].period;
               if (
                 data[hash].type !== OTPType[OTPType.totp] ||
@@ -356,6 +361,12 @@ export class EntryStorage {
                 delete data[hash].period;
               }
 
+              // If invalid digits, then use defualt.
+              const digits = data[hash].digits;
+              if (digits && (digits > 10 || digits < 1)) {
+                data[hash].digits = 6;
+              }
+
               if (/^(blz\-|bliz\-)/.test(data[hash].secret)) {
                 const secretMatches = data[hash].secret.match(
                   /^(blz\-|bliz\-)(.*)/
@@ -521,7 +532,7 @@ export class EntryStorage {
                   entryData.type = OTPType[OTPType.totp];
               }
 
-              let period = 30;
+              let period: number | undefined;
               if (
                 entryData.type === OTPType[OTPType.totp] &&
                 entryData.period &&
@@ -539,7 +550,8 @@ export class EntryStorage {
                 secret: entryData.secret,
                 type,
                 counter: entryData.counter,
-                period
+                period,
+                digits: entryData.digits
               });
 
               data.push(entry);