From 15e76df992681d6b58151efd226c7f2340ed7113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= <felixfoertsch@gmail.com>
Date: Tue, 15 Jan 2019 10:33:55 +0100
Subject: [PATCH 1/5] add disclaimer about using password manager as 2FA

---
 config/twoFactor.js | 46 +++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/config/twoFactor.js b/config/twoFactor.js
index 62895c1..cc42436 100644
--- a/config/twoFactor.js
+++ b/config/twoFactor.js
@@ -8,9 +8,33 @@ export default {
     \n\n**You should not use your phone number as a two-factor method.**
     
     \n\nAt minimum 2FA should be installed on accounts that can lock you out of other accounts: e.g. a Google account, email applications, an Apple ID, and financial accounts. For stronger security, ensure that 2FA is enabled on every service you use that supports it.
+
+    \n\n**Be aware:** Using an all-in-one solution like 1Password for both password management **and** 2FA creates a single point of failure. Take this into account when picking your 2FA client.
     `,
   apps: [
     {
+      {
+      name: 'Authy',
+      image: '/static/img/authy.jpg',
+      url: 'https://authy.com/',
+      sources: {
+        windows: 'https://authy.com/download/',
+        macos: 'https://authy.com/download/',
+        ios: 'https://itunes.apple.com/us/app/authy/id494168017',
+        android:
+          'https://play.google.com/store/apps/details?id=com.authy.authy',
+      },
+    },
+    {
+      name: 'Google Authenticator',
+      image: '/static/img/google-authenticator.jpg',
+      url: 'https://www.google.com/landing/2step/',
+      sources: {
+        ios: 'https://itunes.apple.com/us/app/google-authenticator/id388497605',
+        android:
+          'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en_us',
+      },
+    },
       name: '1Password',
       image: '/static/img/1password.jpg',
       url: 'https://1password.com/',
@@ -39,28 +63,6 @@ export default {
         android: 'https://lastpass.com/android_market.php',
       },
     },
-    {
-      name: 'Authy',
-      image: '/static/img/authy.jpg',
-      url: 'https://authy.com/',
-      sources: {
-        windows: 'https://authy.com/download/',
-        macos: 'https://authy.com/download/',
-        ios: 'https://itunes.apple.com/us/app/authy/id494168017',
-        android:
-          'https://play.google.com/store/apps/details?id=com.authy.authy',
-      },
-    },
-    {
-      name: 'Google Authenticator',
-      image: '/static/img/google-authenticator.jpg',
-      url: 'https://www.google.com/landing/2step/',
-      sources: {
-        ios: 'https://itunes.apple.com/us/app/google-authenticator/id388497605',
-        android:
-          'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en_us',
-      },
-    },
     {
       name: 'YubiKey',
       image: '/static/img/yubico.jpg',

From 5ab9c3a7594cca4a382b1047e74a4689e94893e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= <felixfoertsch@gmail.com>
Date: Tue, 15 Jan 2019 10:40:49 +0100
Subject: [PATCH 2/5] add bitwarden as password manager

---
 config/passwordManager.js |  12 ++++++++++++
 static/img/bitwarden.jpg  | Bin 0 -> 5123 bytes
 2 files changed, 12 insertions(+)
 create mode 100644 static/img/bitwarden.jpg

diff --git a/config/passwordManager.js b/config/passwordManager.js
index a1b639b..6e9d7c4 100644
--- a/config/passwordManager.js
+++ b/config/passwordManager.js
@@ -47,6 +47,18 @@ export default {
         android: 'https://play.google.com/store/apps/details?id=com.dashlane',
       },
     },
+    {
+      name: 'Bitwarden',
+      image: '/static/img/bitwarden.png',
+      url: 'https://www.bitwarden.com/',
+      sources: {
+        windows: 'https://vault.bitwarden.com/download/?app=desktop&platform=windows',
+        macos: 'https://vault.bitwarden.com/download/?app=desktop&platform=macos',
+        ios:
+          'https://itunes.apple.com/app/bitwarden-free-password-manager/id1137397744?mt=8',
+        android: 'https://play.google.com/store/apps/details?id=com.x8bit.bitwarden',
+      },
+    },
   ],
   resources: [
     {
diff --git a/static/img/bitwarden.jpg b/static/img/bitwarden.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7c4e553fd51fc5711202ededf578e5f5b8065629
GIT binary patch
literal 5123
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

literal 0
HcmV?d00001


From 0acd40cc816e1d6b889b581e88bdfb4c426878dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= <felixfoertsch@gmail.com>
Date: Tue, 15 Jan 2019 10:51:42 +0100
Subject: [PATCH 3/5] fix curly brace

---
 config/twoFactor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/twoFactor.js b/config/twoFactor.js
index cc42436..b847eff 100644
--- a/config/twoFactor.js
+++ b/config/twoFactor.js
@@ -13,7 +13,6 @@ export default {
     `,
   apps: [
     {
-      {
       name: 'Authy',
       image: '/static/img/authy.jpg',
       url: 'https://authy.com/',

From abb59b5a5f4e8ed87bb9f987c1912a6b043b0ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= <felixfoertsch@gmail.com>
Date: Tue, 15 Jan 2019 10:57:52 +0100
Subject: [PATCH 4/5] fix jpg and brace

---
 config/passwordManager.js | 2 +-
 config/twoFactor.js       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/passwordManager.js b/config/passwordManager.js
index 6e9d7c4..050ded3 100644
--- a/config/passwordManager.js
+++ b/config/passwordManager.js
@@ -49,7 +49,7 @@ export default {
     },
     {
       name: 'Bitwarden',
-      image: '/static/img/bitwarden.png',
+      image: '/static/img/bitwarden.jpg',
       url: 'https://www.bitwarden.com/',
       sources: {
         windows: 'https://vault.bitwarden.com/download/?app=desktop&platform=windows',
diff --git a/config/twoFactor.js b/config/twoFactor.js
index b847eff..ea4d70c 100644
--- a/config/twoFactor.js
+++ b/config/twoFactor.js
@@ -34,6 +34,7 @@ export default {
           'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en_us',
       },
     },
+    {
       name: '1Password',
       image: '/static/img/1password.jpg',
       url: 'https://1password.com/',

From 0275a2315df542a48f114ad4f03a1e4ba04835b5 Mon Sep 17 00:00:00 2001
From: Brian Lovin <brianlovin@github.com>
Date: Tue, 15 Jan 2019 08:36:40 -0800
Subject: [PATCH 5/5] Small copy tweak

---
 config/twoFactor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/twoFactor.js b/config/twoFactor.js
index ea4d70c..d066c8f 100644
--- a/config/twoFactor.js
+++ b/config/twoFactor.js
@@ -9,7 +9,7 @@ export default {
     
     \n\nAt minimum 2FA should be installed on accounts that can lock you out of other accounts: e.g. a Google account, email applications, an Apple ID, and financial accounts. For stronger security, ensure that 2FA is enabled on every service you use that supports it.
 
-    \n\n**Be aware:** Using an all-in-one solution like 1Password for both password management **and** 2FA creates a single point of failure. Take this into account when picking your 2FA client.
+    \n\n**Note:** Using an all-in-one solution like 1Password for both password management *and* 2FA creates a single point of failure. Take this into account when picking your 2FA client.
     `,
   apps: [
     {