#232 Remove default lock password behavior, allow empty password

6 files changed, 23 insertions, 29 deletions

diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js
index 045621d0a..ca571f20e 100644
--- a/src/components/auth/Locked.js
+++ b/src/components/auth/Locked.js
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 
 import Form from '../../lib/Form';
-import { required } from '../../helpers/validation-helpers';
 import Input from '../ui/Input';
 import Button from '../ui/Button';
 import Infobox from '../ui/Infobox';
@@ -50,7 +49,6 @@ export default @observer class Locked extends Component {
       password: {
         label: this.context.intl.formatMessage(messages.passwordLabel),
         value: '',
-        validators: [required],
         type: 'password',
       },
     },
diff --git a/src/config.js b/src/config.js
index bd67aee6b..fba4d6c2f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -31,7 +31,6 @@ export const DEVELOPMENT_TODOS_FRONTEND_URL = 'https://development--franz-todos.
 
 export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12';
 
-export const DEFAULT_LOCK_PASSWORD = 'ferdi';
 export const KEEP_WS_LOADED_USID = '0a0aa000-0a0a-49a0-a000-a0a0a0a0a0a0';
 
 export const HIBERNATION_STRATEGIES = {
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js
index 94285fb06..671f2ccaf 100644
--- a/src/containers/auth/LockedScreen.js
+++ b/src/containers/auth/LockedScreen.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
 import Locked from '../../components/auth/Locked';
 import SettingsStore from '../../stores/SettingsStore';
-import { DEFAULT_LOCK_PASSWORD } from '../../config';
 
 import { globalError as globalErrorPropType } from '../../prop-types';
 
@@ -27,9 +26,7 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends
 
     let correctPassword = this.props.stores.settings.all.app.lockedPassword;
     if (!correctPassword) {
-      // Lock feature was enabled but no password was set
-      // Use default lock password so user can exit
-      correctPassword = DEFAULT_LOCK_PASSWORD;
+      correctPassword = '';
     }
 
     if (String(password) === String(correctPassword)) {
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 07efbb881..b64cd77be 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -10,7 +10,7 @@ import UserStore from '../../stores/UserStore';
 import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
-import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config';
+import { DEFAULT_APP_SETTINGS, HIBERNATION_STRATEGIES } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
@@ -309,7 +309,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         lockedPassword: {
           label: intl.formatMessage(messages.lockPassword),
           value: settings.all.app.lockedPassword,
-          default: DEFAULT_LOCK_PASSWORD,
+          default: '',
           type: 'password',
         },
         scheduledDNDEnabled: {
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 10092cd9e..e68ec41af 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -202,65 +202,65 @@
         "defaultMessage": "!!!Locked",
         "end": {
           "column": 3,
-          "line": 18
+          "line": 17
         },
         "file": "src/components/auth/Locked.js",
         "id": "locked.headline",
         "start": {
           "column": 12,
-          "line": 15
+          "line": 14
         }
       },
       {
         "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 21
         },
         "file": "src/components/auth/Locked.js",
         "id": "locked.info",
         "start": {
           "column": 8,
-          "line": 19
+          "line": 18
         }
       },
       {
         "defaultMessage": "!!!Password",
         "end": {
           "column": 3,
-          "line": 26
+          "line": 25
         },
         "file": "src/components/auth/Locked.js",
         "id": "locked.password.label",
         "start": {
           "column": 17,
-          "line": 23
+          "line": 22
         }
       },
       {
         "defaultMessage": "!!!Unlock",
         "end": {
           "column": 3,
-          "line": 30
+          "line": 29
         },
         "file": "src/components/auth/Locked.js",
         "id": "locked.submit.label",
         "start": {
           "column": 21,
-          "line": 27
+          "line": 26
         }
       },
       {
         "defaultMessage": "!!!Password invalid",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 33
         },
         "file": "src/components/auth/Locked.js",
         "id": "locked.invalidCredentials",
         "start": {
           "column": 22,
-          "line": 31
+          "line": 30
         }
       }
     ],
diff --git a/src/i18n/messages/src/components/auth/Locked.json b/src/i18n/messages/src/components/auth/Locked.json
index 86b1cae90..407e70484 100644
--- a/src/i18n/messages/src/components/auth/Locked.json
+++ b/src/i18n/messages/src/components/auth/Locked.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Locked",
     "file": "src/components/auth/Locked.js",
     "start": {
-      "line": 15,
+      "line": 14,
       "column": 12
     },
     "end": {
-      "line": 18,
+      "line": 17,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.",
     "file": "src/components/auth/Locked.js",
     "start": {
-      "line": 19,
+      "line": 18,
       "column": 8
     },
     "end": {
-      "line": 22,
+      "line": 21,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Password",
     "file": "src/components/auth/Locked.js",
     "start": {
-      "line": 23,
+      "line": 22,
       "column": 17
     },
     "end": {
-      "line": 26,
+      "line": 25,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Unlock",
     "file": "src/components/auth/Locked.js",
     "start": {
-      "line": 27,
+      "line": 26,
       "column": 21
     },
     "end": {
-      "line": 30,
+      "line": 29,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Password invalid",
     "file": "src/components/auth/Locked.js",
     "start": {
-      "line": 31,
+      "line": 30,
       "column": 22
     },
     "end": {
-      "line": 34,
+      "line": 33,
       "column": 3
     }
   }