chore: Update version

Closes #543, closes #545

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.1.16
+version: 0.1.17
 
 # 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.15.5"
+appVersion: "1.15.6"
 
 dependencies:
   - alias: postgresql

client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.15.5
+REACT_APP_VERSION=1.15.6

client/src/components/Login/Login.jsx

@@ -68,6 +68,7 @@ const Login = React.memo(
     isSubmittingUsingOidc,
     error,
     withOidc,
+    isOidcEnforced,
     onAuthenticate,
     onAuthenticateUsingOidc,
     onMessageDismiss,
@@ -107,8 +108,10 @@ const Login = React.memo(
     }, [onAuthenticate, data]);
 
     useEffect(() => {
+      if (!isOidcEnforced) {
         emailOrUsernameField.current.focus();
-    }, []);
+      }
+    }, [isOidcEnforced]);
 
     useEffect(() => {
       if (wasSubmitting && !isSubmitting && error) {
@@ -159,6 +162,7 @@ const Login = React.memo(
                         onDismiss={onMessageDismiss}
                       />
                     )}
+                    {!isOidcEnforced && (
                       <Form size="large" onSubmit={handleSubmit}>
                         <div className={styles.inputWrapper}>
                           <div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
@@ -195,15 +199,20 @@ const Login = React.memo(
                           disabled={isSubmitting || isSubmittingUsingOidc}
                         />
                       </Form>
+                    )}
                     {withOidc && (
                       <Button
                         type="button"
+                        fluid={isOidcEnforced}
+                        primary={isOidcEnforced}
+                        size={isOidcEnforced ? 'large' : undefined}
+                        icon={isOidcEnforced ? 'right arrow' : undefined}
+                        labelPosition={isOidcEnforced ? 'right' : undefined}
+                        content={t('action.logInWithSSO')}
                         loading={isSubmittingUsingOidc}
                         disabled={isSubmitting || isSubmittingUsingOidc}
                         onClick={onAuthenticateUsingOidc}
-                      >
-                        {t('action.logInWithSSO')}
-                      </Button>
+                      />
                     )}
                   </div>
                 </div>
@@ -242,6 +251,7 @@ Login.propTypes = {
   isSubmittingUsingOidc: PropTypes.bool.isRequired,
   error: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   withOidc: PropTypes.bool.isRequired,
+  isOidcEnforced: PropTypes.bool.isRequired,
   onAuthenticate: PropTypes.func.isRequired,
   onAuthenticateUsingOidc: PropTypes.func.isRequired,
   onMessageDismiss: PropTypes.func.isRequired,

client/src/components/UsersModal/UsersModal.jsx

@@ -10,6 +10,7 @@ import Item from './Item';
 const UsersModal = React.memo(
   ({
     items,
+    canAdd,
     onUpdate,
     onUsernameUpdate,
     onUsernameUpdateMessageDismiss,
@@ -130,11 +131,13 @@ const UsersModal = React.memo(
             </Table.Body>
           </Table>
         </Modal.Content>
+        {canAdd && (
           <Modal.Actions>
             <UserAddPopupContainer>
               <Button positive content={t('action.addUser')} />
             </UserAddPopupContainer>
           </Modal.Actions>
+        )}
       </Modal>
     );
   },
@@ -142,6 +145,7 @@ const UsersModal = React.memo(
 
 UsersModal.propTypes = {
   items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
+  canAdd: PropTypes.bool.isRequired,
   onUpdate: PropTypes.func.isRequired,
   onUsernameUpdate: PropTypes.func.isRequired,
   onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,

client/src/containers/LoginContainer.js

@@ -20,6 +20,7 @@ const mapStateToProps = (state) => {
     isSubmittingUsingOidc,
     error,
     withOidc: !!oidcConfig,
+    isOidcEnforced: oidcConfig && oidcConfig.isEnforced,
   };
 };
 

client/src/containers/UsersModalContainer.js

@@ -6,10 +6,12 @@ import entryActions from '../entry-actions';
 import UsersModal from '../components/UsersModal';
 
 const mapStateToProps = (state) => {
+  const oidcConfig = selectors.selectOidcConfig(state);
   const users = selectors.selectUsersExceptCurrent(state);
 
   return {
     items: users,
+    canAdd: !oidcConfig || !oidcConfig.isEnforced,
   };
 };
 

docker-compose.yml

@@ -50,6 +50,7 @@ services:
       # - OIDC_ROLES_ATTRIBUTE=groups
       # - OIDC_IGNORE_USERNAME=true
       # - OIDC_IGNORE_ROLES=true
+      # - OIDC_ENFORCED=true
     depends_on:
       - postgres
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "planka",
-  "version": "1.15.5",
+  "version": "1.15.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "planka",
-      "version": "1.15.5",
+      "version": "1.15.6",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

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

server/.env.sample

@@ -33,6 +33,7 @@ SECRET_KEY=notsecretkey
 # OIDC_ROLES_ATTRIBUTE=groups
 # OIDC_IGNORE_USERNAME=true
 # OIDC_IGNORE_ROLES=true
+# OIDC_ENFORCED=true
 
 ## Do not edit this
 

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

@@ -46,8 +46,11 @@ module.exports = {
   },
 
   async fn(inputs) {
-    const remoteAddress = getRemoteAddress(this.req);
+    if (sails.config.custom.oidcEnforced) {
+      throw Errors.USE_SINGLE_SIGN_ON;
+    }
 
+    const remoteAddress = getRemoteAddress(this.req);
     const user = await sails.helpers.users.getOneByEmailOrUsername(inputs.emailOrUsername);
 
     if (!user) {

server/api/controllers/show-config.js

@@ -10,6 +10,7 @@ module.exports = {
           response_mode: 'fragment',
         }),
         endSessionUrl: oidcClient.issuer.end_session_endpoint ? oidcClient.endSessionUrl({}) : null,
+        isEnforced: sails.config.custom.oidcEnforced,
       };
     }
 

server/api/controllers/users/create.js

@@ -1,6 +1,9 @@
 const zxcvbn = require('zxcvbn');
 
 const Errors = {
+  NOT_ENOUGH_RIGHTS: {
+    notEnoughRights: 'Not enough rights',
+  },
   EMAIL_ALREADY_IN_USE: {
     emailAlreadyInUse: 'Email already in use',
   },
@@ -56,6 +59,9 @@ module.exports = {
   },
 
   exits: {
+    notEnoughRights: {
+      responseType: 'forbidden',
+    },
     emailAlreadyInUse: {
       responseType: 'conflict',
     },
@@ -65,6 +71,10 @@ module.exports = {
   },
 
   async fn(inputs) {
+    if (sails.config.custom.oidcEnforced) {
+      throw Errors.NOT_ENOUGH_RIGHTS;
+    }
+
     const values = _.pick(inputs, [
       'email',
       'password',

server/config/custom.js

@@ -44,6 +44,7 @@ module.exports.custom = {
   oidcRolesAttribute: process.env.OIDC_ROLES_ATTRIBUTE || 'groups',
   oidcIgnoreUsername: process.env.OIDC_IGNORE_USERNAME === 'true',
   oidcIgnoreRoles: process.env.OIDC_IGNORE_ROLES === 'true',
+  oidcEnforced: process.env.OIDC_ENFORCED === 'true',
 
   // TODO: move client base url to environment variable?
   oidcRedirectUri: `${