chore: Update version

Closes #598

Dockerfile

@@ -6,7 +6,7 @@ RUN apk -U upgrade \
 
 WORKDIR /app
 
-COPY server/package.json server/package-lock.json .
+COPY server/package.json server/package-lock.json ./
 
 RUN npm install npm@latest --global \
   && npm install pnpm --global \
@@ -17,7 +17,7 @@ FROM node:lts AS client
 
 WORKDIR /app
 
-COPY client/package.json client/package-lock.json .
+COPY client/package.json client/package-lock.json ./
 
 RUN npm install npm@latest --global \
   && npm install pnpm --global \
@@ -38,6 +38,7 @@ WORKDIR /app
 
 COPY --chown=node:node start.sh .
 COPY --chown=node:node server .
+COPY --chown=node:node healthcheck.js .
 
 RUN mv .env.sample .env
 
@@ -52,4 +53,8 @@ VOLUME /app/private/attachments
 
 EXPOSE 1337
 
-CMD ["./start.sh"]
+HEALTHCHECK --interval=10s --timeout=2s --start-period=15s \
+  CMD node ./healthcheck.js
+
+
+CMD [ "bash", "start.sh" ]

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.15
+version: 0.1.18
 
 # 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.4"
+appVersion: "1.15.7"
 
 dependencies:
   - alias: postgresql

client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.15.4
+REACT_APP_VERSION=1.15.7

client/src/components/CardModal/AttachmentAddZone/AttachmentAddZone.jsx

@@ -94,7 +94,7 @@ const AttachmentAddZone = React.memo(({ children, onCreate }) => {
   return (
     <>
       {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-      <div {...getRootProps()} className={styles.wrapper}>
+      <div {...getRootProps()}>
         {isDragActive && <div className={styles.dropzone}>{t('common.dropFileToUpload')}</div>}
         {children}
         {/* eslint-disable-next-line react/jsx-props-no-spreading */}

client/src/components/CardModal/AttachmentAddZone/AttachmentAddZone.module.scss

@@ -12,8 +12,4 @@
     width: 100%;
     z-index: 2001;
   }
-
-  .wrapper {
-    overflow: hidden;
-  }
 }

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(() => {
-      emailOrUsernameField.current.focus();
+      if (!isOidcEnforced) {
-    }, []);
+        emailOrUsernameField.current.focus();
+      }
+    }, [isOidcEnforced]);
 
     useEffect(() => {
       if (wasSubmitting && !isSubmitting && error) {
@@ -159,51 +162,57 @@ const Login = React.memo(
                         onDismiss={onMessageDismiss}
                       />
                     )}
-                    <Form size="large" onSubmit={handleSubmit}>
+                    {!isOidcEnforced && (
-                      <div className={styles.inputWrapper}>
+                      <Form size="large" onSubmit={handleSubmit}>
-                        <div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
+                        <div className={styles.inputWrapper}>
-                        <Input
+                          <div className={styles.inputLabel}>{t('common.emailOrUsername')}</div>
-                          fluid
+                          <Input
-                          ref={emailOrUsernameField}
+                            fluid
-                          name="emailOrUsername"
+                            ref={emailOrUsernameField}
-                          value={data.emailOrUsername}
+                            name="emailOrUsername"
-                          readOnly={isSubmitting}
+                            value={data.emailOrUsername}
-                          className={styles.input}
+                            readOnly={isSubmitting}
-                          onChange={handleFieldChange}
+                            className={styles.input}
+                            onChange={handleFieldChange}
+                          />
+                        </div>
+                        <div className={styles.inputWrapper}>
+                          <div className={styles.inputLabel}>{t('common.password')}</div>
+                          <Input.Password
+                            fluid
+                            ref={passwordField}
+                            name="password"
+                            value={data.password}
+                            readOnly={isSubmitting}
+                            className={styles.input}
+                            onChange={handleFieldChange}
+                          />
+                        </div>
+                        <Form.Button
+                          primary
+                          size="large"
+                          icon="right arrow"
+                          labelPosition="right"
+                          content={t('action.logIn')}
+                          floated="right"
+                          loading={isSubmitting}
+                          disabled={isSubmitting || isSubmittingUsingOidc}
                         />
-                      </div>
+                      </Form>
-                      <div className={styles.inputWrapper}>
+                    )}
-                        <div className={styles.inputLabel}>{t('common.password')}</div>
-                        <Input.Password
-                          fluid
-                          ref={passwordField}
-                          name="password"
-                          value={data.password}
-                          readOnly={isSubmitting}
-                          className={styles.input}
-                          onChange={handleFieldChange}
-                        />
-                      </div>
-                      <Form.Button
-                        primary
-                        size="large"
-                        icon="right arrow"
-                        labelPosition="right"
-                        content={t('action.logIn')}
-                        floated="right"
-                        loading={isSubmitting}
-                        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/UserSettingsModal/AccountPane/AccountPane.jsx

@@ -24,6 +24,7 @@ const AccountPane = React.memo(
     organization,
     language,
     isLocked,
+    isUsernameLocked,
     isAvatarUpdating,
     usernameUpdateForm,
     emailUpdateForm,
@@ -104,7 +105,7 @@ const AccountPane = React.memo(
           value={language || 'auto'}
           onChange={handleLanguageChange}
         />
-        {!isLocked && (
+        {(!isLocked || !isUsernameLocked) && (
           <>
             <Divider horizontal section>
               <Header as="h4">
@@ -113,56 +114,62 @@ const AccountPane = React.memo(
                 })}
               </Header>
             </Divider>
-            <div className={styles.action}>
+            {!isUsernameLocked && (
-              <UserUsernameEditPopup
+              <div className={styles.action}>
-                usePasswordConfirmation
+                <UserUsernameEditPopup
-                defaultData={usernameUpdateForm.data}
+                  defaultData={usernameUpdateForm.data}
-                username={username}
+                  username={username}
-                isSubmitting={usernameUpdateForm.isSubmitting}
+                  isSubmitting={usernameUpdateForm.isSubmitting}
-                error={usernameUpdateForm.error}
+                  error={usernameUpdateForm.error}
-                onUpdate={onUsernameUpdate}
+                  usePasswordConfirmation={!isLocked} // FIXME: hack
-                onMessageDismiss={onUsernameUpdateMessageDismiss}
+                  onUpdate={onUsernameUpdate}
-              >
+                  onMessageDismiss={onUsernameUpdateMessageDismiss}
-                <Button className={styles.actionButton}>
+                >
-                  {t('action.editUsername', {
+                  <Button className={styles.actionButton}>
-                    context: 'title',
+                    {t('action.editUsername', {
-                  })}
+                      context: 'title',
-                </Button>
+                    })}
-              </UserUsernameEditPopup>
+                  </Button>
-            </div>
+                </UserUsernameEditPopup>
-            <div className={styles.action}>
+              </div>
-              <UserEmailEditPopup
+            )}
-                usePasswordConfirmation
+            {!isLocked && (
-                defaultData={emailUpdateForm.data}
+              <>
-                email={email}
+                <div className={styles.action}>
-                isSubmitting={emailUpdateForm.isSubmitting}
+                  <UserEmailEditPopup
-                error={emailUpdateForm.error}
+                    usePasswordConfirmation
-                onUpdate={onEmailUpdate}
+                    defaultData={emailUpdateForm.data}
-                onMessageDismiss={onEmailUpdateMessageDismiss}
+                    email={email}
-              >
+                    isSubmitting={emailUpdateForm.isSubmitting}
-                <Button className={styles.actionButton}>
+                    error={emailUpdateForm.error}
-                  {t('action.editEmail', {
+                    onUpdate={onEmailUpdate}
-                    context: 'title',
+                    onMessageDismiss={onEmailUpdateMessageDismiss}
-                  })}
+                  >
-                </Button>
+                    <Button className={styles.actionButton}>
-              </UserEmailEditPopup>
+                      {t('action.editEmail', {
-            </div>
+                        context: 'title',
-            <div className={styles.action}>
+                      })}
-              <UserPasswordEditPopup
+                    </Button>
-                usePasswordConfirmation
+                  </UserEmailEditPopup>
-                defaultData={passwordUpdateForm.data}
+                </div>
-                isSubmitting={passwordUpdateForm.isSubmitting}
+                <div className={styles.action}>
-                error={passwordUpdateForm.error}
+                  <UserPasswordEditPopup
-                onUpdate={onPasswordUpdate}
+                    usePasswordConfirmation
-                onMessageDismiss={onPasswordUpdateMessageDismiss}
+                    defaultData={passwordUpdateForm.data}
-              >
+                    isSubmitting={passwordUpdateForm.isSubmitting}
-                <Button className={styles.actionButton}>
+                    error={passwordUpdateForm.error}
-                  {t('action.editPassword', {
+                    onUpdate={onPasswordUpdate}
-                    context: 'title',
+                    onMessageDismiss={onPasswordUpdateMessageDismiss}
-                  })}
+                  >
-                </Button>
+                    <Button className={styles.actionButton}>
-              </UserPasswordEditPopup>
+                      {t('action.editPassword', {
-            </div>
+                        context: 'title',
+                      })}
+                    </Button>
+                  </UserPasswordEditPopup>
+                </div>
+              </>
+            )}
           </>
         )}
       </Tab.Pane>
@@ -179,6 +186,7 @@ AccountPane.propTypes = {
   organization: PropTypes.string,
   language: PropTypes.string,
   isLocked: PropTypes.bool.isRequired,
+  isUsernameLocked: PropTypes.bool.isRequired,
   isAvatarUpdating: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   usernameUpdateForm: PropTypes.object.isRequired,

client/src/components/UserSettingsModal/UserSettingsModal.jsx

@@ -18,6 +18,7 @@ const UserSettingsModal = React.memo(
     language,
     subscribeToOwnCards,
     isLocked,
+    isUsernameLocked,
     isAvatarUpdating,
     usernameUpdateForm,
     emailUpdateForm,
@@ -50,6 +51,7 @@ const UserSettingsModal = React.memo(
             organization={organization}
             language={language}
             isLocked={isLocked}
+            isUsernameLocked={isUsernameLocked}
             isAvatarUpdating={isAvatarUpdating}
             usernameUpdateForm={usernameUpdateForm}
             emailUpdateForm={emailUpdateForm}
@@ -108,6 +110,7 @@ UserSettingsModal.propTypes = {
   language: PropTypes.string,
   subscribeToOwnCards: PropTypes.bool.isRequired,
   isLocked: PropTypes.bool.isRequired,
+  isUsernameLocked: PropTypes.bool.isRequired,
   isAvatarUpdating: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   usernameUpdateForm: PropTypes.object.isRequired,

client/src/components/UsersModal/Item/ActionsStep.jsx

@@ -136,13 +136,15 @@ const ActionsStep = React.memo(
                 context: 'title',
               })}
             </Menu.Item>
+            {!user.isUsernameLocked && (
+              <Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
+                {t('action.editUsername', {
+                  context: 'title',
+                })}
+              </Menu.Item>
+            )}
             {!user.isLocked && (
               <>
-                <Menu.Item className={styles.menuItem} onClick={handleEditUsernameClick}>
-                  {t('action.editUsername', {
-                    context: 'title',
-                  })}
-                </Menu.Item>
                 <Menu.Item className={styles.menuItem} onClick={handleEditEmailClick}>
                   {t('action.editEmail', {
                     context: 'title',

client/src/components/UsersModal/Item/Item.jsx

@@ -19,6 +19,7 @@ const Item = React.memo(
     isAdmin,
     isLocked,
     isRoleLocked,
+    isUsernameLocked,
     isDeletionLocked,
     emailUpdateForm,
     passwordUpdateForm,
@@ -61,6 +62,7 @@ const Item = React.memo(
               phone,
               isAdmin,
               isLocked,
+              isUsernameLocked,
               isDeletionLocked,
               emailUpdateForm,
               passwordUpdateForm,
@@ -95,6 +97,7 @@ Item.propTypes = {
   isAdmin: PropTypes.bool.isRequired,
   isLocked: PropTypes.bool.isRequired,
   isRoleLocked: PropTypes.bool.isRequired,
+  isUsernameLocked: PropTypes.bool.isRequired,
   isDeletionLocked: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   emailUpdateForm: PropTypes.object.isRequired,

client/src/components/UsersModal/UsersModal.jsx

@@ -10,6 +10,7 @@ import Item from './Item';
 const UsersModal = React.memo(
   ({
     items,
+    canAdd,
     onUpdate,
     onUsernameUpdate,
     onUsernameUpdateMessageDismiss,
@@ -112,6 +113,7 @@ const UsersModal = React.memo(
                   isAdmin={item.isAdmin}
                   isLocked={item.isLocked}
                   isRoleLocked={item.isRoleLocked}
+                  isUsernameLocked={item.isUsernameLocked}
                   isDeletionLocked={item.isDeletionLocked}
                   emailUpdateForm={item.emailUpdateForm}
                   passwordUpdateForm={item.passwordUpdateForm}
@@ -129,11 +131,13 @@ const UsersModal = React.memo(
             </Table.Body>
           </Table>
         </Modal.Content>
-        <Modal.Actions>
+        {canAdd && (
-          <UserAddPopupContainer>
+          <Modal.Actions>
-            <Button positive content={t('action.addUser')} />
+            <UserAddPopupContainer>
-          </UserAddPopupContainer>
+              <Button positive content={t('action.addUser')} />
-        </Modal.Actions>
+            </UserAddPopupContainer>
+          </Modal.Actions>
+        )}
       </Modal>
     );
   },
@@ -141,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/UserSettingsModalContainer.js

@@ -16,6 +16,7 @@ const mapStateToProps = (state) => {
     language,
     subscribeToOwnCards,
     isLocked,
+    isUsernameLocked,
     isAvatarUpdating,
     emailUpdateForm,
     passwordUpdateForm,
@@ -32,6 +33,7 @@ const mapStateToProps = (state) => {
     language,
     subscribeToOwnCards,
     isLocked,
+    isUsernameLocked,
     isAvatarUpdating,
     emailUpdateForm,
     passwordUpdateForm,

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,
   };
 };
 

client/src/models/User.js

@@ -46,6 +46,7 @@ export default class extends BaseModel {
     isAdmin: attr(),
     isLocked: attr(),
     isRoleLocked: attr(),
+    isUsernameLocked: attr(),
     isDeletionLocked: attr(),
     deletedAt: attr(),
     createdAt: attr({

docker-compose-dev.yml

@@ -3,15 +3,7 @@ version: '3'
 services:
   planka:
     image: ghcr.io/plankanban/planka:master
-    command: >
+    restart: on-failure
-      bash -c
-        "for i in `seq 1 30`; do
-          ./start.sh &&
-          s=$$? && break || s=$$?;
-          echo \"Tried $$i times. Waiting 5 seconds...\";
-          sleep 5;
-        done; (exit $$s)"
-    restart: unless-stopped
     volumes:
       - user-avatars:/app/public/user-avatars
       - project-background-images:/app/public/project-background-images
@@ -44,19 +36,30 @@ services:
       # - OIDC_CLIENT_SECRET=
       # - OIDC_SCOPES=openid email profile
       # - OIDC_ADMIN_ROLES=admin
+      # - OIDC_EMAIL_ATTRIBUTE=email
+      # - OIDC_NAME_ATTRIBUTE=name
+      # - OIDC_USERNAME_ATTRIBUTE=preferred_username
       # - OIDC_ROLES_ATTRIBUTE=groups
+      # - OIDC_IGNORE_USERNAME=true
       # - OIDC_IGNORE_ROLES=true
+      # - OIDC_ENFORCED=true
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
 
   postgres:
     image: postgres:14-alpine
-    restart: unless-stopped
+    restart: on-failure
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=planka
       - POSTGRES_HOST_AUTH_METHOD=trust
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d planka"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
   user-avatars:

docker-compose.yml

@@ -3,15 +3,7 @@ version: '3'
 services:
   planka:
     image: ghcr.io/plankanban/planka:latest
-    command: >
+    restart: on-failure
-      bash -c
-        "for i in `seq 1 30`; do
-          ./start.sh &&
-          s=$$? && break || s=$$?;
-          echo \"Tried $$i times. Waiting 5 seconds...\";
-          sleep 5;
-        done; (exit $$s)"
-    restart: unless-stopped
     volumes:
       - user-avatars:/app/public/user-avatars
       - project-background-images:/app/public/project-background-images
@@ -44,19 +36,30 @@ services:
       # - OIDC_CLIENT_SECRET=
       # - OIDC_SCOPES=openid email profile
       # - OIDC_ADMIN_ROLES=admin
+      # - OIDC_EMAIL_ATTRIBUTE=email
+      # - OIDC_NAME_ATTRIBUTE=name
+      # - OIDC_USERNAME_ATTRIBUTE=preferred_username
       # - OIDC_ROLES_ATTRIBUTE=groups
+      # - OIDC_IGNORE_USERNAME=true
       # - OIDC_IGNORE_ROLES=true
+      # - OIDC_ENFORCED=true
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
 
   postgres:
     image: postgres:14-alpine
-    restart: unless-stopped
+    restart: on-failure
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_DB=planka
       - POSTGRES_HOST_AUTH_METHOD=trust
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d planka"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
   user-avatars:

healthcheck.js

@@ -0,0 +1,23 @@
+const http = require('http');
+const options = {
+    host: 'localhost',
+    port: 1337,
+    timeout: 2000
+};
+
+const healthCheck = http.request(options, (res) => {
+    console.log(`HEALTHCHECK STATUS: ${res.statusCode}`);
+    if (res.statusCode == 200) {
+        process.exit(0);
+    }
+    else {
+        process.exit(1);
+    }
+});
+
+healthCheck.on('error', function (err) {
+    console.error('ERROR');
+    process.exit(1);
+});
+
+healthCheck.end();

package-lock.json

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

package.json

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

server/.env.sample

@@ -27,8 +27,13 @@ SECRET_KEY=notsecretkey
 # OIDC_CLIENT_SECRET=
 # OIDC_SCOPES=openid email profile
 # OIDC_ADMIN_ROLES=admin
+# OIDC_EMAIL_ATTRIBUTE=email
+# OIDC_NAME_ATTRIBUTE=name
+# OIDC_USERNAME_ATTRIBUTE=preferred_username
 # 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/board-memberships/create.js

@@ -29,6 +29,7 @@ module.exports = {
     },
     canComment: {
       type: 'boolean',
+      allowNull: true,
     },
   },
 

server/api/controllers/board-memberships/update.js

@@ -17,6 +17,7 @@ module.exports = {
     },
     canComment: {
       type: 'boolean',
+      allowNull: true,
     },
   },
 

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/api/controllers/users/update-username.js

@@ -53,11 +53,7 @@ module.exports = {
   async fn(inputs) {
     const { currentUser } = this.req;
 
-    if (inputs.id === currentUser.id) {
+    if (inputs.id !== currentUser.id && !currentUser.isAdmin) {
-      if (!inputs.currentPassword) {
-        throw Errors.INVALID_CURRENT_PASSWORD;
-      }
-    } else if (!currentUser.isAdmin) {
       throw Errors.USER_NOT_FOUND; // Forbidden
     }
 
@@ -67,15 +63,18 @@ module.exports = {
       throw Errors.USER_NOT_FOUND;
     }
 
-    if (user.email === sails.config.custom.defaultAdminEmail || user.isSso) {
+    if (user.email === sails.config.custom.defaultAdminEmail) {
       throw Errors.NOT_ENOUGH_RIGHTS;
     }
 
-    if (
+    if (user.isSso) {
-      inputs.id === currentUser.id &&
+      if (!sails.config.custom.oidcIgnoreUsername) {
-      !bcrypt.compareSync(inputs.currentPassword, user.password)
+        throw Errors.NOT_ENOUGH_RIGHTS;
-    ) {
+      }
-      throw Errors.INVALID_CURRENT_PASSWORD;
+    } else if (inputs.id === currentUser.id) {
+      if (!inputs.currentPassword || !bcrypt.compareSync(inputs.currentPassword, user.password)) {
+        throw Errors.INVALID_CURRENT_PASSWORD;
+      }
     }
 
     const values = _.pick(inputs, ['username']);

server/api/helpers/boards/import-from-trello.js

@@ -107,6 +107,7 @@ module.exports = {
             position: trelloCard.pos,
             name: trelloCard.name,
             description: trelloCard.desc || null,
+            dueDate: trelloCard.due,
           }).fetch();
 
           await importCardLabels(plankaCard, trelloCard);

server/api/helpers/users/get-or-create-one-using-oidc.js

@@ -38,7 +38,10 @@ module.exports = {
       throw 'invalidCodeOrNonce';
     }
 
-    if (!userInfo.email || !userInfo.name) {
+    if (
+      !userInfo[sails.config.custom.oidcEmailAttribute] ||
+      !userInfo[sails.config.custom.oidcNameAttribute]
+    ) {
       throw 'missingValues';
     }
 
@@ -56,12 +59,14 @@ module.exports = {
 
     const values = {
       isAdmin,
-      email: userInfo.email,
+      email: userInfo[sails.config.custom.oidcEmailAttribute],
       isSso: true,
-      name: userInfo.name,
+      name: userInfo[sails.config.custom.oidcNameAttribute],
-      username: userInfo.preferred_username,
       subscribeToOwnCards: false,
     };
+    if (!sails.config.custom.oidcIgnoreUsername) {
+      values.username = userInfo[sails.config.custom.oidcUsernameAttribute];
+    }
 
     let user;
     // This whole block technically needs to be executed in a transaction
@@ -95,7 +100,10 @@ module.exports = {
       });
     }
 
-    const updateFieldKeys = ['email', 'isSso', 'name', 'username'];
+    const updateFieldKeys = ['email', 'isSso', 'name'];
+    if (!sails.config.custom.oidcIgnoreUsername) {
+      updateFieldKeys.push('username');
+    }
     if (!sails.config.custom.oidcIgnoreRoles) {
       updateFieldKeys.push('isAdmin');
     }

server/api/models/User.js

@@ -116,6 +116,7 @@ module.exports = {
       ..._.omit(this, ['password', 'isSso', 'avatar', 'passwordChangedAt']),
       isLocked: this.isSso || isDefaultAdmin,
       isRoleLocked: (this.isSso && !sails.config.custom.oidcIgnoreRoles) || isDefaultAdmin,
+      isUsernameLocked: (this.isSso && !sails.config.custom.oidcIgnoreUsername) || isDefaultAdmin,
       isDeletionLocked: isDefaultAdmin,
       avatarUrl:
         this.avatar &&

server/config/custom.js

@@ -31,15 +31,21 @@ module.exports.custom = {
   attachmentsPath: path.join(sails.config.appPath, 'private', 'attachments'),
   attachmentsUrl: `${process.env.BASE_URL}/attachments`,
 
-  defaultAdminEmail: process.env.DEFAULT_ADMIN_EMAIL,
+  defaultAdminEmail:
+    process.env.DEFAULT_ADMIN_EMAIL && process.env.DEFAULT_ADMIN_EMAIL.toLowerCase(),
 
   oidcIssuer: process.env.OIDC_ISSUER,
   oidcClientId: process.env.OIDC_CLIENT_ID,
   oidcClientSecret: process.env.OIDC_CLIENT_SECRET,
   oidcScopes: process.env.OIDC_SCOPES || 'openid email profile',
   oidcAdminRoles: process.env.OIDC_ADMIN_ROLES ? process.env.OIDC_ADMIN_ROLES.split(',') : [],
+  oidcEmailAttribute: process.env.OIDC_EMAIL_ATTRIBUTE || 'email',
+  oidcNameAttribute: process.env.OIDC_NAME_ATTRIBUTE || 'name',
+  oidcUsernameAttribute: process.env.OIDC_USERNAME_ATTRIBUTE || 'preferred_username',
   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: `${

server/db/seeds/default.js

@@ -13,7 +13,7 @@ const buildData = () => {
     data.name = process.env.DEFAULT_ADMIN_NAME;
   }
   if (process.env.DEFAULT_ADMIN_USERNAME) {
-    data.username = process.env.DEFAULT_ADMIN_USERNAME;
+    data.username = process.env.DEFAULT_ADMIN_USERNAME.toLowerCase();
   }
 
   return data;
@@ -24,16 +24,17 @@ exports.seed = async (knex) => {
     return;
   }
 
+  const email = process.env.DEFAULT_ADMIN_EMAIL.toLowerCase();
   const data = buildData();
 
   try {
     await knex('user_account').insert({
       ...data,
-      email: process.env.DEFAULT_ADMIN_EMAIL,
+      email,
       subscribeToOwnCards: false,
       createdAt: new Date().toISOString(),
     });
   } catch (error) {
-    await knex('user_account').update(data).where('email', process.env.DEFAULT_ADMIN_EMAIL);
+    await knex('user_account').update(data).where('email', email);
   }
 };

start.sh

@@ -1,4 +1,2 @@
 #!/bin/bash
-set -e
+export NODE_ENV=production && set -e && node db/init.js && node app.js --prod
-node db/init.js
-exec node app.js --prod $@