Merge branch 'master' of https://github.com/Nounoursdestavernes/planka into pr/849

charts/planka/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.6
+version: 0.2.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.21.0"
+appVersion: "1.21.1"
 
 dependencies:
   - alias: postgresql

client/src/components/Login/Login.jsx

@@ -28,6 +28,11 @@ const createMessage = (error) => {
         type: 'error',
         content: 'common.invalidPassword',
       };
+    case 'Invalid credentials':
+      return {
+        type: 'error',
+        content: 'common.invalidCredentials',
+      };
     case 'Use single sign-on':
       return {
         type: 'error',
@@ -116,6 +121,10 @@ const Login = React.memo(
     useEffect(() => {
       if (wasSubmitting && !isSubmitting && error) {
         switch (error.message) {
+          case 'Invalid credentials':
+            emailOrUsernameField.current.select();
+
+            break;
           case 'Invalid email or username':
             emailOrUsernameField.current.select();
 

client/src/locales/en-US/login.js

@@ -3,6 +3,7 @@ export default {
     common: {
       emailOrUsername: 'E-mail or username',
       invalidEmailOrUsername: 'Invalid e-mail or username',
+      invalidCredentials: 'Invalid credentials',
       invalidPassword: 'Invalid password',
       logInToPlanka: 'Log in to Planka',
       noInternetConnection: 'No internet connection',

client/src/locales/ru-RU/core.js

@@ -180,6 +180,7 @@ export default {
       addAnotherCard: 'Добавить еще одну карточку',
       addAnotherList: 'Добавить еще один список',
       addAnotherTask: 'Добавить еще одну задачу',
+      addCard: 'Добавить карточку',
       addCard_title: 'Добавить карточку',
       addComment: 'Добавить комментарий',
       addList: 'Добавить список',

client/src/version.js

@@ -1 +1 @@
-export default '1.21.0';
+export default '1.21.1';

docker-compose.yml

@@ -31,6 +31,8 @@ services:
       # - DEFAULT_ADMIN_NAME=Demo Demo
       # - DEFAULT_ADMIN_USERNAME=demo
 
+      # - ENABLE_VERBOSE_ON_LOGIN=false # Set to true will show more verbose error messages on login. Should not be disabled without a rate limiter for security reasons.
+
       # - ALLOW_ALL_TO_CREATE_PROJECTS=true
 
       # - OIDC_ISSUER=

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "planka",
-  "version": "1.21.0",
+  "version": "1.21.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "planka",
-      "version": "1.21.0",
+      "version": "1.21.1",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "planka",
-  "version": "1.21.0",
+  "version": "1.21.1",
   "private": true,
   "homepage": "https://plankanban.github.io/planka",
   "repository": {

server/.env.sample

@@ -22,6 +22,8 @@ SECRET_KEY=notsecretkey
 # DEFAULT_ADMIN_NAME=Demo Demo
 # DEFAULT_ADMIN_USERNAME=demo
 
+# ENABLE_VERBOSE_ON_LOGIN=false # Set to true will show more verbose error messages on login. Should not be disabled without a rate limiter for security reasons.
+
 # ALLOW_ALL_TO_CREATE_PROJECTS=true
 
 # OIDC_ISSUER=

server/api/controllers/access-tokens/create.js

@@ -10,6 +10,9 @@ const Errors = {
   INVALID_PASSWORD: {
     invalidPassword: 'Invalid password',
   },
+  INVALID_CREDENTIALS: {
+    invalidCredentials: 'Invalid credentials',
+  },
   USE_SINGLE_SIGN_ON: {
     useSingleSignOn: 'Use single sign-on',
   },
@@ -40,6 +43,9 @@ module.exports = {
     invalidPassword: {
       responseType: 'unauthorized',
     },
+    invalidCredentials: {
+      responseType: 'unauthorized',
+    },
     useSingleSignOn: {
       responseType: 'forbidden',
     },
@@ -57,6 +63,9 @@ module.exports = {
       sails.log.warn(
         `Invalid email or username: "${inputs.emailOrUsername}"! (IP: ${remoteAddress})`,
       );
+      if (!sails.config.custom.enableVerboseOnLogin) {
+        throw Errors.INVALID_CREDENTIALS;
+      }
       throw Errors.INVALID_EMAIL_OR_USERNAME;
     }
 
@@ -66,6 +75,9 @@ module.exports = {
 
     if (!bcrypt.compareSync(inputs.password, user.password)) {
       sails.log.warn(`Invalid password! (IP: ${remoteAddress})`);
+      if (!sails.config.custom.enableVerboseOnLogin) {
+        throw Errors.INVALID_CREDENTIALS;
+      }
       throw Errors.INVALID_PASSWORD;
     }
 

server/config/custom.js

@@ -36,6 +36,8 @@ module.exports.custom = {
 
   allowAllToCreateProjects: process.env.ALLOW_ALL_TO_CREATE_PROJECTS === 'true',
 
+  enableVerboseOnLogin: process.env.ENABLE_VERBOSE_ON_LOGIN ? process.env.ENABLE_VERBOSE_ON_LOGIN === 'true' : false,
+
   oidcIssuer: process.env.OIDC_ISSUER,
   oidcClientId: process.env.OIDC_CLIENT_ID,
   oidcClientSecret: process.env.OIDC_CLIENT_SECRET,