From 1549d40ec59e081a043802e1d3757ed1a99a06b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrea=20PIERR=C3=89?= <andrea_pierre@brown.edu>
Date: Thu, 18 Mar 2021 00:57:33 -0400
Subject: [PATCH 1/6] feat: encrypt master password by default

---
 CONTRIBUTING.md                                    |  2 +-
 .../src/components/MasterPassword.vue              | 21 ++++----
 packages/lesspass-pure/src/i18n/en.json            |  2 +-
 packages/lesspass-pure/src/i18n/fr.json            |  4 +-
 packages/lesspass-pure/src/views/Login.vue         | 59 ++++++++++++++--------
 5 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b576caa..22718fc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,7 +39,7 @@ If you are working on the CLI, you will need:
 Here are some folders that worth noticing:
 
 * `package` contains the code for the web version and the browser extension. Development is done with `javascript` and `Vue`.
-  * `lesspass-pure` contains the core of `lesspass`. Running `yarn dev` in this folder will run a `lesspass` instance locally.
+  * `lesspass-pure` contains the core of `lesspass`. Running `yarn start` in this folder will run a `lesspass` instance locally.
   * `lesspass-web-extension` contains the code specific for the web extension.
   * `lesspass-render-password` contains the algorithm to generate passwords.
 * `cli` contains the command line version. Development is done with `python`.
diff --git a/packages/lesspass-pure/src/components/MasterPassword.vue b/packages/lesspass-pure/src/components/MasterPassword.vue
index 417fe31..ad3024a 100644
--- a/packages/lesspass-pure/src/components/MasterPassword.vue
+++ b/packages/lesspass-pure/src/components/MasterPassword.vue
@@ -43,16 +43,14 @@
         </button>
       </span>
     </div>
-    <button
-      id="encryptMasterPassword__btn"
-      type="button"
-      class="btn btn-link btn-sm p-0"
-      v-if="showEncryptButton"
-      v-on:click="encryptMasterPassword()"
-      v-bind:class="{'disabled': email === ''}"
-    >
-      <small>{{ EncryptButtonText }}</small>
-    </button>
+    <small>
+      <div class="form-check form-switch"
+           v-if="showEncryptButton">
+        <input class="form-check-input" type="checkbox" id="flexSwitchCheckChecked"
+               v-bind:disabled="email === ''">
+        <label class="form-check-label" for="flexSwitchCheckChecked">{{ PlainCheckboxText }}</label>
+      </div>
+    </small>
   </div>
 </template>
 <script>
@@ -70,7 +68,8 @@ export default {
       type: Boolean,
       default: false
     },
-    EncryptButtonText: String
+    EncryptButtonText: String,
+    PlainCheckboxText: String
   },
   data() {
     return {
diff --git a/packages/lesspass-pure/src/i18n/en.json b/packages/lesspass-pure/src/i18n/en.json
index e21ffe3..d39dee9 100644
--- a/packages/lesspass-pure/src/i18n/en.json
+++ b/packages/lesspass-pure/src/i18n/en.json
@@ -52,7 +52,7 @@
   "SiteLoginMasterPasswordMandatory": "Site, login, and master password fields are mandatory.",
   "SorryCopy": "Sorry, copying only works in modern browsers.",
   "UpdateYourSearch": "Please try broadening your search.",
-  "Username": "Username",
+  "Use plain password": "Use plain password (not recommended)",
   "WelcomeRegister": "Welcome, {email}. Thank you for signing up!",
   "resetPasswordSuccess": "If the email address {email} is associated with a LessPass account, you will receive an email from LessPass with instructions on how to reset your password."
 }
diff --git a/packages/lesspass-pure/src/i18n/fr.json b/packages/lesspass-pure/src/i18n/fr.json
index 8e5dcdb..5e12ff5 100644
--- a/packages/lesspass-pure/src/i18n/fr.json
+++ b/packages/lesspass-pure/src/i18n/fr.json
@@ -52,7 +52,7 @@
   "SiteLoginMasterPasswordMandatory": "Les champs site, login et mot de passe fort sont obligatoires.",
   "SorryCopy": "Nous sommes désolés, la copie ne fonctionne que sur les navigateurs modernes",
   "UpdateYourSearch": "Merci de modifier votre recherche.",
-  "Username": "Nom d'utilisateur",
+  "Use plain password": "Utiliser le mot de passe en clair (non recommandé)",
   "WelcomeRegister": "Bienvenue {email}, merci de vous être enregistré.",
   "resetPasswordSuccess": "Si l'adresse email {email} est associée avec un compte LessPass, vous allez recevoir un email de la part de LessPass avec les instructions pour changer votre mot de passe."
-}
\ No newline at end of file
+}
diff --git a/packages/lesspass-pure/src/views/Login.vue b/packages/lesspass-pure/src/views/Login.vue
index 7fcde2e..136c839 100644
--- a/packages/lesspass-pure/src/views/Login.vue
+++ b/packages/lesspass-pure/src/views/Login.vue
@@ -37,6 +37,7 @@
         v-bind:email="email"
         v-bind:showEncryptButton="true"
         v-bind:EncryptButtonText="$t('Encrypt my master password')"
+        v-bind:PlainCheckboxText="$t('Use plain password')"
       ></master-password>
     </div>
     <div class="form-group">
@@ -77,6 +78,18 @@ import { defaultbaseURL } from "../api/default";
 import MasterPassword from "../components/MasterPassword.vue";
 import message from "../services/message";
 
+import LessPass from "lesspass";
+import defaultPasswordProfile from "../store/defaultPassword";
+function encryptPass(email, password) {
+  return LessPass.generatePassword(
+    "lesspass.com",
+    email,
+    password,
+    defaultPasswordProfile
+  );
+  return res;
+}
+
 export default {
   data() {
     return {
@@ -105,27 +118,31 @@ export default {
       if (this.formIsValid()) {
         const baseURL = this.baseURL;
         this.$store.dispatch("setBaseURL", { baseURL });
-        User.login({ email: this.email, password: this.password })
-          .then(response => {
-            this.$store.dispatch("login", response.data);
-            this.$store.dispatch("cleanMessage");
-            this.$router.push({ name: "home" });
-          })
-          .catch(err => {
-            if (err.response === undefined && baseURL !== defaultbaseURL) {
-              message.error(
-                this.$t("DBNotRunning", "Your LessPass Database is not running")
-              );
-            } else if (err.response && err.response.status === 401) {
-              message.error(
-                this.$t(
-                  "LoginIncorrectError",
-                  "The email and password you entered did not match our records. Please double-check and try again."
-                )
-              );
-            } else {
-              message.displayGenericError();
-            }
+        let pass = encryptPass(this.email, this.password)
+          .then(pass => {
+            pass = document.getElementById("flexSwitchCheckChecked").checked ? this.password : pass;
+            User.login({ email: this.email, password: pass })
+              .then(response => {
+                this.$store.dispatch("login", response.data);
+                this.$store.dispatch("cleanMessage");
+                this.$router.push({ name: "home" });
+              })
+              .catch(err => {
+                if (err.response === undefined && baseURL !== defaultbaseURL) {
+                  message.error(
+                    this.$t("DBNotRunning", "Your LessPass Database is not running")
+                  );
+                } else if (err.response && err.response.status === 401) {
+                  message.error(
+                    this.$t(
+                      "LoginIncorrectError",
+                      "The email and password you entered did not match our records. Please double-check and try again."
+                    )
+                  );
+                } else {
+                  message.displayGenericError();
+                }
+              });
           });
       }
     }

From 12aff9e9e5a055f951864af064d0cbee67c0e822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrea=20PIERR=C3=89?= <andrea_pierre@brown.edu>
Date: Thu, 18 Mar 2021 01:07:18 -0400
Subject: [PATCH 2/6] style: apply Prettier

---
 .../src/components/MasterPassword.vue              | 39 +++++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/packages/lesspass-pure/src/components/MasterPassword.vue b/packages/lesspass-pure/src/components/MasterPassword.vue
index ad3024a..1963a32 100644
--- a/packages/lesspass-pure/src/components/MasterPassword.vue
+++ b/packages/lesspass-pure/src/components/MasterPassword.vue
@@ -33,22 +33,43 @@
         v-on:input="updateValue($event.target.value)"
         v-on:keyup.enter="$emit('keyupEnter')"
       />
-      <span class="input-group-btn" v-if="fingerprint && value" v-on:click="togglePasswordType">
+      <span
+        class="input-group-btn"
+        v-if="fingerprint && value"
+        v-on:click="togglePasswordType"
+      >
         <button id="fingerprint" class="btn" type="button" tabindex="-1">
           <small>
-            <i class="fa fa-fw" v-bind:class="[icon1]" v-bind:style="{ color: color1 }"></i>
-            <i class="fa fa-fw" v-bind:class="[icon2]" v-bind:style="{ color: color2 }"></i>
-            <i class="fa fa-fw" v-bind:class="[icon3]" v-bind:style="{ color: color3 }"></i>
+            <i
+              class="fa fa-fw"
+              v-bind:class="[icon1]"
+              v-bind:style="{ color: color1 }"
+            ></i>
+            <i
+              class="fa fa-fw"
+              v-bind:class="[icon2]"
+              v-bind:style="{ color: color2 }"
+            ></i>
+            <i
+              class="fa fa-fw"
+              v-bind:class="[icon3]"
+              v-bind:style="{ color: color3 }"
+            ></i>
           </small>
         </button>
       </span>
     </div>
     <small>
-      <div class="form-check form-switch"
-           v-if="showEncryptButton">
-        <input class="form-check-input" type="checkbox" id="flexSwitchCheckChecked"
-               v-bind:disabled="email === ''">
-        <label class="form-check-label" for="flexSwitchCheckChecked">{{ PlainCheckboxText }}</label>
+      <div class="form-check form-switch" v-if="showEncryptButton">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          id="flexSwitchCheckChecked"
+          v-bind:disabled="email === ''"
+        />
+        <label class="form-check-label" for="flexSwitchCheckChecked">{{
+          PlainCheckboxText
+        }}</label>
       </div>
     </small>
   </div>

From 1c18c0cf9d8ca9f0d494cafdf3969d4762187d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrea=20PIERR=C3=89?= <andrea_pierre@brown.edu>
Date: Fri, 19 Mar 2021 00:54:14 -0400
Subject: [PATCH 3/6] fix: removed translations

---
 packages/lesspass-pure/src/i18n/en.json | 1 +
 packages/lesspass-pure/src/i18n/fr.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/lesspass-pure/src/i18n/en.json b/packages/lesspass-pure/src/i18n/en.json
index d39dee9..b3893f0 100644
--- a/packages/lesspass-pure/src/i18n/en.json
+++ b/packages/lesspass-pure/src/i18n/en.json
@@ -52,6 +52,7 @@
   "SiteLoginMasterPasswordMandatory": "Site, login, and master password fields are mandatory.",
   "SorryCopy": "Sorry, copying only works in modern browsers.",
   "UpdateYourSearch": "Please try broadening your search.",
+  "Username": "Username",
   "Use plain password": "Use plain password (not recommended)",
   "WelcomeRegister": "Welcome, {email}. Thank you for signing up!",
   "resetPasswordSuccess": "If the email address {email} is associated with a LessPass account, you will receive an email from LessPass with instructions on how to reset your password."
diff --git a/packages/lesspass-pure/src/i18n/fr.json b/packages/lesspass-pure/src/i18n/fr.json
index 5e12ff5..d226ffc 100644
--- a/packages/lesspass-pure/src/i18n/fr.json
+++ b/packages/lesspass-pure/src/i18n/fr.json
@@ -52,6 +52,7 @@
   "SiteLoginMasterPasswordMandatory": "Les champs site, login et mot de passe fort sont obligatoires.",
   "SorryCopy": "Nous sommes désolés, la copie ne fonctionne que sur les navigateurs modernes",
   "UpdateYourSearch": "Merci de modifier votre recherche.",
+  "Username": "Nom d'utilisateur",
   "Use plain password": "Utiliser le mot de passe en clair (non recommandé)",
   "WelcomeRegister": "Bienvenue {email}, merci de vous être enregistré.",
   "resetPasswordSuccess": "Si l'adresse email {email} est associée avec un compte LessPass, vous allez recevoir un email de la part de LessPass avec les instructions pour changer votre mot de passe."

From 5f5fff31239e4aa573251a93e4ff7ddbb960de8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrea=20PIERR=C3=89?= <andrea_pierre@brown.edu>
Date: Sat, 20 Mar 2021 13:23:57 -0400
Subject: [PATCH 4/6] refactor: remove prop

---
 packages/lesspass-pure/src/components/MasterPassword.vue | 10 ++++------
 packages/lesspass-pure/src/views/Login.vue               | 11 +++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/lesspass-pure/src/components/MasterPassword.vue b/packages/lesspass-pure/src/components/MasterPassword.vue
index 1963a32..54df046 100644
--- a/packages/lesspass-pure/src/components/MasterPassword.vue
+++ b/packages/lesspass-pure/src/components/MasterPassword.vue
@@ -64,11 +64,10 @@
         <input
           class="form-check-input"
           type="checkbox"
-          id="flexSwitchCheckChecked"
-          v-bind:disabled="email === ''"
+          id="checkPlainPassword"
         />
-        <label class="form-check-label" for="flexSwitchCheckChecked">{{
-          PlainCheckboxText
+        <label class="form-check-label" for="checkPlainPassword">{{
+          $t("Use plain password")
         }}</label>
       </div>
     </small>
@@ -89,8 +88,7 @@ export default {
       type: Boolean,
       default: false
     },
-    EncryptButtonText: String,
-    PlainCheckboxText: String
+    EncryptButtonText: String
   },
   data() {
     return {
diff --git a/packages/lesspass-pure/src/views/Login.vue b/packages/lesspass-pure/src/views/Login.vue
index 136c839..e91952d 100644
--- a/packages/lesspass-pure/src/views/Login.vue
+++ b/packages/lesspass-pure/src/views/Login.vue
@@ -37,7 +37,6 @@
         v-bind:email="email"
         v-bind:showEncryptButton="true"
         v-bind:EncryptButtonText="$t('Encrypt my master password')"
-        v-bind:PlainCheckboxText="$t('Use plain password')"
       ></master-password>
     </div>
     <div class="form-group">
@@ -77,10 +76,10 @@ import User from "../api/user";
 import { defaultbaseURL } from "../api/default";
 import MasterPassword from "../components/MasterPassword.vue";
 import message from "../services/message";
-
 import LessPass from "lesspass";
 import defaultPasswordProfile from "../store/defaultPassword";
-function encryptPass(email, password) {
+
+function encryptPassword(email, password) {
   return LessPass.generatePassword(
     "lesspass.com",
     email,
@@ -118,9 +117,9 @@ export default {
       if (this.formIsValid()) {
         const baseURL = this.baseURL;
         this.$store.dispatch("setBaseURL", { baseURL });
-        let pass = encryptPass(this.email, this.password)
-          .then(pass => {
-            pass = document.getElementById("flexSwitchCheckChecked").checked ? this.password : pass;
+        encryptPassword(this.email, this.password)
+          .then(encryptedPassword => {
+            let pass = document.getElementById("checkPlainPassword").checked ? this.password : encryptedPassword;
             User.login({ email: this.email, password: pass })
               .then(response => {
                 this.$store.dispatch("login", response.data);

From 099c1c12cbfc88de018fe7dac75a1cfde6ac2f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrea=20PIERR=C3=89?= <andrea_pierre@brown.edu>
Date: Tue, 23 Mar 2021 00:09:06 -0400
Subject: [PATCH 5/6] test: remove encrypt button from 2e2 tests

---
 .../lesspass-pure/cypress/integration/connectedMode.spec.js   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/lesspass-pure/cypress/integration/connectedMode.spec.js b/packages/lesspass-pure/cypress/integration/connectedMode.spec.js
index e87ce66..93ad149 100644
--- a/packages/lesspass-pure/cypress/integration/connectedMode.spec.js
+++ b/packages/lesspass-pure/cypress/integration/connectedMode.spec.js
@@ -5,10 +5,9 @@ describe("Connected Mode", function() {
     cy.get(".fa-sign-in").click();
     cy.get("#email").type("test@lesspass.com");
     cy.get("#passwordField").type("test@lesspass.com");
-    cy.get("#encryptMasterPassword__btn").click();
-    cy.get("#fingerprint .fa-university").should("be.visible");
-    cy.get("#fingerprint .fa-btc").should("be.visible");
+    cy.get("#fingerprint .fa-cutlery").should("be.visible");
     cy.get("#fingerprint .fa-subway").should("be.visible");
+    cy.get("#fingerprint .fa-plane").should("be.visible");
     cy.get("#signInButton").click();
     cy.wait(500);
     cy.get("#siteField").type("lesspass.com");
@@ -22,7 +21,7 @@ describe("Connected Mode", function() {
       .click();
     cy.get("#signOutButton").should("be.visible");
     cy.get("#signOutButton").click();
-    cy.get(".fa-save").should('not.exist');
+    cy.get(".fa-save").should("not.exist");
   });
   it("can log in and log out", function() {
     cy.visit("/");
@@ -31,7 +30,6 @@ describe("Connected Mode", function() {
     cy.get("#baseURL").should("have.value", "https://lesspass.com");
     cy.get("#email").type("test@lesspass.com");
     cy.get("#passwordField").type("test@lesspass.com");
-    cy.get("#encryptMasterPassword__btn").click();
     cy.wait(1000);
     cy.get("#signInButton").click();
     cy.get("#siteField").should("be.visible");
@@ -40,7 +38,7 @@ describe("Connected Mode", function() {
       .first()
       .click();
     cy.get("#signOutButton").click();
-    cy.get(".fa-key").should('not.exist');
+    cy.get(".fa-key").should("not.exist");
   });
   it("reset password page", function() {
     cy.visit("/");
@@ -56,7 +54,6 @@ describe("Connected Mode", function() {
     cy.get("#baseURL").should("have.value", "https://lesspass.com");
     cy.get("#email").type("test@lesspass.com");
     cy.get("#passwordField").type("test@lesspass.com");
-    cy.get("#encryptMasterPassword__btn").click();
     cy.wait(500);
     cy.get("#signInButton").click();
     cy.get(".fa-key").click();

From fa145da93e30b8aaaed654304ca06069140cc612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrea=20PIERR=C3=89?= <andrea_pierre@brown.edu>
Date: Tue, 23 Mar 2021 01:44:38 -0400
Subject: [PATCH 6/6] refactor: add checked property to component data

---
 packages/lesspass-pure/src/components/MasterPassword.vue | 4 +++-
 packages/lesspass-pure/src/views/Login.vue               | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/lesspass-pure/src/components/MasterPassword.vue b/packages/lesspass-pure/src/components/MasterPassword.vue
index 54df046..1f131c0 100644
--- a/packages/lesspass-pure/src/components/MasterPassword.vue
+++ b/packages/lesspass-pure/src/components/MasterPassword.vue
@@ -65,6 +65,7 @@
           class="form-check-input"
           type="checkbox"
           id="checkPlainPassword"
+          v-model="checkPlainPassword"
         />
         <label class="form-check-label" for="checkPlainPassword">{{
           $t("Use plain password")
@@ -98,7 +99,8 @@ export default {
       icon3: "",
       color1: "",
       color2: "",
-      color3: ""
+      color3: "",
+      checkPlainPassword: false
     };
   },
   methods: {
diff --git a/packages/lesspass-pure/src/views/Login.vue b/packages/lesspass-pure/src/views/Login.vue
index e91952d..f3c3a9c 100644
--- a/packages/lesspass-pure/src/views/Login.vue
+++ b/packages/lesspass-pure/src/views/Login.vue
@@ -116,10 +116,11 @@ export default {
     signIn() {
       if (this.formIsValid()) {
         const baseURL = this.baseURL;
+        let checkPlainPassword = this.$children[0].checkPlainPassword
         this.$store.dispatch("setBaseURL", { baseURL });
         encryptPassword(this.email, this.password)
           .then(encryptedPassword => {
-            let pass = document.getElementById("checkPlainPassword").checked ? this.password : encryptedPassword;
+            let pass = checkPlainPassword ? this.password : encryptedPassword;
             User.login({ email: this.email, password: pass })
               .then(response => {
                 this.$store.dispatch("login", response.data);