Add: AI-generated translations

Adding missing translation from the top 10 most spoken languages

* Hindi
* Arabic
* Bengali

* Dutch (because requested)

charts/planka/Chart.yaml

@@ -15,17 +15,17 @@ 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.4
+version: 0.1.2
 
 # 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.13.1"
+appVersion: "1.12.0"
 
 dependencies:
-  - alias: postgresql
-    condition: postgresql.enabled
-    name: postgresql
-    repository: &bitnami-repo https://charts.bitnami.com/bitnami
-    version: 12.5.1
+- alias: postgresql
+  condition: postgresql.enabled
+  name: postgresql
+  repository: &bitnami-repo https://charts.bitnami.com/bitnami
+  version: 12.5.1

charts/planka/templates/deployment.yaml

@@ -75,10 +75,6 @@ spec:
               value: {{ required "A secret key needs to be generated using 'openssl rand -hex 64' and assigned to secretkey." .Values.secretkey }}
             - name: TRUST_PROXY
               value: "0"
-          {{ range $k, $v := .Values.env }}
-            - name: {{ $k | quote }}
-              value: {{ $v | quote }}
-          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.13.1
+REACT_APP_VERSION=1.12.0

client/package-lock.json

@@ -19,7 +19,6 @@
         "jwt-decode": "^3.1.2",
         "lodash": "^4.17.21",
         "node-sass": "^8.0.0",
-        "oidc-client-ts": "^2.3.0",
         "photoswipe": "^5.3.3",
         "prop-types": "^15.8.1",
         "react": "^18.2.0",
@@ -31,6 +30,7 @@
         "react-i18next": "^12.0.0",
         "react-input-mask": "^2.0.4",
         "react-markdown": "^8.0.3",
+        "react-oidc-context": "^2.2.2",
         "react-photoswipe-gallery": "^2.2.2",
         "react-redux": "^8.0.5",
         "react-router-dom": "^6.4.3",
@@ -7193,7 +7193,8 @@
     "node_modules/crypto-js": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
-      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==",
+      "peer": true
     },
     "node_modules/crypto-random-string": {
       "version": "2.0.0",
@@ -17042,9 +17043,10 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
     },
     "node_modules/oidc-client-ts": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.3.0.tgz",
-      "integrity": "sha512-7RUKU+TJFQo+4X9R50IGJAIDF18uRBaFXyZn4VVCfwmwbSUhKcdDnw4zgeut3uEXkiD3NqURq+d88sDPxjf1FA==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.2.4.tgz",
+      "integrity": "sha512-nOZwIomju+AmXObl5Oq5PjrES/qTt8bLsENJCIydVgi9TEWk7SCkOU6X3RNkY7yfySRM1OJJvDKdREZdmnDT2g==",
+      "peer": true,
       "dependencies": {
         "crypto-js": "^4.1.1",
         "jwt-decode": "^3.1.2"
@@ -19294,6 +19296,18 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
       "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
+    "node_modules/react-oidc-context": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/react-oidc-context/-/react-oidc-context-2.2.2.tgz",
+      "integrity": "sha512-rke8goKuxxQhSAR11h8wVn56m7kEa1mcAfYDlIycsIgmbZOFzKA0Un0y0RodHZ/M/CG6u0JD1I8RKZHqRJjWnA==",
+      "engines": {
+        "node": ">=12.13.0"
+      },
+      "peerDependencies": {
+        "oidc-client-ts": "^2.2.1",
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/react-onclickoutside": {
       "version": "6.12.2",
       "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.2.tgz",
@@ -28788,7 +28802,8 @@
     "crypto-js": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
-      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==",
+      "peer": true
     },
     "crypto-random-string": {
       "version": "2.0.0",
@@ -35957,9 +35972,10 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
     },
     "oidc-client-ts": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.3.0.tgz",
-      "integrity": "sha512-7RUKU+TJFQo+4X9R50IGJAIDF18uRBaFXyZn4VVCfwmwbSUhKcdDnw4zgeut3uEXkiD3NqURq+d88sDPxjf1FA==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.2.4.tgz",
+      "integrity": "sha512-nOZwIomju+AmXObl5Oq5PjrES/qTt8bLsENJCIydVgi9TEWk7SCkOU6X3RNkY7yfySRM1OJJvDKdREZdmnDT2g==",
+      "peer": true,
       "requires": {
         "crypto-js": "^4.1.1",
         "jwt-decode": "^3.1.2"
@@ -37403,6 +37419,12 @@
         }
       }
     },
+    "react-oidc-context": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/react-oidc-context/-/react-oidc-context-2.2.2.tgz",
+      "integrity": "sha512-rke8goKuxxQhSAR11h8wVn56m7kEa1mcAfYDlIycsIgmbZOFzKA0Un0y0RodHZ/M/CG6u0JD1I8RKZHqRJjWnA==",
+      "requires": {}
+    },
     "react-onclickoutside": {
       "version": "6.12.2",
       "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.2.tgz",

client/package.json

@@ -66,7 +66,6 @@
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "node-sass": "^8.0.0",
-    "oidc-client-ts": "^2.3.0",
     "photoswipe": "^5.3.3",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
@@ -78,6 +77,7 @@
     "react-i18next": "^12.0.0",
     "react-input-mask": "^2.0.4",
     "react-markdown": "^8.0.3",
+    "react-oidc-context": "^2.2.2",
     "react-photoswipe-gallery": "^2.2.2",
     "react-redux": "^8.0.5",
     "react-router-dom": "^6.4.3",

client/src/actions/core.js

@@ -1,7 +1,6 @@
 import ActionTypes from '../constants/ActionTypes';
 
 const initializeCore = (
-  config,
   user,
   board,
   users,
@@ -21,7 +20,6 @@ const initializeCore = (
 ) => ({
   type: ActionTypes.CORE_INITIALIZE,
   payload: {
-    config,
     user,
     board,
     users,

client/src/actions/login.js

@@ -1,12 +1,5 @@
 import ActionTypes from '../constants/ActionTypes';
 
-const initializeLogin = (config) => ({
-  type: ActionTypes.LOGIN_INITIALIZE,
-  payload: {
-    config,
-  },
-});
-
 const authenticate = (data) => ({
   type: ActionTypes.AUTHENTICATE,
   payload: {
@@ -28,33 +21,12 @@ authenticate.failure = (error) => ({
   },
 });
 
-const authenticateWithOidc = () => ({
-  type: ActionTypes.WITH_OIDC_AUTHENTICATE,
-  payload: {},
-});
-
-authenticateWithOidc.success = (accessToken) => ({
-  type: ActionTypes.WITH_OIDC_AUTHENTICATE__SUCCESS,
-  payload: {
-    accessToken,
-  },
-});
-
-authenticateWithOidc.failure = (error) => ({
-  type: ActionTypes.WITH_OIDC_AUTHENTICATE__FAILURE,
-  payload: {
-    error,
-  },
-});
-
 const clearAuthenticateError = () => ({
   type: ActionTypes.AUTHENTICATE_ERROR_CLEAR,
   payload: {},
 });
 
 export default {
-  initializeLogin,
   authenticate,
-  authenticateWithOidc,
   clearAuthenticateError,
 };

client/src/api/access-tokens.js

@@ -4,15 +4,14 @@ import socket from './socket';
 /* Actions */
 
 const createAccessToken = (data, headers) => http.post('/access-tokens', data, headers);
-
-const exchangeToAccessToken = (data, headers) =>
-  http.post('/access-tokens/exchange', data, headers);
+const exchangeOidcToken = (accessToken, headers) =>
+  http.post('/access-tokens/exchange', { token: accessToken }, headers);
 
 const deleteCurrentAccessToken = (headers) =>
   socket.delete('/access-tokens/me', undefined, headers);
 
 export default {
   createAccessToken,
-  exchangeToAccessToken,
   deleteCurrentAccessToken,
+  exchangeOidcToken,
 };

client/src/api/http.js

@@ -5,15 +5,13 @@ import Config from '../constants/Config';
 const http = {};
 
 // TODO: add all methods
-['GET', 'POST'].forEach((method) => {
+['POST'].forEach((method) => {
   http[method.toLowerCase()] = (url, data, headers) => {
-    const formData =
-      data &&
-      Object.keys(data).reduce((result, key) => {
-        result.append(key, data[key]);
+    const formData = Object.keys(data).reduce((result, key) => {
+      result.append(key, data[key]);
 
-        return result;
-      }, new FormData());
+      return result;
+    }, new FormData());
 
     return fetch(`${Config.SERVER_BASE_URL}/api${url}`, {
       method,

client/src/api/index.js

@@ -1,6 +1,5 @@
 import http from './http';
 import socket from './socket';
-import root from './root';
 import accessTokens from './access-tokens';
 import users from './users';
 import projects from './projects';
@@ -21,7 +20,6 @@ import notifications from './notifications';
 export { http, socket };
 
 export default {
-  ...root,
   ...accessTokens,
   ...users,
   ...projects,

client/src/api/root.js

@@ -1,9 +0,0 @@
-import http from './http';
-
-/* Actions */
-
-const getConfig = (headers) => http.get('/config', undefined, headers);
-
-export default {
-  getConfig,
-};

client/src/components/Header/Header.jsx

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 import { Button, Icon, Menu } from 'semantic-ui-react';
+import { useAuth } from 'react-oidc-context';
 import { usePopup } from '../../lib/popup';
 
 import Paths from '../../constants/Paths';
@@ -29,6 +30,7 @@ const Header = React.memo(
     onUserSettingsClick,
     onLogout,
   }) => {
+    const auth = useAuth();
     const handleProjectSettingsClick = useCallback(() => {
       if (canEditProject) {
         onProjectSettingsClick();
@@ -38,6 +40,11 @@ const Header = React.memo(
     const NotificationsPopup = usePopup(NotificationsStep, POPUP_PROPS);
     const UserPopup = usePopup(UserStep, POPUP_PROPS);
 
+    const onFullLogout = () => {
+      auth.signoutSilent();
+      onLogout();
+    };
+
     return (
       <div className={styles.wrapper}>
         {!project && (
@@ -88,7 +95,7 @@ const Header = React.memo(
             <UserPopup
               isLogouting={isLogouting}
               onSettingsClick={onUserSettingsClick}
-              onLogout={onLogout}
+              onLogout={onFullLogout}
             >
               <Menu.Item className={classNames(styles.item, styles.itemHoverable)}>
                 {user.name}

client/src/components/Login/Login.jsx

@@ -1,9 +1,10 @@
 import isEmail from 'validator/lib/isEmail';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useAuth } from 'react-oidc-context';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
-import { Button, Form, Grid, Header, Message } from 'semantic-ui-react';
+import { Form, Grid, Header, Message } from 'semantic-ui-react';
 import { useDidUpdate, usePrevious, useToggle } from '../../lib/hooks';
 import { Input } from '../../lib/custom-ui';
 
@@ -28,21 +29,6 @@ const createMessage = (error) => {
         type: 'error',
         content: 'common.invalidPassword',
       };
-    case 'Use single sign-on':
-      return {
-        type: 'error',
-        content: 'common.useSingleSignOn',
-      };
-    case 'Email already in use':
-      return {
-        type: 'error',
-        content: 'common.emailAlreadyInUse',
-      };
-    case 'Username already in use':
-      return {
-        type: 'error',
-        content: 'common.usernameAlreadyInUse',
-      };
     case 'Failed to fetch':
       return {
         type: 'warning',
@@ -62,16 +48,8 @@ const createMessage = (error) => {
 };
 
 const Login = React.memo(
-  ({
-    defaultData,
-    isSubmitting,
-    isSubmittingWithOidc,
-    error,
-    withOidc,
-    onAuthenticate,
-    onAuthenticateWithOidc,
-    onMessageDismiss,
-  }) => {
+  ({ defaultData, isSubmitting, error, onAuthenticate, onMessageDismiss }) => {
+    const auth = useAuth();
     const [t] = useTranslation();
     const wasSubmitting = usePrevious(isSubmitting);
 
@@ -192,19 +170,12 @@ const Login = React.memo(
                         content={t('action.logIn')}
                         floated="right"
                         loading={isSubmitting}
-                        disabled={isSubmitting || isSubmittingWithOidc}
+                        disabled={isSubmitting}
                       />
                     </Form>
-                    {withOidc && (
-                      <Button
-                        type="button"
-                        loading={isSubmittingWithOidc}
-                        disabled={isSubmitting || isSubmittingWithOidc}
-                        onClick={onAuthenticateWithOidc}
-                      >
-                        {t('action.logInWithSSO')}
-                      </Button>
-                    )}
+                    <Form.Button type="button" onClick={() => auth.signinRedirect()}>
+                      Log in with SSO
+                    </Form.Button>
                   </div>
                 </div>
               </Grid.Column>
@@ -235,15 +206,10 @@ const Login = React.memo(
 );
 
 Login.propTypes = {
-  /* eslint-disable react/forbid-prop-types */
-  defaultData: PropTypes.object.isRequired,
-  /* eslint-enable react/forbid-prop-types */
+  defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   isSubmitting: PropTypes.bool.isRequired,
-  isSubmittingWithOidc: PropTypes.bool.isRequired,
   error: PropTypes.object, // eslint-disable-line react/forbid-prop-types
-  withOidc: PropTypes.bool.isRequired,
   onAuthenticate: PropTypes.func.isRequired,
-  onAuthenticateWithOidc: PropTypes.func.isRequired,
   onMessageDismiss: PropTypes.func.isRequired,
 };
 

client/src/components/LoginWrapper.jsx

@@ -1,19 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Loader } from 'semantic-ui-react';
-
-import LoginContainer from '../containers/LoginContainer';
-
-const LoginWrapper = React.memo(({ isInitializing }) => {
-  if (isInitializing) {
-    return <Loader active size="massive" />;
-  }
-
-  return <LoginContainer />;
-});
-
-LoginWrapper.propTypes = {
-  isInitializing: PropTypes.bool.isRequired,
-};
-
-export default LoginWrapper;

client/src/components/OIDC/OidcLogin.jsx

@@ -0,0 +1,19 @@
+import { useAuth } from 'react-oidc-context';
+import PropTypes from 'prop-types';
+import React from 'react';
+
+let isLoggingIn = true;
+const OidcLogin = React.memo(({ onAuthenticate }) => {
+  const auth = useAuth();
+  if (isLoggingIn && auth.user) {
+    isLoggingIn = false;
+    const { user } = auth;
+    onAuthenticate(user);
+  }
+});
+
+OidcLogin.propTypes = {
+  onAuthenticate: PropTypes.func.isRequired,
+};
+
+export default OidcLogin;

client/src/components/OIDC/index.js

@@ -0,0 +1,3 @@
+import OidcLogin from './OidcLogin';
+
+export default OidcLogin;

client/src/components/Root.jsx

@@ -1,11 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { AuthProvider } from 'react-oidc-context';
 import { Provider } from 'react-redux';
 import { Route, Routes } from 'react-router-dom';
 import { ReduxRouter } from '../lib/redux-router';
 
 import Paths from '../constants/Paths';
-import LoginWrapperContainer from '../containers/LoginWrapperContainer';
+import LoginContainer from '../containers/LoginContainer';
 import CoreContainer from '../containers/CoreContainer';
 import NotFound from './NotFound';
 
@@ -14,29 +15,40 @@ import 'photoswipe/dist/photoswipe.css';
 import 'easymde/dist/easymde.min.css';
 import '../lib/custom-ui/styles.css';
 import '../styles.module.scss';
+import OidcLoginContainer from '../containers/OidcLoginContainer';
 
-function Root({ store, history }) {
+function Root({ store, history, config }) {
   return (
-    <Provider store={store}>
-      <ReduxRouter history={history}>
-        <Routes>
-          <Route path={Paths.LOGIN} element={<LoginWrapperContainer />} />
-          <Route path={Paths.OIDC_CALLBACK} element={<LoginWrapperContainer />} />
-          <Route path={Paths.ROOT} element={<CoreContainer />} />
-          <Route path={Paths.PROJECTS} element={<CoreContainer />} />
-          <Route path={Paths.BOARDS} element={<CoreContainer />} />
-          <Route path={Paths.CARDS} element={<CoreContainer />} />
-          <Route path="*" element={<NotFound />} />
-        </Routes>
-      </ReduxRouter>
-    </Provider>
+    <AuthProvider
+      authority={config.authority}
+      client_id={config.clientId}
+      redirect_uri={config.redirectUri}
+      scope={config.scopes}
+      onSigninCallback={() => {
+        window.history.replaceState({}, document.title, window.location.pathname);
+      }}
+    >
+      <Provider store={store}>
+        <ReduxRouter history={history}>
+          <Routes>
+            <Route path={Paths.LOGIN} element={<LoginContainer />} />
+            <Route path={Paths.OIDC_LOGIN} element={<OidcLoginContainer />} />
+            <Route path={Paths.ROOT} element={<CoreContainer />} />
+            <Route path={Paths.PROJECTS} element={<CoreContainer />} />
+            <Route path={Paths.BOARDS} element={<CoreContainer />} />
+            <Route path={Paths.CARDS} element={<CoreContainer />} />
+            <Route path="*" element={<NotFound />} />
+          </Routes>
+        </ReduxRouter>
+      </Provider>
+    </AuthProvider>
   );
 }
-
 Root.propTypes = {
   /* eslint-disable react/forbid-prop-types */
   store: PropTypes.object.isRequired,
   history: PropTypes.object.isRequired,
+  config: PropTypes.object.isRequired,
   /* eslint-enable react/forbid-prop-types */
 };
 

client/src/components/UserSettingsModal/UserSettingsModal.jsx

@@ -16,8 +16,8 @@ const UserSettingsModal = React.memo(
     phone,
     organization,
     language,
-    subscribeToOwnCards,
     isLocked,
+    subscribeToOwnCards,
     isAvatarUpdating,
     usernameUpdateForm,
     emailUpdateForm,
@@ -106,8 +106,8 @@ UserSettingsModal.propTypes = {
   phone: PropTypes.string,
   organization: PropTypes.string,
   language: PropTypes.string,
-  subscribeToOwnCards: PropTypes.bool.isRequired,
   isLocked: PropTypes.bool.isRequired,
+  subscribeToOwnCards: PropTypes.bool.isRequired,
   isAvatarUpdating: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   usernameUpdateForm: PropTypes.object.isRequired,

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

@@ -153,15 +153,13 @@ const ActionsStep = React.memo(
                     context: 'title',
                   })}
                 </Menu.Item>
+                <Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
+                  {t('action.deleteUser', {
+                    context: 'title',
+                  })}
+                </Menu.Item>
               </>
             )}
-            {!user.isLockedAdmin && (
-              <Menu.Item className={styles.menuItem} onClick={handleDeleteClick}>
-                {t('action.deleteUser', {
-                  context: 'title',
-                })}
-              </Menu.Item>
-            )}
           </Menu>
         </Popup.Content>
       </>

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

@@ -18,7 +18,6 @@ const Item = React.memo(
     phone,
     isAdmin,
     isLocked,
-    isLockedAdmin,
     emailUpdateForm,
     passwordUpdateForm,
     usernameUpdateForm,
@@ -48,7 +47,7 @@ const Item = React.memo(
         <Table.Cell>{username || '-'}</Table.Cell>
         <Table.Cell>{email}</Table.Cell>
         <Table.Cell>
-          <Radio toggle checked={isAdmin} disabled={isLockedAdmin} onChange={handleIsAdminChange} />
+          <Radio toggle checked={isAdmin} disabled={isLocked} onChange={handleIsAdminChange} />
         </Table.Cell>
         <Table.Cell textAlign="right">
           <ActionsPopup
@@ -60,7 +59,6 @@ const Item = React.memo(
               phone,
               isAdmin,
               isLocked,
-              isLockedAdmin,
               emailUpdateForm,
               passwordUpdateForm,
               usernameUpdateForm,
@@ -93,7 +91,6 @@ Item.propTypes = {
   phone: PropTypes.string,
   isAdmin: PropTypes.bool.isRequired,
   isLocked: PropTypes.bool.isRequired,
-  isLockedAdmin: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   emailUpdateForm: PropTypes.object.isRequired,
   passwordUpdateForm: PropTypes.object.isRequired,

client/src/components/UsersModal/UsersModal.jsx

@@ -111,7 +111,6 @@ const UsersModal = React.memo(
                   phone={item.phone}
                   isAdmin={item.isAdmin}
                   isLocked={item.isLocked}
-                  isLockedAdmin={item.isLockedAdmin}
                   emailUpdateForm={item.emailUpdateForm}
                   passwordUpdateForm={item.passwordUpdateForm}
                   usernameUpdateForm={item.usernameUpdateForm}

client/src/constants/ActionTypes.js

@@ -12,13 +12,9 @@ export default {
 
   /* Login */
 
-  LOGIN_INITIALIZE: 'LOGIN_INITIALIZE',
   AUTHENTICATE: 'AUTHENTICATE',
   AUTHENTICATE__SUCCESS: 'AUTHENTICATE__SUCCESS',
   AUTHENTICATE__FAILURE: 'AUTHENTICATE__FAILURE',
-  WITH_OIDC_AUTHENTICATE: 'WITH_OIDC_AUTHENTICATE',
-  WITH_OIDC_AUTHENTICATE__SUCCESS: 'WITH_OIDC_AUTHENTICATE__SUCCESS',
-  WITH_OIDC_AUTHENTICATE__FAILURE: 'WITH_OIDC_AUTHENTICATE__FAILURE',
   AUTHENTICATE_ERROR_CLEAR: 'AUTHENTICATE_ERROR_CLEAR',
 
   /* Core */

client/src/constants/EntryActionTypes.js

@@ -11,11 +11,11 @@ export default {
   /* Login */
 
   AUTHENTICATE: `${PREFIX}/AUTHENTICATE`,
-  WITH_OIDC_AUTHENTICATE: `${PREFIX}/WITH_OIDC_AUTHENTICATE`,
   AUTHENTICATE_ERROR_CLEAR: `${PREFIX}/AUTHENTICATE_ERROR_CLEAR`,
 
   /* Core */
 
+  CORE_INITIALIZE: `${PREFIX}/CORE_INITIALIZE`,
   LOGOUT: `${PREFIX}/LOGOUT`,
 
   /* Modals */

client/src/constants/Paths.js

@@ -2,7 +2,7 @@ import Config from './Config';
 
 const ROOT = `${Config.BASE_PATH}/`;
 const LOGIN = `${Config.BASE_PATH}/login`;
-const OIDC_CALLBACK = `${Config.BASE_PATH}/oidc-callback`;
+const OIDC_LOGIN = `${Config.BASE_PATH}/oidclogin`;
 const PROJECTS = `${Config.BASE_PATH}/projects/:id`;
 const BOARDS = `${Config.BASE_PATH}/boards/:id`;
 const CARDS = `${Config.BASE_PATH}/cards/:id`;
@@ -10,8 +10,8 @@ const CARDS = `${Config.BASE_PATH}/cards/:id`;
 export default {
   ROOT,
   LOGIN,
-  OIDC_CALLBACK,
   PROJECTS,
   BOARDS,
   CARDS,
+  OIDC_LOGIN,
 };

client/src/containers/CoreContainer.js

@@ -4,18 +4,18 @@ import selectors from '../selectors';
 import Core from '../components/Core';
 
 const mapStateToProps = (state) => {
-  const isInitializing = selectors.selectIsInitializing(state);
+  const isCoreInitializing = selectors.selectIsCoreInitializing(state);
   const isSocketDisconnected = selectors.selectIsSocketDisconnected(state);
   const currentModal = selectors.selectCurrentModal(state);
   const currentProject = selectors.selectCurrentProject(state);
   const currentBoard = selectors.selectCurrentBoard(state);
 
   return {
-    isInitializing,
     isSocketDisconnected,
     currentModal,
     currentProject,
     currentBoard,
+    isInitializing: isCoreInitializing,
   };
 };
 

client/src/containers/LoginContainer.js

@@ -1,33 +1,23 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
-import selectors from '../selectors';
 import entryActions from '../entry-actions';
 import Login from '../components/Login';
 
-const mapStateToProps = (state) => {
-  const oidcConfig = selectors.selectOidcConfig(state);
-
-  const {
-    ui: {
-      authenticateForm: { data: defaultData, isSubmitting, isSubmittingWithOidc, error },
-    },
-  } = state;
-
-  return {
-    defaultData,
-    isSubmitting,
-    isSubmittingWithOidc,
-    error,
-    withOidc: !!oidcConfig,
-  };
-};
+const mapStateToProps = ({
+  ui: {
+    authenticateForm: { data: defaultData, isSubmitting, error },
+  },
+}) => ({
+  defaultData,
+  isSubmitting,
+  error,
+});
 
 const mapDispatchToProps = (dispatch) =>
   bindActionCreators(
     {
       onAuthenticate: entryActions.authenticate,
-      onAuthenticateWithOidc: entryActions.authenticateWithOidc,
       onMessageDismiss: entryActions.clearAuthenticateError,
     },
     dispatch,

client/src/containers/LoginWrapperContainer.js

@@ -1,14 +0,0 @@
-import { connect } from 'react-redux';
-
-import selectors from '../selectors';
-import LoginWrapper from '../components/LoginWrapper';
-
-const mapStateToProps = (state) => {
-  const isInitializing = selectors.selectIsInitializing(state);
-
-  return {
-    isInitializing,
-  };
-};
-
-export default connect(mapStateToProps)(LoginWrapper);

client/src/containers/OidcLoginContainer.js

@@ -0,0 +1,26 @@
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
+import entryActions from '../entry-actions';
+import OidcLogin from '../components/OIDC';
+
+const mapStateToProps = ({
+  ui: {
+    authenticateForm: { data: defaultData, isSubmitting, error },
+  },
+}) => ({
+  defaultData,
+  isSubmitting,
+  error,
+});
+
+const mapDispatchToProps = (dispatch) =>
+  bindActionCreators(
+    {
+      onAuthenticate: entryActions.authenticate,
+      onMessageDismiss: entryActions.clearAuthenticateError,
+    },
+    dispatch,
+  );
+
+export default connect(mapStateToProps, mapDispatchToProps)(OidcLogin);

client/src/containers/UserSettingsModalContainer.js

@@ -14,8 +14,8 @@ const mapStateToProps = (state) => {
     phone,
     organization,
     language,
-    subscribeToOwnCards,
     isLocked,
+    subscribeToOwnCards,
     isAvatarUpdating,
     emailUpdateForm,
     passwordUpdateForm,
@@ -30,8 +30,8 @@ const mapStateToProps = (state) => {
     phone,
     organization,
     language,
-    subscribeToOwnCards,
     isLocked,
+    subscribeToOwnCards,
     isAvatarUpdating,
     emailUpdateForm,
     passwordUpdateForm,

client/src/entry-actions/core.js

@@ -1,10 +1,16 @@
 import EntryActionTypes from '../constants/EntryActionTypes';
 
+const initializeCore = () => ({
+  type: EntryActionTypes.CORE_INITIALIZE,
+  payload: {},
+});
+
 const logout = () => ({
   type: EntryActionTypes.LOGOUT,
   payload: {},
 });
 
 export default {
+  initializeCore,
   logout,
 };

client/src/entry-actions/login.js

@@ -7,11 +7,6 @@ const authenticate = (data) => ({
   },
 });
 
-const authenticateWithOidc = () => ({
-  type: EntryActionTypes.WITH_OIDC_AUTHENTICATE,
-  payload: {},
-});
-
 const clearAuthenticateError = () => ({
   type: EntryActionTypes.AUTHENTICATE_ERROR_CLEAR,
   payload: {},
@@ -19,6 +14,5 @@ const clearAuthenticateError = () => ({
 
 export default {
   authenticate,
-  authenticateWithOidc,
   clearAuthenticateError,
 };

client/src/index.js

@@ -1,11 +1,15 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 
+import Config from './constants/Config';
 import store from './store';
 import history from './history';
 import Root from './components/Root';
-
 import './i18n';
 
-const root = ReactDOM.createRoot(document.getElementById('root'));
-root.render(React.createElement(Root, { store, history }));
+fetch(`${Config.SERVER_BASE_URL}/api/appconfig`).then((response) => {
+  response.json().then((config) => {
+    const root = ReactDOM.createRoot(document.getElementById('root'));
+    root.render(React.createElement(Root, { store, history, config }));
+  });
+});

client/src/locales/ar/core.js

@@ -0,0 +1,233 @@
+export default {
+  format: {
+    date: 'M/d/yyyy',
+    time: 'p',
+    dateTime: '$t(format:date) $t(format:time)',
+    longDate: 'MMM d',
+    longDateTime: "MMMM d 'at' p",
+  },
+
+  translation: {
+    common: {
+      aboutPlanka: 'حول بلانكا',
+      account: 'الحساب',
+      actions: 'الإجراءات',
+      addAttachment_title: 'إضافة مرفق',
+      addComment: 'إضافة تعليق',
+      addManager_title: 'إضافة مدير',
+      addMember_title: 'إضافة عضو',
+      addUser_title: 'إضافة مستخدم',
+      administrator: 'المدير',
+      all: 'الكل',
+      allChangesWillBeAutomaticallySavedAfterConnectionRestored:
+        'سيتم حفظ جميع التغييرات تلقائيًا<br />عند استعادة الاتصال',
+      areYouSureYouWantToDeleteThisAttachment: 'هل أنت متأكد أنك تريد حذف هذا المرفق؟',
+      areYouSureYouWantToDeleteThisBoard: 'هل أنت متأكد أنك تريد حذف هذا اللوح؟',
+      areYouSureYouWantToDeleteThisCard: 'هل أنت متأكد أنك تريد حذف هذه البطاقة؟',
+      areYouSureYouWantToDeleteThisComment: 'هل أنت متأكد أنك تريد حذف هذا التعليق؟',
+      areYouSureYouWantToDeleteThisLabel: 'هل أنت متأكد أنك تريد حذف هذه العلامة؟',
+      areYouSureYouWantToDeleteThisList: 'هل أنت متأكد أنك تريد حذف هذه القائمة؟',
+      areYouSureYouWantToDeleteThisProject: 'هل أنت متأكد أنك تريد حذف هذا المشروع؟',
+      areYouSureYouWantToDeleteThisTask: 'هل أنت متأكد أنك تريد حذف هذه المهمة؟',
+      areYouSureYouWantToDeleteThisUser: 'هل أنت متأكد أنك تريد حذف هذا المستخدم؟',
+      areYouSureYouWantToLeaveBoard: 'هل أنت متأكد أنك تريد مغادرة اللوحة؟',
+      areYouSureYouWantToLeaveProject: 'هل أنت متأكد أنك تريد مغادرة المشروع؟',
+      areYouSureYouWantToRemoveThisManagerFromProject:
+        'هل أنت متأكد أنك تريد إزالة هذا المدير من المشروع؟',
+      areYouSureYouWantToRemoveThisMemberFromBoard:
+        'هل أنت متأكد أنك تريد إزالة هذا العضو من اللوحة؟',
+      attachment: 'المرفق',
+      attachments: 'المرفقات',
+      authentication: 'المصادقة',
+      background: 'الخلفية',
+      board: 'اللوحة',
+      boardNotFound_title: 'اللوحة غير موجودة',
+      canComment: 'يمكن التعليق',
+      canEditContentOfBoard: 'يمكن تحرير محتوى اللوحة',
+      canOnlyViewBoard: 'يمكن فقط عرض اللوحة',
+      cardActions_title: 'إجراءات البطاقة',
+      cardNotFound_title: 'البطاقة غير موجودة',
+      cardOrActionAreDeleted: 'تم حذف البطاقة أو الإجراء',
+      color: 'اللون',
+      createBoard_title: 'إنشاء لوحة',
+      createLabel_title: 'إنشاء علامة',
+      createNewOneOrSelectExistingOne: 'إنشاء واحدة جديدة أو اختيار<br />واحدة موجودة بالفعل',
+      createProject_title: 'إنشاء مشروع',
+      createTextFile_title: 'إنشاء ملف نصي',
+      currentPassword: 'كلمة المرور الحالية',
+      dangerZone_title: 'المنطقة الخطرة',
+      date: 'التاريخ',
+      dueDate_title: 'تاريخ الاستحقاق',
+      deleteAttachment_title: 'حذف المرفق',
+      deleteBoard_title: 'حذف اللوحة',
+      deleteCard_title: 'حذف البطاقة',
+      deleteComment_title: 'حذف التعليق',
+      deleteLabel_title: 'حذف العلامة',
+      deleteList_title: 'حذف القائمة',
+      deleteProject_title: 'حذف المشروع',
+      deleteTask_title: 'حذف المهمة',
+      deleteUser_title: 'حذف المستخدم',
+      description: 'الوصف',
+      detectAutomatically: 'الكشف تلقائياً',
+      dropFileToUpload: 'إفلات الملف للتحميل',
+      editor: 'المحرر',
+      editAttachment_title: 'تعديل المرفق',
+      editAvatar_title: 'تعديل الصورة الرمزية',
+      editBoard_title: 'تعديل اللوحة',
+      editDueDate_title: 'تعديل تاريخ الاستحقاق',
+      editEmail_title: 'تعديل البريد الإلكتروني',
+      editInformation_title: 'تعديل المعلومات',
+      editLabel_title: 'تعديل العلامة',
+      editPassword_title: 'تعديل كلمة المرور',
+      editPermissions_title: 'تعديل الصلاحيات',
+      editStopwatch_title: 'تعديل ساعة التوقف',
+      editUsername_title: 'تعديل اسم المستخدم',
+      email: 'البريد الإلكتروني',
+      emailAlreadyInUse: 'البريد الإلكتروني مستخدم بالفعل',
+      enterCardTitle: 'أدخل عنوان البطاقة... [Ctrl+Enter] للفتح التلقائي',
+      enterDescription: 'أدخل الوصف...',
+      enterFilename: 'أدخل اسم الملف',
+      enterListTitle: 'أدخل عنوان القائمة...',
+      enterProjectTitle: 'أدخل عنوان المشروع',
+      enterTaskDescription: 'أدخل وصف المهمة...',
+      filterByLabels_title: 'تصفية حسب العلامات',
+      filterByMembers_title: 'تصفية حسب الأعضاء',
+      fromComputer_title: 'من الكمبيوتر',
+      fromTrello: 'من تريلو',
+      general: 'عام',
+      hours: 'ساعات',
+      importBoard_title: 'استيراد اللوحة',
+      invalidCurrentPassword: 'كلمة المرور الحالية غير صالحة',
+      labels: 'العلامات',
+      language: 'اللغة',
+      leaveBoard_title: 'مغادرة اللوحة',
+      leaveProject_title: 'مغادرة المشروع',
+      list: 'القائمة',
+      listActions_title: 'إجراءات القائمة',
+      managers: 'المديرين',
+      members: 'الأعضاء',
+      minutes: 'دقائق',
+      moveCard_title: 'نقل البطاقة',
+      name: 'الاسم',
+      newEmail: 'البريد الإلكتروني الجديد',
+      newPassword: 'كلمة المرور الجديدة',
+      newUsername: 'اسم المستخدم الجديد',
+      noConnectionToServer: 'لا يوجد اتصال بالخادم',
+      noBoards: 'لا توجد لوحات',
+      noLists: 'لا توجد قوائم',
+      noProjects: 'لا توجد مشاريع',
+      notifications: 'الإشعارات',
+      noUnreadNotifications: 'لا توجد إشعارات غير مقروءة',
+      openBoard_title: 'فتح اللوحة',
+      optional_inline: 'اختياري',
+      organization: 'المنظمة',
+      phone: 'الهاتف',
+      preferences: 'التفضيلات',
+      pressPasteShortcutToAddAttachmentFromClipboard:
+        'نصيحة: اضغط على Ctrl-V (Cmd-V على ماك) لإضافة مرفق من الحافظة',
+      project: 'المشروع',
+      projectNotFound_title: 'المشروع غير موجود',
+      removeManager_title: 'إزالة المدير',
+      removeMember_title: 'إزالة العضو',
+      searchLabels: 'البحث في العلامات...',
+      searchMembers: 'البحث في الأعضاء...',
+      searchUsers: 'البحث في المستخدمين...',
+      seconds: 'ثواني',
+      selectBoard: 'اختيار اللوحة',
+      selectList: 'اختيار القائمة',
+      selectPermissions_title: 'اختيار الصلاحيات',
+      selectProject: 'اختيار المشروع',
+      settings: 'الإعدادات',
+      stopwatch: 'ساعة التوقف',
+      subscribeToMyOwnCardsByDefault: 'الاشتراك في بطاقاتي افتراضيًا',
+      taskActions_title: 'إجراءات المهمة',
+      tasks: 'المهام',
+      thereIsNoPreviewAvailableForThisAttachment: 'لا يوجد معاينة متاحة لهذا المرفق',
+      time: 'الوقت',
+      title: 'العنوان',
+      userActions_title: 'إجراءات المستخدم',
+      userAddedThisCardToList: '<0>{{user}}</0><1> أضاف هذه البطاقة إلى {{list}}</1>',
+      userLeftNewCommentToCard: '{{user}} ترك تعليقًا جديدًا «{{comment}}» على <2>{{card}}</2>',
+      userMovedCardFromListToList: '{{user}} نقل <2>{{card}}</2> من {{fromList}} إلى {{toList}}',
+      userMovedThisCardFromListToList:
+        '<0>{{user}}</0><1> نقل هذه البطاقة من {{fromList}} إلى {{toList}}</1>',
+      username: 'اسم المستخدم',
+      usernameAlreadyInUse: 'اسم المستخدم مستخدم بالفعل',
+      users: 'المستخدمين',
+      version: 'الإصدار',
+      viewer: 'المشاهد',
+      writeComment: 'كتابة تعليق...',
+    },
+
+    action: {
+      addAnotherCard: 'إضافة بطاقة أخرى',
+      addAnotherList: 'إضافة قائمة أخرى',
+      addAnotherTask: 'إضافة مهمة أخرى',
+      addCard: 'إضافة بطاقة',
+      addCard_title: 'إضافة بطاقة',
+      addComment: 'إضافة تعليق',
+      addList: 'إضافة قائمة',
+      addMember: 'إضافة عضو',
+      addMoreDetailedDescription: 'إضافة وصف أكثر تفصيلًا',
+      addTask: 'إضافة مهمة',
+      addToCard: 'إضافة إلى البطاقة',
+      addUser: 'إضافة مستخدم',
+      createBoard: 'إنشاء لوحة',
+      createFile: 'إنشاء ملف',
+      createLabel: 'إنشاء علامة',
+      createNewLabel: 'إنشاء علامة جديدة',
+      createProject: 'إنشاء مشروع',
+      delete: 'حذف',
+      deleteAttachment: 'حذف المرفق',
+      deleteAvatar: 'حذف الصورة الرمزية',
+      deleteBoard: 'حذف اللوحة',
+      deleteCard: 'حذف البطاقة',
+      deleteCard_title: 'حذف البطاقة',
+      deleteComment: 'حذف التعليق',
+      deleteImage: 'حذف الصورة',
+      deleteLabel: 'حذف العلامة',
+      deleteList: 'حذف القائمة',
+      deleteList_title: 'حذف القائمة',
+      deleteProject: 'حذف المشروع',
+      deleteProject_title: 'حذف المشروع',
+      deleteTask: 'حذف المهمة',
+      deleteTask_title: 'حذف المهمة',
+      deleteUser: 'حذف المستخدم',
+      edit: 'تعديل',
+      editDueDate_title: 'تعديل تاريخ الاستحقاق',
+      editDescription_title: 'تعديل الوصف',
+      editEmail_title: 'تعديل البريد الإلكتروني',
+      editInformation_title: 'تعديل المعلومات',
+      editPassword_title: 'تعديل كلمة المرور',
+      editPermissions: 'تعديل الصلاحيات',
+      editStopwatch_title: 'تعديل ساعة التوقف',
+      editTitle_title: 'تعديل العنوان',
+      editUsername_title: 'تعديل اسم المستخدم',
+      hideDetails: 'إخفاء التفاصيل',
+      import: 'استيراد',
+      leaveBoard: 'مغادرة اللوحة',
+      leaveProject: 'مغادرة المشروع',
+      logOut_title: 'تسجيل الخروج',
+      makeCover_title: 'جعلها غلافًا',
+      move: 'نقل',
+      moveCard_title: 'نقل البطاقة',
+      remove: 'إزالة',
+      removeBackground: 'إزالة الخلفية',
+      removeCover_title: 'إزالة الغلاف',
+      removeFromBoard: 'إزالة من اللوحة',
+      removeFromProject: 'إزالة من المشروع',
+      removeManager: 'إزالة المدير',
+      removeMember: 'إزالة العضو',
+      save: 'حفظ',
+      showAllAttachments: 'عرض جميع المرفقات ({{hidden}} مخفية)',
+      showDetails: 'عرض التفاصيل',
+      showFewerAttachments: 'عرض مرفقات أقل',
+      start: 'بدء',
+      stop: 'إيقاف',
+      subscribe: 'الاشتراك',
+      unsubscribe: 'إلغاء الاشتراك',
+      uploadNewAvatar: 'تحميل صورة رمزية جديدة',
+      uploadNewImage: 'تحميل صورة جديدة',
+    },
+  },
+};

client/src/locales/ar/index.js

@@ -0,0 +1,11 @@
+import merge from 'lodash/merge';
+
+import login from './login';
+import core from './core';
+
+export default {
+  language: 'ar',
+  country: 'ar',
+  name: 'Arabic',
+  embeddedLocale: merge(login, core),
+};

client/src/locales/ar/login.js

@@ -0,0 +1,20 @@
+export default {
+  translation: {
+    common: {
+      emailOrUsername: 'البريد الإلكتروني أو اسم المستخدم',
+      invalidEmailOrUsername: 'بريد إلكتروني أو اسم مستخدم غير صالح',
+      invalidPassword: 'كلمة مرور غير صالحة',
+      logInToPlanka: 'تسجيل الدخول إلى بلانكا',
+      noInternetConnection: 'لا يوجد اتصال بالإنترنت',
+      pageNotFound_title: 'الصفحة غير موجودة',
+      password: 'كلمة المرور',
+      projectManagement: 'إدارة المشروع',
+      serverConnectionFailed: 'فشل الاتصال بالخادم',
+      unknownError: 'خطأ غير معروف، حاول مرة أخرى لاحقًا',
+    },
+
+    action: {
+      logIn: 'تسجيل الدخول',
+    },
+  },
+};

client/src/locales/bn/core.js

@@ -0,0 +1,235 @@
+export default {
+  format: {
+    date: 'M/d/yyyy',
+    time: 'p',
+    dateTime: '$t(format:date) $t(format:time)',
+    longDate: 'MMM d',
+    longDateTime: "MMMM d 'তে' p",
+  },
+
+  translation: {
+    common: {
+      aboutPlanka: 'প্লাঙ্কা সম্পর্কে',
+      account: 'অ্যাকাউন্ট',
+      actions: 'ক্রিয়া',
+      addAttachment_title: 'সংযুক্তি যোগ করুন',
+      addComment: 'মন্তব্য যোগ করুন',
+      addManager_title: 'ম্যানেজার যোগ করুন',
+      addMember_title: 'সদস্য যোগ করুন',
+      addUser_title: 'ব্যবহারকারী যোগ করুন',
+      administrator: 'প্রশাসক',
+      all: 'সব',
+      allChangesWillBeAutomaticallySavedAfterConnectionRestored:
+        'সমস্ত পরিবর্তন স্বয়ংক্রিয়ভাবে সংরক্ষিত হবে<br />যখন সংযোগ পুনর্স্থাপন হবে',
+      areYouSureYouWantToDeleteThisAttachment:
+        'আপনি কি নিশ্চিত যে আপনি এই সংযুক্তি মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisBoard: 'আপনি কি নিশ্চিত যে আপনি এই বোর্ড মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisCard: 'আপনি কি নিশ্চিত যে আপনি এই কার্ড মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisComment: 'আপনি কি নিশ্চিত যে আপনি এই মন্তব্য মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisLabel: 'আপনি কি নিশ্চিত যে আপনি এই লেবেল মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisList: 'আপনি কি নিশ্চিত যে আপনি এই তালিকা মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisProject: 'আপনি কি নিশ্চিত যে আপনি এই প্রকল্প মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisTask: 'আপনি কি নিশ্চিত যে আপনি এই টাস্ক মুছে ফেলতে চান?',
+      areYouSureYouWantToDeleteThisUser: 'আপনি কি নিশ্চিত যে আপনি এই ব্যবহারকারী মুছে ফেলতে চান?',
+      areYouSureYouWantToLeaveBoard: 'আপনি কি নিশ্চিত যে আপনি বোর্ড ত্যাগ করতে চান?',
+      areYouSureYouWantToLeaveProject: 'আপনি কি নিশ্চিত যে আপনি প্রকল্প ত্যাগ করতে চান?',
+      areYouSureYouWantToRemoveThisManagerFromProject:
+        'আপনি কি নিশ্চিত যে আপনি এই প্রকল্প থেকে এই ম্যানেজারকে সরাতে চান?',
+      areYouSureYouWantToRemoveThisMemberFromBoard:
+        'আপনি কি নিশ্চিত যে আপনি এই মেম্বারকে বোর্ড থেকে সরাতে চান?',
+      attachment: 'সংযুক্তি',
+      attachments: 'সংযুক্তিসমূহ',
+      authentication: 'প্রমাণীকরণ',
+      background: 'পেশাদার',
+      board: 'বোর্ড',
+      boardNotFound_title: 'বোর্ড পাওয়া যায়নি',
+      canComment: 'মন্তব্য করতে পারে',
+      canEditContentOfBoard: 'বোর্ডের সামগ্রী সম্পাদনা করতে পারে',
+      canOnlyViewBoard: 'মাত্র বোর্ড দেখতে পারে',
+      cardActions_title: 'কার্ড ক্রিয়াকলাপ',
+      cardNotFound_title: 'কার্ড পাওয়া যায়নি',
+      cardOrActionAreDeleted: 'কার্ড বা ক্রিয়াকলাপ মোছে গেছে',
+      color: 'রং',
+      createBoard_title: 'বোর্ড তৈরি করুন',
+      createLabel_title: 'লেবেল তৈরি করুন',
+      createNewOneOrSelectExistingOne: 'নতুন তৈরি করুন অথবা<br />বিদ্যমান একটি নির্বাচন করুন',
+      createProject_title: 'প্রকল্প তৈরি করুন',
+      createTextFile_title: 'টেক্সট ফাইল তৈরি করুন',
+      currentPassword: 'বর্তমান পাসওয়ার্ড',
+      dangerZone_title: 'আপত্তি জোন',
+      date: 'তারিখ',
+      dueDate_title: 'নির্ধারণিত তারিখ',
+      deleteAttachment_title: 'সংযুক্তি মুছে ফেলুন',
+      deleteBoard_title: 'বোর্ড মুছে ফেলুন',
+      deleteCard_title: 'কার্ড মুছে ফেলুন',
+      deleteComment_title: 'মন্তব্য মুছে ফেলুন',
+      deleteLabel_title: 'লেবেল মুছে ফেলুন',
+      deleteList_title: 'তালিকা মুছে ফেলুন',
+      deleteProject_title: 'প্রকল্প মুছে ফেলুন',
+      deleteTask_title: 'টাস্ক মুছে ফেলুন',
+      deleteUser_title: 'ব্যবহারকারী মুছে ফেলুন',
+      description: 'বর্ণনা',
+      detectAutomatically: 'স্বয়ংক্রিয়ভাবে চেষ্টা করুন',
+      dropFileToUpload: 'আপলোড করার জন্য ফাইল প্রস্থান করুন',
+      editor: 'সম্পাদক',
+      editAttachment_title: 'সংযুক্তি সম্পাদনা করুন',
+      editAvatar_title: 'অবতার সম্পাদনা করুন',
+      editBoard_title: 'বোর্ড সম্পাদনা করুন',
+      editDueDate_title: 'নির্ধারণিত তারিখ সম্পাদনা করুন',
+      editEmail_title: 'ইমেইল সম্পাদনা করুন',
+      editInformation_title: 'তথ্য সম্পাদনা করুন',
+      editLabel_title: 'লেবেল সম্পাদনা করুন',
+      editPassword_title: 'পাসওয়ার্ড সম্পাদনা করুন',
+      editPermissions_title: 'অনুমতি সম্পাদনা করুন',
+      editStopwatch_title: 'স্টপওয়াচ সম্পাদনা করুন',
+      editUsername_title: 'ব্যবহারকারীর নাম সম্পাদনা করুন',
+      email: 'ইমেইল',
+      emailAlreadyInUse: 'ইমেইল ইতিমধ্যে ব্যবহৃত',
+      enterCardTitle: 'কার্ডের শিরোনাম লিখুন... [Ctrl+Enter] দিয়ে স্বয়ংক্রিয়ভাবে খোলুন',
+      enterDescription: 'বর্ণনা লিখুন...',
+      enterFilename: 'ফাইলের নাম লিখুন',
+      enterListTitle: 'তালিকা শিরোনাম লিখুন...',
+      enterProjectTitle: 'প্রকল্পের শিরোনাম লিখুন',
+      enterTaskDescription: 'টাস্কের বর্ণনা লিখুন...',
+      filterByLabels_title: 'লেবেল দ্বারা ছাঁকো',
+      filterByMembers_title: 'সদস্য দ্বারা ছাঁকো',
+      fromComputer_title: 'কম্পিউটার থেকে',
+      fromTrello: 'ট্রেলো থেকে',
+      general: 'সাধারণ',
+      hours: 'ঘণ্টা',
+      importBoard_title: 'বোর্ড আমদানি করুন',
+      invalidCurrentPassword: 'বর্তমান পাসওয়ার্ড অবৈধ',
+      labels: 'লেবেল',
+      language: 'ভাষা',
+      leaveBoard_title: 'বোর্ড ত্যাগ করুন',
+      leaveProject_title: 'প্রকল্প ত্যাগ করুন',
+      list: 'তালিকা',
+      listActions_title: 'তালিকা ক্রিয়াকলাপ',
+      managers: 'ম্যানেজারসমূহ',
+      members: 'সদস্যগণ',
+      minutes: 'মিনিট',
+      moveCard_title: 'কার্ড সরান',
+      name: 'নাম',
+      newEmail: 'নতুন ইমেইল',
+      newPassword: 'নতুন পাসওয়ার্ড',
+      newUsername: 'নতুন ব্যবহারকারীর নাম',
+      noConnectionToServer: 'সার্ভারে সংযোগ নেই',
+      noBoards: 'কোন বোর্ড নেই',
+      noLists: 'কোন তালিকা নেই',
+      noProjects: 'কোন প্রকল্প নেই',
+      notifications: 'বিজ্ঞপ্তি',
+      noUnreadNotifications: 'কোন অপঠিত বিজ্ঞপ্তি নেই',
+      openBoard_title: 'বোর্ড খুলুন',
+      optional_inline: 'ঐচ্ছিক',
+      organization: 'সংগঠন',
+      phone: 'ফোন',
+      preferences: 'পছন্দ',
+      pressPasteShortcutToAddAttachmentFromClipboard:
+        'প্রয়োজনীয়: Ctrl-V (Mac উপর Cmd-V) চাপুন যেটাতে ক্লিপবোর্ড থেকে সংযুক্তি যোগ করতে পারবেন',
+      project: 'প্রকল্প',
+      projectNotFound_title: 'প্রকল্প পাওয়া যায়নি',
+      removeManager_title: 'ম্যানেজার সরান',
+      removeMember_title: 'সদস্য সরান',
+      searchLabels: 'লেবেল খুঁজুন...',
+      searchMembers: 'সদস্য খুঁজুন...',
+      searchUsers: 'ব্যবহারকারী খুঁজুন...',
+      seconds: 'সেকেন্ড',
+      selectBoard: 'বোর্ড নির্বাচন করুন',
+      selectList: 'তালিকা নির্বাচন করুন',
+      selectPermissions_title: 'অনুমতি নির্বাচন করুন',
+      selectProject: 'প্রকল্প নির্বাচন করুন',
+      settings: 'সেটিংস',
+      stopwatch: 'স্টপওয়াচ',
+      subscribeToMyOwnCardsByDefault: 'ডিফল্ট অবস্থায় আমার নিজের কার্ডে সাবস্ক্রাইব করুন',
+      taskActions_title: 'টাস্ক ক্রিয়াকলাপ',
+      tasks: 'টাস্কগুলি',
+      thereIsNoPreviewAvailableForThisAttachment: 'এই সংযুক্তির জন্য কোন পূর্বরূপ নেই',
+      time: 'সময়',
+      title: 'শিরোনাম',
+      userActions_title: 'ব্যবহারকারী ক্রিয়াকলাপ',
+      userAddedThisCardToList: '<0>{{user}}</0><1> {{list}} তে এই কার্ড যোগ করেছেন</1>',
+      userLeftNewCommentToCard: '{{user}} নতুন মন্তব্য ছেড়েছেন «{{comment}}» <2>{{card}}</2> এ',
+      userMovedCardFromListToList:
+        '{{user}} <2>{{card}}</2> মোব করেছেন {{fromList}} থেকে {{toList}} এ',
+      userMovedThisCardFromListToList:
+        '<0>{{user}}</0><1> {{fromList}} থেকে {{toList}} এ এই কার্ড মোব করেছেন</1>',
+      username: 'ব্যবহারকারীর নাম',
+      usernameAlreadyInUse: 'ব্যবহারকারীর নাম ইতিমধ্যে ব্যবহৃত',
+      users: 'ব্যবহারকারীগণ',
+      version: 'সংস্করণ',
+      viewer: 'দর্শক',
+      writeComment: 'মন্তব্য লিখুন...',
+    },
+
+    action: {
+      addAnotherCard: 'আরেকটি কার্ড যোগ করুন',
+      addAnotherList: 'আরেকটি তালিকা যোগ করুন',
+      addAnotherTask: 'আরেকটি টাস্ক যোগ করুন',
+      addCard: 'কার্ড যোগ করুন',
+      addCard_title: 'কার্ড যোগ করুন',
+      addComment: 'মন্তব্য যোগ করুন',
+      addList: 'তালিকা যোগ করুন',
+      addMember: 'সদস্য যোগ করুন',
+      addMoreDetailedDescription: 'আরও বিস্তারিত বর্ণনা যোগ করুন',
+      addTask: 'টাস্ক যোগ করুন',
+      addToCard: 'কার্ডে যোগ করুন',
+      addUser: 'ব্যবহারকারী যোগ করুন',
+      createBoard: 'বোর্ড তৈরি করুন',
+      createFile: 'ফাইল তৈরি করুন',
+      createLabel: 'লেবেল তৈরি করুন',
+      createNewLabel: 'নতুন লেবেল তৈরি করুন',
+      createProject: 'প্রকল্প তৈরি করুন',
+      delete: 'মুছে ফেলুন',
+      deleteAttachment: 'সংযুক্তি মুছে ফেলুন',
+      deleteAvatar: 'অবতার মুছে ফেলুন',
+      deleteBoard: 'বোর্ড মুছে ফেলুন',
+      deleteCard: 'কার্ড মুছে ফেলুন',
+      deleteCard_title: 'কার্ড মুছে ফেলুন',
+      deleteComment: 'মন্তব্য মুছে ফেলুন',
+      deleteImage: 'চিত্র মুছে ফেলুন',
+      deleteLabel: 'লেবেল মুছে ফেলুন',
+      deleteList: 'তালিকা মুছে ফেলুন',
+      deleteList_title: 'তালিকা মুছে ফেলুন',
+      deleteProject: 'প্রকল্প মুছে ফেলুন',
+      deleteProject_title: 'প্রকল্প মুছে ফেলুন',
+      deleteTask: 'টাস্ক মুছে ফেলুন',
+      deleteTask_title: 'টাস্ক মুছে ফেলুন',
+      deleteUser: 'ব্যবহারকারী মুছে ফেলুন',
+      edit: 'সম্পাদনা করুন',
+      editDueDate_title: 'নির্ধারণিত তারিখ সম্পাদনা করুন',
+      editDescription_title: 'বর্ণনা সম্পাদনা করুন',
+      editEmail_title: 'ইমেইল সম্পাদনা করুন',
+      editInformation_title: 'তথ্য সম্পাদনা করুন',
+      editPassword_title: 'পাসওয়ার্ড সম্পাদনা করুন',
+      editPermissions: 'অনুমতি সম্পাদনা করুন',
+      editStopwatch_title: 'স্টপওয়াচ সম্পাদনা করুন',
+      editTitle_title: 'শিরোনাম সম্পাদনা করুন',
+      editUsername_title: 'ব্যবহারকারীর নাম সম্পাদনা করুন',
+      hideDetails: 'বিশদ লুকান',
+      import: 'আমদানি করুন',
+      leaveBoard: 'বোর্ড ত্যাগ করুন',
+      leaveProject: 'প্রকল্প ত্যাগ করুন',
+      logOut_title: 'লগ আউট',
+      makeCover_title: 'কভার তৈরি করুন',
+      move: 'সরান',
+      moveCard_title: 'কার্ড সরান',
+      remove: 'সরান',
+      removeBackground: 'পেশাদার সরান',
+      removeCover_title: 'কভার সরান',
+      removeFromBoard: 'বোর্ড থেকে সরান',
+      removeFromProject: 'প্রকল্প থেকে সরান',
+      removeManager: 'ম্যানেজার সরান',
+      removeMember: 'সদস্য সরান',
+      save: 'সংরক্ষণ করুন',
+      showAllAttachments: 'সমস্ত সংযুক্তিসমূহ দেখান ({{hidden}} লুকান)',
+      showDetails: 'বিশদ দেখান',
+      showFewerAttachments: 'কম সংযুক্তি দেখান',
+      start: 'শুরু',
+      stop: 'বন্ধ',
+      subscribe: 'সাবস্ক্রাইব করুন',
+      unsubscribe: 'সাবস্ক্রাইব বাতিল করুন',
+      uploadNewAvatar: 'নতুন অবতার আপলোড করুন',
+      uploadNewImage: 'নতুন চিত্র আপলোড করুন',
+    },
+  },
+};

client/src/locales/bn/index.js

@@ -0,0 +1,11 @@
+import merge from 'lodash/merge';
+
+import login from './login';
+import core from './core';
+
+export default {
+  language: 'bn',
+  country: 'bn',
+  name: 'Bengali',
+  embeddedLocale: merge(login, core),
+};

client/src/locales/bn/login.js

@@ -0,0 +1,20 @@
+export default {
+  translation: {
+    common: {
+      emailOrUsername: 'ইমেইল বা ব্যবহারকারীর নাম',
+      invalidEmailOrUsername: 'অবৈধ ইমেইল বা ব্যবহারকারীর নাম',
+      invalidPassword: 'অবৈধ পাসওয়ার্ড',
+      logInToPlanka: 'Planka-তে লগ ইন করুন',
+      noInternetConnection: 'ইন্টারনেট সংযোগ নেই',
+      pageNotFound_title: 'পেজ পাওয়া যায়নি',
+      password: 'পাসওয়ার্ড',
+      projectManagement: 'প্রকল্প পরিচালনা',
+      serverConnectionFailed: 'সার্ভার সংযোগ ব্যর্থ হয়েছে',
+      unknownError: 'অজানা ত্রুটি, পরে আবার চেষ্টা করুন',
+    },
+
+    action: {
+      logIn: 'লগ ইন করুন',
+    },
+  },
+};

client/src/locales/en/login.js

@@ -11,12 +11,10 @@ export default {
       projectManagement: 'Project management',
       serverConnectionFailed: 'Server connection failed',
       unknownError: 'Unknown error, try again later',
-      useSingleSignOn: 'Use single sign-on',
     },
 
     action: {
       logIn: 'Log in',
-      logInWithSSO: 'Log in with SSO',
     },
   },
 };

client/src/locales/hi/core.js

@@ -0,0 +1,236 @@
+export default {
+  format: {
+    date: 'd/M/yyyy',
+    time: 'A',
+    dateTime: '$t(format:date), $t(format:time)',
+    longDate: 'd MMM',
+    longDateTime: "d MMMM 'को' $t(format:time)",
+  },
+
+  translation: {
+    common: {
+      aboutPlanka: 'Planka के बारे में',
+      account: 'खाता',
+      actions: 'क्रियाएँ',
+      addAttachment_title: 'अटैचमेंट जोड़ें',
+      addComment: 'टिप्पणी जोड़ें',
+      addManager_title: 'मैनेजर जोड़ें',
+      addMember_title: 'सदस्य जोड़ें',
+      addUser_title: 'उपयोगकर्ता जोड़ें',
+      administrator: 'प्रशासक',
+      all: 'सभी',
+      allChangesWillBeAutomaticallySavedAfterConnectionRestored:
+        'सभी परिवर्तन अपने आप सहेजे जाएंगे<br />कनेक्शन बहाल होने के बाद',
+      areYouSureYouWantToDeleteThisAttachment: 'क्या आप वाकई इस अटैचमेंट को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisBoard: 'क्या आप वाकई इस बोर्ड को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisCard: 'क्या आप वाकई इस कार्ड को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisComment: 'क्या आप वाकई इस टिप्पणी को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisLabel: 'क्या आप वाकई इस लेबल को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisList: 'क्या आप वाकई इस सूची को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisProject: 'क्या आप वाकई इस परियोजना को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisTask: 'क्या आप वाकई इस कार्य को हटाना चाहते हैं?',
+      areYouSureYouWantToDeleteThisUser: 'क्या आप वाकई इस उपयोगकर्ता को हटाना चाहते हैं?',
+      areYouSureYouWantToLeaveBoard: 'क्या आप वाकई इस बोर्ड को छोड़ना चाहते हैं?',
+      areYouSureYouWantToLeaveProject: 'क्या आप वाकई इस परियोजना को छोड़ना चाहते हैं?',
+      areYouSureYouWantToRemoveThisManagerFromProject:
+        'क्या आप वाकई इस परियोजना से इस मैनेजर को हटाना चाहते हैं?',
+      areYouSureYouWantToRemoveThisMemberFromBoard:
+        'क्या आप वाकई इस बोर्ड से इस सदस्य को हटाना चाहते हैं?',
+      attachment: 'अटैचमेंट',
+      attachments: 'अटैचमेंट्स',
+      authentication: 'प्रमाणीकरण',
+      background: 'पृष्ठभूमि',
+      board: 'बोर्ड',
+      boardNotFound_title: 'बोर्ड नहीं मिला',
+      canComment: 'टिप्पणी कर सकते हैं',
+      canEditContentOfBoard: 'बोर्ड की सामग्री को संपादित कर सकते हैं',
+      canOnlyViewBoard: 'केवल बोर्ड देख सकते हैं',
+      cardActions_title: 'कार्ड क्रियाएँ',
+      cardNotFound_title: 'कार्ड नहीं मिला',
+      cardOrActionAreDeleted: 'कार्ड या क्रिया हटा दी गई हैं',
+      color: 'रंग',
+      createBoard_title: 'बोर्ड बनाएं',
+      createLabel_title: 'लेबल बनाएं',
+      createNewOneOrSelectExistingOne: 'नया बनाएं या<br />मौजूदा चुनें',
+      createProject_title: 'परियोजना बनाएं',
+      createTextFile_title: 'टेक्स्ट फ़ाइल बनाएं',
+      currentPassword: 'वर्तमान पासवर्ड',
+      dangerZone_title: 'खतरे का क्षेत्र',
+      date: 'तारीख',
+      dueDate_title: 'नियत तारीख',
+      deleteAttachment_title: 'अटैचमेंट हटाएं',
+      deleteBoard_title: 'बोर्ड हटाएं',
+      deleteCard_title: 'कार्ड हटाएं',
+      deleteComment_title: 'टिप्पणी हटाएं',
+      deleteLabel_title: 'लेबल हटाएं',
+      deleteList_title: 'सूची हटाएं',
+      deleteProject_title: 'परियोजना हटाएं',
+      deleteTask_title: 'कार्य हटाएं',
+      deleteUser_title: 'उपयोगकर्ता हटाएं',
+      description: 'विवरण',
+      detectAutomatically: 'स्वचालित खोजें',
+      dropFileToUpload: 'अपलोड करने के लिए फ़ाइल छोड़ें',
+      editor: 'संपादक',
+      editAttachment_title: 'अटैचमेंट संपादित करें',
+      editAvatar_title: 'अवतार संपादित करें',
+      editBoard_title: 'बोर्ड संपादित करें',
+      editDueDate_title: 'नियत तारीख संपादित करें',
+      editEmail_title: 'ईमेल संपादित करें',
+      editInformation_title: 'जानकारी संपादित करें',
+      editLabel_title: 'लेबल संपादित करें',
+      editPassword_title: 'पासवर्ड संपादित करें',
+      editPermissions_title: 'अनुमतियाँ संपादित करें',
+      editStopwatch_title: 'स्टॉपवॉच संपादित करें',
+      editUsername_title: 'उपयोगकर्ता नाम संपादित करें',
+      email: 'ईमेल',
+      emailAlreadyInUse: 'ईमेल पहले से उपयोग में है',
+      enterCardTitle: 'कार्ड शीर्षक दर्ज करें... [Ctrl+Enter] ऑटो-खुला करने के लिए',
+      enterDescription: 'विवरण दर्ज करें...',
+      enterFilename: 'फ़ाइल का नाम दर्ज करें',
+      enterListTitle: 'सूची का शीर्षक दर्ज करें...',
+      enterProjectTitle: 'परियोजना का शीर्षक दर्ज करें',
+      enterTaskDescription: 'कार्य का विवरण दर्ज करें...',
+      filterByLabels_title: 'लेबल से फ़िल्टर करें',
+      filterByMembers_title: 'सदस्यों से फ़िल्टर करें',
+      fromComputer_title: 'कंप्यूटर से',
+      fromTrello: 'Trello से',
+      general: 'सामान्य',
+      hours: 'घंटे',
+      importBoard_title: 'बोर्ड आयात करें',
+      invalidCurrentPassword: 'अमान्य वर्तमान पासवर्ड',
+      labels: 'लेबल',
+      language: 'भाषा',
+      leaveBoard_title: 'बोर्ड छोड़ें',
+      leaveProject_title: 'परियोजना छोड़ें',
+      list: 'सूची',
+      listActions_title: 'सूची क्रियाएँ',
+      managers: 'मैनेजर',
+      members: 'सदस्य',
+      minutes: 'मिनट',
+      moveCard_title: 'कार्ड को ले जाएं',
+      name: 'नाम',
+      newEmail: 'नई ईमेल',
+      newPassword: 'नया पासवर्ड',
+      newUsername: 'नया उपयोगकर्ता नाम',
+      noConnectionToServer: 'सर्वर से कोई जुड़ाव नहीं है',
+      noBoards: 'कोई बोर्ड नहीं',
+      noLists: 'कोई सूची नहीं',
+      noProjects: 'कोई परियोजनाएँ नहीं',
+      notifications: 'सूचनाएँ',
+      noUnreadNotifications: 'कोई अपठित सूचनाएँ नहीं हैं',
+      openBoard_title: 'बोर्ड खोलें',
+      optional_inline: 'वैकल्पिक',
+      organization: 'संगठन',
+      phone: 'फ़ोन',
+      preferences: 'प्राथमिकताएँ',
+      pressPasteShortcutToAddAttachmentFromClipboard:
+        'सुझाव: क्लिपबोर्ड से अटैचमेंट जोड़ने के लिए Ctrl-V (Mac पर Cmd-V) दबाएं',
+      project: 'परियोजना',
+      projectNotFound_title: 'परियोजना नहीं मिली',
+      removeManager_title: 'मैनेजर हटाएं',
+      removeMember_title: 'सदस्य हटाएं',
+      searchLabels: 'लेबल खोजें...',
+      searchMembers: 'सदस्य खोजें...',
+      searchUsers: 'उपयोगकर्ताओं को खोजें...',
+      seconds: 'सेकंड्स',
+      selectBoard: 'बोर्ड चुनें',
+      selectList: 'सूची चुनें',
+      selectPermissions_title: 'अनुमतियाँ चुनें',
+      selectProject: 'परियोजना चुनें',
+      settings: 'सेटिंग्स',
+      stopwatch: 'स्टॉपवॉच',
+      subscribeToMyOwnCardsByDefault: 'डिफ़ॉल्ट रूप से मेरे अपने कार्डों की सदस्यता लें',
+      taskActions_title: 'कार्य क्रियाएँ',
+      tasks: 'कार्य',
+      thereIsNoPreviewAvailableForThisAttachment:
+        'इस अटैचमेंट के लिए कोई पूर्वावलोकन उपलब्ध नहीं है',
+      time: 'समय',
+      title: 'शीर्षक',
+      userActions_title: 'उपयोगकर्ता क्रियाएँ',
+      userAddedThisCardToList: '<0>{{user}}</0><1> ने इस कार्ड को {{list}} में जोड़ा</1>',
+      userLeftNewCommentToCard:
+        '{{user}} ने कार्ड <2>{{card}}</2> पर नई टिप्पणी छोड़ी «{{comment}}»',
+      userMovedCardFromListToList:
+        '{{user}} ने <2>{{card}}</2> को {{fromList}} से {{toList}} में मूव किया',
+      userMovedThisCardFromListToList:
+        '<0>{{user}}</0><1> ने इस कार्ड को {{fromList}} से {{toList}} में मूव किया</1>',
+      username: 'उपयोगकर्ता नाम',
+      usernameAlreadyInUse: 'उपयोगकर्ता नाम पहले से उपयोग में है',
+      users: 'उपयोगकर्ताओं',
+      version: 'संस्करण',
+      viewer: 'दर्शक',
+      writeComment: 'टिप्पणी लिखें...',
+    },
+
+    action: {
+      addAnotherCard: 'एक और कार्ड जोड़ें',
+      addAnotherList: 'एक और सूची जोड़ें',
+      addAnotherTask: 'एक और कार्य जोड़ें',
+      addCard: 'कार्ड जोड़ें',
+      addCard_title: 'कार्ड जोड़ें',
+      addComment: 'टिप्पणी जोड़ें',
+      addList: 'सूची जोड़ें',
+      addMember: 'सदस्य जोड़ें',
+      addMoreDetailedDescription: 'अधिक विस्तारित विवरण जोड़ें',
+      addTask: 'कार्य जोड़ें',
+      addToCard: 'कार्ड में जोड़ें',
+      addUser: 'उपयोगकर्ता जोड़ें',
+      createBoard: 'बोर्ड बनाएं',
+      createFile: 'फ़ाइल बनाएं',
+      createLabel: 'लेबल बनाएं',
+      createNewLabel: 'नई लेबल बनाएं',
+      createProject: 'परियोजना बनाएं',
+      delete: 'हटाएं',
+      deleteAttachment: 'अटैचमेंट हटाएं',
+      deleteAvatar: 'अवतार हटाएं',
+      deleteBoard: 'बोर्ड हटाएं',
+      deleteCard: 'कार्ड हटाएं',
+      deleteCard_title: 'कार्ड हटाएं',
+      deleteComment: 'टिप्पणी हटाएं',
+      deleteImage: 'छवि हटाएं',
+      deleteLabel: 'लेबल हटाएं',
+      deleteList: 'सूची हटाएं',
+      deleteList_title: 'सूची हटाएं',
+      deleteProject: 'परियोजना हटाएं',
+      deleteProject_title: 'परियोजना हटाएं',
+      deleteTask: 'कार्य हटाएं',
+      deleteTask_title: 'कार्य हटाएं',
+      deleteUser: 'उपयोगकर्ता हटाएं',
+      edit: 'संपादित करें',
+      editDueDate_title: 'नियत तारीख संपादित करें',
+      editDescription_title: 'विवरण संपादित करें',
+      editEmail_title: 'ईमेल संपादित करें',
+      editInformation_title: 'जानकारी संपादित करें',
+      editPassword_title: 'पासवर्ड संपादित करें',
+      editPermissions: 'अनुमतियाँ संपादित करें',
+      editStopwatch_title: 'स्टॉपवॉच संपादित करें',
+      editTitle_title: 'शीर्षक संपादित करें',
+      editUsername_title: 'उपयोगकर्ता नाम संपादित करें',
+      hideDetails: 'विवरण छुपाएं',
+      import: 'आयात करें',
+      leaveBoard: 'बोर्ड छोड़ें',
+      leaveProject: 'परियोजना छोड़ें',
+      logOut_title: 'लॉग आउट',
+      makeCover_title: 'कवर बनाएं',
+      move: 'मूव करें',
+      moveCard_title: 'कार्ड को ले जाएं',
+      remove: 'हटाएं',
+      removeBackground: 'पृष्ठभूमि हटाएं',
+      removeCover_title: 'कवर हटाएं',
+      removeFromBoard: 'बोर्ड से हटाएं',
+      removeFromProject: 'परियोजना से हटाएं',
+      removeManager: 'मैनेजर हटाएं',
+      removeMember: 'सदस्य हटाएं',
+      save: 'सहेजें',
+      showAllAttachments: 'सभी अटैचमेंट दिखाएं ({{hidden}} छुपे हुए)',
+      showDetails: 'विवरण दिखाएं',
+      showFewerAttachments: 'कम अटैचमेंट दिखाएं',
+      start: 'शुरू करें',
+      stop: 'रोकें',
+      subscribe: 'सदस्यता लें',
+      unsubscribe: 'सदस्यता रद्द करें',
+      uploadNewAvatar: 'नया अवतार अपलोड करें',
+      uploadNewImage: 'नई छवि अपलोड करें',
+    },
+  },
+};

client/src/locales/hi/index.js

@@ -0,0 +1,11 @@
+import merge from 'lodash/merge';
+
+import login from './login';
+import core from './core';
+
+export default {
+  language: 'hi',
+  country: 'hi',
+  name: 'Hindi',
+  embeddedLocale: merge(login, core),
+};

client/src/locales/hi/login.js

@@ -0,0 +1,20 @@
+export default {
+  translation: {
+    common: {
+      emailOrUsername: 'ईमेल या उपयोगकर्ता नाम',
+      invalidEmailOrUsername: 'अवैध ईमेल या उपयोगकर्ता नाम',
+      invalidPassword: 'अवैध पासवर्ड',
+      logInToPlanka: 'Planka में लॉग इन करें',
+      noInternetConnection: 'कोई इंटरनेट कनेक्शन नहीं',
+      pageNotFound_title: 'पृष्ठ नहीं मिला',
+      password: 'पासवर्ड',
+      projectManagement: 'परियोजना प्रबंधन',
+      serverConnectionFailed: 'सर्वर कनेक्शन विफल हो गया',
+      unknownError: 'अज्ञात त्रुटि, बाद में पुनः प्रयास करें',
+    },
+
+    action: {
+      logIn: 'लॉग इन करें',
+    },
+  },
+};

client/src/locales/index.js

@@ -1,12 +1,16 @@
+import ar from './ar';
+import bn from './bn';
 import cs from './cs';
 import da from './da';
 import de from './de';
 import en from './en';
 import es from './es';
 import fr from './fr';
+import hi from './hi';
 import it from './it';
 import ja from './ja';
 import ko from './ko';
+import nl from './nl';
 import pl from './pl';
 import ru from './ru';
 import sk from './sk';
@@ -15,7 +19,7 @@ import tr from './tr';
 import uz from './uz';
 import zh from './zh';
 
-const locales = [cs, da, de, en, es, fr, it, ja, ko, pl, ru, sk, sv, tr, uz, zh];
+const locales = [ar, bn, cs, da, de, en, es, fr, hi, it, ja, ko, nl, pl, ru, sk, sv, tr, uz, zh];
 
 export default locales;
 

client/src/locales/nl/core.js

@@ -0,0 +1,236 @@
+export default {
+  format: {
+    date: 'd-M-yyyy',
+    time: 'HH:mm',
+    dateTime: '$t(format:date) $t(format:time)',
+    longDate: 'd MMM',
+    longDateTime: "d MMMM 'om' HH:mm",
+  },
+
+  translation: {
+    common: {
+      aboutPlanka: 'Over Planka',
+      account: 'Account',
+      actions: 'Acties',
+      addAttachment_title: 'Bijlage Toevoegen',
+      addComment: 'Opmerking Toevoegen',
+      addManager_title: 'Manager Toevoegen',
+      addMember_title: 'Lid Toevoegen',
+      addUser_title: 'Gebruiker Toevoegen',
+      administrator: 'Beheerder',
+      all: 'Alles',
+      allChangesWillBeAutomaticallySavedAfterConnectionRestored:
+        'Alle wijzigingen worden automatisch opgeslagen<br />nadat de verbinding is hersteld',
+      areYouSureYouWantToDeleteThisAttachment: 'Weet u zeker dat u deze bijlage wilt verwijderen?',
+      areYouSureYouWantToDeleteThisBoard: 'Weet u zeker dat u dit bord wilt verwijderen?',
+      areYouSureYouWantToDeleteThisCard: 'Weet u zeker dat u deze kaart wilt verwijderen?',
+      areYouSureYouWantToDeleteThisComment: 'Weet u zeker dat u deze opmerking wilt verwijderen?',
+      areYouSureYouWantToDeleteThisLabel: 'Weet u zeker dat u deze label wilt verwijderen?',
+      areYouSureYouWantToDeleteThisList: 'Weet u zeker dat u deze lijst wilt verwijderen?',
+      areYouSureYouWantToDeleteThisProject: 'Weet u zeker dat u dit project wilt verwijderen?',
+      areYouSureYouWantToDeleteThisTask: 'Weet u zeker dat u deze taak wilt verwijderen?',
+      areYouSureYouWantToDeleteThisUser: 'Weet u zeker dat u deze gebruiker wilt verwijderen?',
+      areYouSureYouWantToLeaveBoard: 'Weet u zeker dat u het bord wilt verlaten?',
+      areYouSureYouWantToLeaveProject: 'Weet u zeker dat u het project wilt verlaten?',
+      areYouSureYouWantToRemoveThisManagerFromProject:
+        'Weet u zeker dat u deze manager uit het project wilt verwijderen?',
+      areYouSureYouWantToRemoveThisMemberFromBoard:
+        'Weet u zeker dat u dit lid uit het bord wilt verwijderen?',
+      attachment: 'Bijlage',
+      attachments: 'Bijlagen',
+      authentication: 'Authenticatie',
+      background: 'Achtergrond',
+      board: 'Bord',
+      boardNotFound_title: 'Bord Niet Gevonden',
+      canComment: 'Kan opmerking plaatsen',
+      canEditContentOfBoard: 'Kan de inhoud van het bord bewerken',
+      canOnlyViewBoard: 'Kan alleen het bord bekijken',
+      cardActions_title: 'Kaartacties',
+      cardNotFound_title: 'Kaart Niet Gevonden',
+      cardOrActionAreDeleted: 'Kaart of actie zijn verwijderd',
+      color: 'Kleur',
+      createBoard_title: 'Bord Aanmaken',
+      createLabel_title: 'Label Aanmaken',
+      createNewOneOrSelectExistingOne: 'Maak een nieuwe aan of selecteer<br />een bestaande',
+      createProject_title: 'Project Aanmaken',
+      createTextFile_title: 'Tekstbestand Aanmaken',
+      currentPassword: 'Huidig wachtwoord',
+      dangerZone_title: 'Gevaarlijke Zone',
+      date: 'Datum',
+      dueDate_title: 'Vervaldatum',
+      deleteAttachment_title: 'Bijlage Verwijderen',
+      deleteBoard_title: 'Bord Verwijderen',
+      deleteCard_title: 'Kaart Verwijderen',
+      deleteComment_title: 'Opmerking Verwijderen',
+      deleteLabel_title: 'Label Verwijderen',
+      deleteList_title: 'Lijst Verwijderen',
+      deleteProject_title: 'Project Verwijderen',
+      deleteTask_title: 'Taak Verwijderen',
+      deleteUser_title: 'Gebruiker Verwijderen',
+      description: 'Beschrijving',
+      detectAutomatically: 'Automatisch detecteren',
+      dropFileToUpload: 'Sleep het bestand om te uploaden',
+      editor: 'Editor',
+      editAttachment_title: 'Bijlage Bewerken',
+      editAvatar_title: 'Avatar Bewerken',
+      editBoard_title: 'Bord Bewerken',
+      editDueDate_title: 'Vervaldatum Bewerken',
+      editEmail_title: 'E-mail Bewerken',
+      editInformation_title: 'Informatie Bewerken',
+      editLabel_title: 'Label Bewerken',
+      editPassword_title: 'Wachtwoord Bewerken',
+      editPermissions_title: 'Rechten Bewerken',
+      editStopwatch_title: 'Stopwatch Bewerken',
+      editUsername_title: 'Gebruikersnaam Bewerken',
+      email: 'E-mail',
+      emailAlreadyInUse: 'E-mail is al in gebruik',
+      enterCardTitle: 'Voer de kaarttitel in... [Ctrl+Enter] om automatisch te openen',
+      enterDescription: 'Voer beschrijving in...',
+      enterFilename: 'Voer bestandsnaam in',
+      enterListTitle: 'Voer de lijsttitel in...',
+      enterProjectTitle: 'Voer de projecttitel in',
+      enterTaskDescription: 'Voer taakbeschrijving in...',
+      filterByLabels_title: 'Filteren op Labels',
+      filterByMembers_title: 'Filteren op Leden',
+      fromComputer_title: 'Van Computer',
+      fromTrello: 'Van Trello',
+      general: 'Algemeen',
+      hours: 'Uren',
+      importBoard_title: 'Bord Importeren',
+      invalidCurrentPassword: 'Ongeldig huidig wachtwoord',
+      labels: 'Labels',
+      language: 'Taal',
+      leaveBoard_title: 'Bord Verlaten',
+      leaveProject_title: 'Project Verlaten',
+      list: 'Lijst',
+      listActions_title: 'Lijstacties',
+      managers: 'Managers',
+      members: 'Leden',
+      minutes: 'Minuten',
+      moveCard_title: 'Kaart Verplaatsen',
+      name: 'Naam',
+      newEmail: 'Nieuwe e-mail',
+      newPassword: 'Nieuw wachtwoord',
+      newUsername: 'Nieuwe gebruikersnaam',
+      noConnectionToServer: 'Geen verbinding met de server',
+      noBoards: 'Geen borden',
+      noLists: 'Geen lijsten',
+      noProjects: 'Geen projecten',
+      notifications: 'Meldingen',
+      noUnreadNotifications: 'Geen ongelezen meldingen',
+      openBoard_title: 'Bord Openen',
+      optional_inline: 'optioneel',
+      organization: 'Organisatie',
+      phone: 'Telefoon',
+      preferences: 'Voorkeuren',
+      pressPasteShortcutToAddAttachmentFromClipboard:
+        'Tip: druk op Ctrl-V (Cmd-V op Mac) om een bijlage van het klembord toe te voegen',
+      project: 'Project',
+      projectNotFound_title: 'Project Niet Gevonden',
+      removeManager_title: 'Manager Verwijderen',
+      removeMember_title: 'Lid Verwijderen',
+      searchLabels: 'Zoek labels...',
+      searchMembers: 'Zoek leden...',
+      searchUsers: 'Zoek gebruikers...',
+      seconds: 'Seconden',
+      selectBoard: 'Selecteer bord',
+      selectList: 'Selecteer lijst',
+      selectPermissions_title: 'Selecteer Rechten',
+      selectProject: 'Selecteer project',
+      settings: 'Instellingen',
+      stopwatch: 'Stopwatch',
+      subscribeToMyOwnCardsByDefault: 'Standaard abonneren op mijn eigen kaarten',
+      taskActions_title: 'Taakacties',
+      tasks: 'Taken',
+      thereIsNoPreviewAvailableForThisAttachment:
+        'Er is geen voorbeeld beschikbaar voor deze bijlage',
+      time: 'Tijd',
+      title: 'Titel',
+      userActions_title: 'Gebruikersacties',
+      userAddedThisCardToList: '<0>{{user}}</0><1> voegde deze kaart toe aan {{list}}</1>',
+      userLeftNewCommentToCard:
+        '{{user}} liet een nieuwe opmerking achter «{{comment}}» bij <2>{{card}}</2>',
+      userMovedCardFromListToList:
+        '{{user}} verplaatste <2>{{kaart}}</2> van {{fromList}} naar {{toList}}',
+      userMovedThisCardFromListToList:
+        '<0>{{user}}</0><1> verplaatste deze kaart van {{fromList}} naar {{toList}}</1>',
+      username: 'Gebruikersnaam',
+      usernameAlreadyInUse: 'Gebruikersnaam is al in gebruik',
+      users: 'Gebruikers',
+      version: 'Versie',
+      viewer: 'Viewer',
+      writeComment: 'Schrijf een opmerking...',
+    },
+
+    action: {
+      addAnotherCard: 'Voeg nog een kaart toe',
+      addAnotherList: 'Voeg nog een lijst toe',
+      addAnotherTask: 'Voeg nog een taak toe',
+      addCard: 'Kaart toevoegen',
+      addCard_title: 'Kaart Toevoegen',
+      addComment: 'Opmerking toevoegen',
+      addList: 'Lijst toevoegen',
+      addMember: 'Lid toevoegen',
+      addMoreDetailedDescription: 'Voeg een meer gedetailleerde beschrijving toe',
+      addTask: 'Taak toevoegen',
+      addToCard: 'Toevoegen aan kaart',
+      addUser: 'Gebruiker toevoegen',
+      createBoard: 'Bord aanmaken',
+      createFile: 'Bestand aanmaken',
+      createLabel: 'Label aanmaken',
+      createNewLabel: 'Nieuw label aanmaken',
+      createProject: 'Project aanmaken',
+      delete: 'Verwijderen',
+      deleteAttachment: 'Bijlage verwijderen',
+      deleteAvatar: 'Avatar verwijderen',
+      deleteBoard: 'Bord verwijderen',
+      deleteCard: 'Kaart verwijderen',
+      deleteCard_title: 'Kaart Verwijderen',
+      deleteComment: 'Opmerking verwijderen',
+      deleteImage: 'Afbeelding verwijderen',
+      deleteLabel: 'Label verwijderen',
+      deleteList: 'Lijst verwijderen',
+      deleteList_title: 'Lijst Verwijderen',
+      deleteProject: 'Project verwijderen',
+      deleteProject_title: 'Project Verwijderen',
+      deleteTask: 'Taak verwijderen',
+      deleteTask_title: 'Taak Verwijderen',
+      deleteUser: 'Gebruiker verwijderen',
+      edit: 'Bewerken',
+      editDueDate_title: 'Vervaldatum Bewerken',
+      editDescription_title: 'Beschrijving Bewerken',
+      editEmail_title: 'E-mail Bewerken',
+      editInformation_title: 'Informatie Bewerken',
+      editPassword_title: 'Wachtwoord Bewerken',
+      editPermissions: 'Rechten Bewerken',
+      editStopwatch_title: 'Stopwatch Bewerken',
+      editTitle_title: 'Titel Bewerken',
+      editUsername_title: 'Gebruikersnaam Bewerken',
+      hideDetails: 'Details verbergen',
+      import: 'Importeren',
+      leaveBoard: 'Bord verlaten',
+      leaveProject: 'Project verlaten',
+      logOut_title: 'Uitloggen',
+      makeCover_title: 'Maak Omslag',
+      move: 'Verplaatsen',
+      moveCard_title: 'Kaart Verplaatsen',
+      remove: 'Verwijderen',
+      removeBackground: 'Achtergrond verwijderen',
+      removeCover_title: 'Omslag Verwijderen',
+      removeFromBoard: 'Verwijderen van bord',
+      removeFromProject: 'Verwijderen van project',
+      removeManager: 'Manager verwijderen',
+      removeMember: 'Lid verwijderen',
+      save: 'Opslaan',
+      showAllAttachments: 'Toon alle bijlagen ({{hidden}} verborgen)',
+      showDetails: 'Details weergeven',
+      showFewerAttachments: 'Toon minder bijlagen',
+      start: 'Start',
+      stop: 'Stop',
+      subscribe: 'Abonneren',
+      unsubscribe: 'Afmelden',
+      uploadNewAvatar: 'Nieuwe avatar uploaden',
+      uploadNewImage: 'Nieuwe afbeelding uploaden',
+    },
+  },
+};

client/src/locales/nl/index.js

@@ -0,0 +1,11 @@
+import merge from 'lodash/merge';
+
+import login from './login';
+import core from './core';
+
+export default {
+  language: 'nl',
+  country: 'nl',
+  name: 'Dutch',
+  embeddedLocale: merge(login, core),
+};

client/src/locales/nl/login.js

@@ -0,0 +1,20 @@
+export default {
+  translation: {
+    common: {
+      emailOrUsername: 'E-mail of gebruikersnaam',
+      invalidEmailOrUsername: 'Ongeldige e-mail of gebruikersnaam',
+      invalidPassword: 'Ongeldig wachtwoord',
+      logInToPlanka: 'Inloggen op Planka',
+      noInternetConnection: 'Geen internetverbinding',
+      pageNotFound_title: 'Pagina Niet Gevonden',
+      password: 'Wachtwoord',
+      projectManagement: 'Projectbeheer',
+      serverConnectionFailed: 'Verbinding met server mislukt',
+      unknownError: 'Onbekende fout, probeer het later opnieuw',
+    },
+
+    action: {
+      logIn: 'Inloggen',
+    },
+  },
+};

client/src/models/User.js

@@ -43,13 +43,16 @@ export default class extends BaseModel {
     organization: attr(),
     language: attr(),
     subscribeToOwnCards: attr(),
-    isAdmin: attr(),
-    isLocked: attr(),
-    isLockedAdmin: attr(),
-    deletedAt: attr(),
     createdAt: attr({
       getDefault: () => new Date(),
     }),
+    deletedAt: attr(),
+    isAdmin: attr({
+      getDefault: () => false,
+    }),
+    isLocked: attr({
+      getDefault: () => false,
+    }),
     isAvatarUpdating: attr({
       getDefault: () => false,
     }),

client/src/reducers/auth.js

@@ -10,7 +10,6 @@ const initialState = {
 export default (state = initialState, { type, payload }) => {
   switch (type) {
     case ActionTypes.AUTHENTICATE__SUCCESS:
-    case ActionTypes.WITH_OIDC_AUTHENTICATE__SUCCESS:
       return {
         ...state,
         accessToken: payload.accessToken,

client/src/reducers/core.js

@@ -4,6 +4,7 @@ import ActionTypes from '../constants/ActionTypes';
 import ModalTypes from '../constants/ModalTypes';
 
 const initialState = {
+  isInitializing: true,
   isLogouting: false,
   currentModal: null,
 };
@@ -17,6 +18,11 @@ export default (state = initialState, { type, payload }) => {
         ...state,
         currentModal: null,
       };
+    case ActionTypes.CORE_INITIALIZE:
+      return {
+        ...state,
+        isInitializing: false,
+      };
     case ActionTypes.LOGOUT__ACCESS_TOKEN_INVALIDATE:
       return {
         ...state,

client/src/reducers/index.js

@@ -3,7 +3,6 @@ import { combineReducers } from 'redux';
 import router from './router';
 import socket from './socket';
 import orm from './orm';
-import root from './root';
 import auth from './auth';
 import core from './core';
 import ui from './ui';
@@ -12,7 +11,6 @@ export default combineReducers({
   router,
   socket,
   orm,
-  root,
   auth,
   core,
   ui,

client/src/reducers/root.js

@@ -1,34 +0,0 @@
-import ActionTypes from '../constants/ActionTypes';
-
-const initialState = {
-  isInitializing: true,
-  config: null,
-};
-
-// eslint-disable-next-line default-param-last
-export default (state = initialState, { type, payload }) => {
-  switch (type) {
-    case ActionTypes.LOGIN_INITIALIZE:
-      return {
-        ...state,
-        isInitializing: false,
-        config: payload.config,
-      };
-    case ActionTypes.AUTHENTICATE__SUCCESS:
-    case ActionTypes.WITH_OIDC_AUTHENTICATE__SUCCESS:
-      return {
-        ...state,
-        isInitializing: true,
-      };
-    case ActionTypes.CORE_INITIALIZE:
-      return {
-        ...state,
-        isInitializing: false,
-        ...(payload.config && {
-          config: payload.config,
-        }),
-      };
-    default:
-      return state;
-  }
-};

client/src/reducers/ui/authenticate-form.js

@@ -1,7 +1,4 @@
-import { LOCATION_CHANGE_HANDLE } from '../../lib/redux-router';
-
 import ActionTypes from '../../constants/ActionTypes';
-import Paths from '../../constants/Paths';
 
 const initialState = {
   data: {
@@ -9,22 +6,12 @@ const initialState = {
     password: '',
   },
   isSubmitting: false,
-  isSubmittingWithOidc: false,
   error: null,
 };
 
 // eslint-disable-next-line default-param-last
 export default (state = initialState, { type, payload }) => {
   switch (type) {
-    case LOCATION_CHANGE_HANDLE:
-      if (payload.location.pathname === Paths.OIDC_CALLBACK) {
-        return {
-          ...state,
-          isSubmittingWithOidc: true,
-        };
-      }
-
-      return state;
     case ActionTypes.AUTHENTICATE:
       return {
         ...state,
@@ -35,7 +22,6 @@ export default (state = initialState, { type, payload }) => {
         isSubmitting: true,
       };
     case ActionTypes.AUTHENTICATE__SUCCESS:
-    case ActionTypes.WITH_OIDC_AUTHENTICATE__SUCCESS:
       return initialState;
     case ActionTypes.AUTHENTICATE__FAILURE:
       return {
@@ -43,12 +29,6 @@ export default (state = initialState, { type, payload }) => {
         isSubmitting: false,
         error: payload.error,
       };
-    case ActionTypes.WITH_OIDC_AUTHENTICATE__FAILURE:
-      return {
-        ...state,
-        isSubmittingWithOidc: false,
-        error: payload.error,
-      };
     case ActionTypes.AUTHENTICATE_ERROR_CLEAR:
       return {
         ...state,

client/src/sagas/core/services/core.js

@@ -1,22 +1,13 @@
-import { apply, call, put, select, take } from 'redux-saga/effects';
+import { call, put, take } from 'redux-saga/effects';
 
 import request from '../request';
 import requests from '../requests';
-import selectors from '../../../selectors';
 import actions from '../../../actions';
 import api from '../../../api';
 import i18n from '../../../i18n';
-import { createOidcManager } from '../../../utils/oidc-manager';
 import { removeAccessToken } from '../../../utils/access-token-storage';
 
 export function* initializeCore() {
-  const currentConfig = yield select(selectors.selectConfig); // TODO: add boolean selector?
-
-  let config;
-  if (!currentConfig) {
-    ({ item: config } = yield call(api.getConfig)); // TODO: handle error
-  }
-
   const {
     user,
     board,
@@ -41,7 +32,6 @@ export function* initializeCore() {
 
   yield put(
     actions.initializeCore(
-      config,
       user,
       board,
       users,
@@ -84,16 +74,6 @@ export function* logout(invalidateAccessToken = true) {
     } catch (error) {} // eslint-disable-line no-empty
   }
 
-  const oidcConfig = yield select(selectors.selectOidcConfig);
-
-  if (oidcConfig) {
-    const oidcManager = createOidcManager(oidcConfig);
-
-    try {
-      yield apply(oidcManager, oidcManager.logout);
-    } catch (error) {} // eslint-disable-line no-empty
-  }
-
   yield put(actions.logout());
   yield take();
 }

client/src/sagas/core/services/router.js

@@ -33,16 +33,15 @@ export function* handleLocationChange() {
 
   switch (pathsMatch.pattern.path) {
     case Paths.LOGIN:
-    case Paths.OIDC_CALLBACK:
       yield call(goToRoot);
 
-      return;
+      break;
     default:
   }
 
-  const isInitializing = yield select(selectors.selectIsInitializing);
+  const isCoreInitializing = yield select(selectors.selectIsCoreInitializing);
 
-  if (isInitializing) {
+  if (isCoreInitializing) {
     yield take(ActionTypes.CORE_INITIALIZE);
   }
 

client/src/sagas/core/watchers/core.js

@@ -4,5 +4,8 @@ import services from '../services';
 import EntryActionTypes from '../../../constants/EntryActionTypes';
 
 export default function* coreWatchers() {
-  yield all([takeEvery(EntryActionTypes.LOGOUT, () => services.logout())]);
+  yield all([
+    takeEvery(EntryActionTypes.CORE_INITIALIZE, () => services.initializeCore()),
+    takeEvery(EntryActionTypes.LOGOUT, () => services.logout()),
+  ]);
 }

client/src/sagas/login/index.js

@@ -7,9 +7,7 @@ import ActionTypes from '../../constants/ActionTypes';
 export default function* loginSaga() {
   const watcherTasks = yield all(watchers.map((watcher) => fork(watcher)));
 
-  yield fork(services.initializeLogin);
-
-  yield take([ActionTypes.AUTHENTICATE__SUCCESS, ActionTypes.WITH_OIDC_AUTHENTICATE__SUCCESS]);
+  yield take(ActionTypes.AUTHENTICATE__SUCCESS);
 
   yield cancel(watcherTasks);
   yield call(services.goToRoot);

client/src/sagas/login/services/login.js

@@ -1,25 +1,19 @@
-import { apply, call, put, select } from 'redux-saga/effects';
-import { replace } from '../../../lib/redux-router';
+import { call, put } from 'redux-saga/effects';
 
-import selectors from '../../../selectors';
 import actions from '../../../actions';
 import api from '../../../api';
-import { createOidcManager } from '../../../utils/oidc-manager';
 import { setAccessToken } from '../../../utils/access-token-storage';
-import Paths from '../../../constants/Paths';
-
-export function* initializeLogin() {
-  const { item: config } = yield call(api.getConfig); // TODO: handle error
-
-  yield put(actions.initializeLogin(config));
-}
 
 export function* authenticate(data) {
   yield put(actions.authenticate(data));
 
-  let accessToken;
+  let accessToken = data.access_token;
   try {
-    ({ item: accessToken } = yield call(api.createAccessToken, data));
+    if (accessToken) {
+      ({ item: accessToken } = yield call(api.exchangeOidcToken, accessToken));
+    } else {
+      ({ item: accessToken } = yield call(api.createAccessToken, data));
+    }
   } catch (error) {
     yield put(actions.authenticate.failure(error));
     return;
@@ -29,50 +23,11 @@ export function* authenticate(data) {
   yield put(actions.authenticate.success(accessToken));
 }
 
-export function* authenticateWithOidc() {
-  const oidcConfig = yield select(selectors.selectOidcConfig);
-  const oidcManager = createOidcManager(oidcConfig);
-
-  yield apply(oidcManager, oidcManager.login);
-}
-
-export function* authenticateWithOidcCallback() {
-  const oidcConfig = yield select(selectors.selectOidcConfig);
-  const oidcManager = createOidcManager(oidcConfig);
-
-  let oidcToken;
-  try {
-    ({ access_token: oidcToken } = yield apply(oidcManager, oidcManager.loginCallback));
-  } catch (error) {
-    yield put(actions.authenticateWithOidc.failure(error));
-  }
-
-  yield put(replace(Paths.LOGIN));
-
-  if (oidcToken) {
-    let accessToken;
-    try {
-      ({ item: accessToken } = yield call(api.exchangeToAccessToken, {
-        token: oidcToken,
-      }));
-    } catch (error) {
-      yield put(actions.authenticateWithOidc.failure(error));
-      return;
-    }
-
-    yield call(setAccessToken, accessToken);
-    yield put(actions.authenticateWithOidc.success(accessToken));
-  }
-}
-
 export function* clearAuthenticateError() {
   yield put(actions.clearAuthenticateError());
 }
 
 export default {
-  initializeLogin,
   authenticate,
-  authenticateWithOidc,
-  authenticateWithOidcCallback,
   clearAuthenticateError,
 };

client/src/sagas/login/services/router.js

@@ -1,9 +1,7 @@
-import { call, put, select, take } from 'redux-saga/effects';
+import { call, put, select } from 'redux-saga/effects';
 import { push } from '../../../lib/redux-router';
 
-import { authenticateWithOidcCallback } from './login';
 import selectors from '../../../selectors';
-import ActionTypes from '../../../constants/ActionTypes';
 import Paths from '../../../constants/Paths';
 
 export function* goToLogin() {
@@ -29,19 +27,6 @@ export function* handleLocationChange() {
       yield call(goToLogin);
 
       break;
-    case Paths.OIDC_CALLBACK: {
-      const isInitializing = yield select(selectors.selectIsInitializing);
-
-      if (isInitializing) {
-        yield take(ActionTypes.LOGIN_INITIALIZE);
-      }
-
-      // TODO: check if OIDC is enabled
-
-      yield call(authenticateWithOidcCallback);
-
-      break;
-    }
     default:
   }
 }

client/src/sagas/login/watchers/login.js

@@ -8,7 +8,6 @@ export default function* loginWatchers() {
     takeEvery(EntryActionTypes.AUTHENTICATE, ({ payload: { data } }) =>
       services.authenticate(data),
     ),
-    takeEvery(EntryActionTypes.WITH_OIDC_AUTHENTICATE, () => services.authenticateWithOidc()),
     takeEvery(EntryActionTypes.AUTHENTICATE_ERROR_CLEAR, () => services.clearAuthenticateError()),
   ]);
 }

client/src/selectors/core.js

@@ -6,6 +6,8 @@ import Config from '../constants/Config';
 
 export const selectAccessToken = ({ auth: { accessToken } }) => accessToken;
 
+export const selectIsCoreInitializing = ({ core: { isInitializing } }) => isInitializing;
+
 export const selectIsLogouting = ({ core: { isLogouting } }) => isLogouting;
 
 const nextPosition = (items, index, excludedId) => {
@@ -113,6 +115,7 @@ export const selectNextTaskPosition = createSelector(
 
 export default {
   selectAccessToken,
+  selectIsCoreInitializing,
   selectIsLogouting,
   selectNextBoardPosition,
   selectNextLabelPosition,

client/src/selectors/index.js

@@ -1,6 +1,5 @@
 import router from './router';
 import socket from './socket';
-import root from './root';
 import core from './core';
 import modals from './modals';
 import users from './users';
@@ -17,7 +16,6 @@ import attachments from './attachments';
 export default {
   ...router,
   ...socket,
-  ...root,
   ...core,
   ...modals,
   ...users,

client/src/selectors/root.js

@@ -1,11 +0,0 @@
-export const selectIsInitializing = ({ root: { isInitializing } }) => isInitializing;
-
-export const selectConfig = ({ root: { config } }) => config;
-
-export const selectOidcConfig = (state) => selectConfig(state).oidc;
-
-export default {
-  selectIsInitializing,
-  selectConfig,
-  selectOidcConfig,
-};

client/src/utils/oidc-manager.js

@@ -1,27 +0,0 @@
-import { UserManager } from 'oidc-client-ts';
-
-export default class OidcManager {
-  constructor(config) {
-    this.userManager = new UserManager({
-      ...config,
-      authority: config.issuer,
-      client_id: config.clientId,
-      redirect_uri: config.redirectUri,
-      scope: config.scopes,
-    });
-  }
-
-  login() {
-    return this.userManager.signinRedirect();
-  }
-
-  loginCallback() {
-    return this.userManager.signinRedirectCallback();
-  }
-
-  logout() {
-    return this.userManager.signoutSilent();
-  }
-}
-
-export const createOidcManager = (config) => new OidcManager(config);

docker-compose.yml

@@ -37,16 +37,6 @@ services:
 
       # Configure knex to accept SSL certificates
       # - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
-
-      # - OIDC_ISSUER=
-      # - OIDC_CLIENT_ID=
-      # - OIDC_REDIRECT_URI=http://localhost:3000/oidc-callback
-      # - OIDC_SCOPES=openid email profile
-      # - OIDC_JWKS_URI=
-      # - OIDC_AUDIENCE=
-      # - OIDC_ADMIN_ROLES=admin
-      # - OIDC_ROLES_ATTRIBUTE=groups
-      # - OIDC_SKIP_USER_INFO=true
     depends_on:
       - postgres
 

package-lock.json

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

package.json

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

server/.env.sample

@@ -24,16 +24,6 @@ DEFAULT_ADMIN_USERNAME=demo
 # Configure knex to accept SSL certificates
 # KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
 
-# OIDC_ISSUER=
-# OIDC_CLIENT_ID=
-# OIDC_REDIRECT_URI=http://localhost:1337/oidc-callback
-# OIDC_SCOPES=openid email profile
-# OIDC_JWKS_URI=
-# OIDC_AUDIENCE=
-# OIDC_ADMIN_ROLES=admin
-# OIDC_ROLES_ATTRIBUTE=groups
-# OIDC_SKIP_USER_INFO=true
-
 ## Do not edit this
 
 TZ=UTC

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

@@ -10,9 +10,6 @@ const Errors = {
   INVALID_PASSWORD: {
     invalidPassword: 'Invalid password',
   },
-  USE_SINGLE_SIGN_ON: {
-    useSingleSignOn: 'Use single sign-on',
-  },
 };
 
 const emailOrUsernameValidator = (value) =>
@@ -40,9 +37,6 @@ module.exports = {
     invalidPassword: {
       responseType: 'unauthorized',
     },
-    useSingleSignOn: {
-      responseType: 'forbidden',
-    },
   },
 
   async fn(inputs) {
@@ -57,10 +51,6 @@ module.exports = {
       throw Errors.INVALID_EMAIL_OR_USERNAME;
     }
 
-    if (user.isSso) {
-      throw Errors.USE_SINGLE_SIGN_ON;
-    }
-
     if (!bcrypt.compareSync(inputs.password, user.password)) {
       sails.log.warn(`Invalid password! (IP: ${remoteAddress})`);
       throw Errors.INVALID_PASSWORD;

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

@@ -1,20 +1,88 @@
+const jwt = require('jsonwebtoken');
+const jwksClient = require('jwks-rsa');
+const openidClient = require('openid-client');
 const { getRemoteAddress } = require('../../../utils/remoteAddress');
 
 const Errors = {
   INVALID_TOKEN: {
-    invalidToken: 'Invalid token',
-  },
-  EMAIL_ALREADY_IN_USE: {
-    emailAlreadyInUse: 'Email already in use',
-  },
-  USERNAME_ALREADY_IN_USE: {
-    usernameAlreadyInUse: 'Username already in use',
+    invalidToken: 'Access Token is invalid',
   },
   MISSING_VALUES: {
-    missingValues: 'Unable to retrieve required values (email, name)',
+    missingValues:
+      'Unable to retrieve required values. Verify the access token or UserInfo endpoint has email, username and name claims',
   },
 };
 
+const jwks = jwksClient({
+  jwksUri: sails.config.custom.oidcJwksUri,
+  requestHeaders: {}, // Optional
+  timeout: 30000, // Defaults to 30s
+});
+
+const getJwtVerificationOptions = () => {
+  const options = {};
+  if (sails.config.custom.oidcIssuer) {
+    options.issuer = sails.config.custom.oidcIssuer;
+  }
+  if (sails.config.custom.oidcAudience) {
+    options.audience = sails.config.custom.oidcAudience;
+  }
+  return options;
+};
+
+const validateAndDecodeToken = async (accessToken, options) => {
+  const keys = await jwks.getSigningKeys();
+  let validToken = {};
+
+  const isTokenValid = keys.some((signingKey) => {
+    try {
+      const key = signingKey.getPublicKey();
+      validToken = jwt.verify(accessToken, key, options);
+      return 'true';
+    } catch (error) {
+      sails.log.error(error);
+    }
+    return false;
+  });
+
+  if (!isTokenValid) {
+    const tokenForLogging = jwt.decode(accessToken);
+    const remoteAddress = getRemoteAddress(this.req);
+
+    sails.log.warn(
+      `invalid token: sub: "${tokenForLogging.sub}" issuer: "${tokenForLogging.iss}" audience: "${tokenForLogging.aud}" exp: ${tokenForLogging.exp} (IP: ${remoteAddress})`,
+    );
+    throw Errors.INVALID_TOKEN;
+  }
+  return validToken;
+};
+
+const getUserInfo = async (accessToken, options) => {
+  if (sails.config.custom.oidcSkipUserInfo) {
+    return {};
+  }
+  const issuer = await openidClient.Issuer.discover(options.issuer);
+  const oidcClient = new issuer.Client({
+    client_id: 'irrelevant',
+  });
+  const userInfo = await oidcClient.userinfo(accessToken);
+  return userInfo;
+};
+const mergeUserData = (validToken, userInfo) => {
+  const oidcUser = { ...validToken, ...userInfo };
+  return oidcUser;
+};
+const getOrCreateUser = async (newUser) => {
+  const user = await User.findOne({
+    where: {
+      username: newUser.username,
+    },
+  });
+  if (user) {
+    return user;
+  }
+  return User.create(newUser).fetch();
+};
 module.exports = {
   inputs: {
     token: {
@@ -27,41 +95,83 @@ module.exports = {
     invalidToken: {
       responseType: 'unauthorized',
     },
-    emailAlreadyInUse: {
-      responseType: 'conflict',
-    },
-    usernameAlreadyInUse: {
-      responseType: 'conflict',
-    },
     missingValues: {
-      responseType: 'unprocessableEntity',
+      responseType: 'unauthorized',
     },
   },
 
   async fn(inputs) {
+    const options = getJwtVerificationOptions();
+    const validToken = await validateAndDecodeToken(inputs.token, options);
+    const userInfo = await getUserInfo(inputs.token, options);
+    const oidcUser = mergeUserData(validToken, userInfo);
+
+    const now = new Date();
+    let isAdmin = false;
+    if (sails.config.custom.oidcAdminRoles.includes('*')) isAdmin = true;
+    else if (Array.isArray(oidcUser[sails.config.custom.oidcRolesAttribute])) {
+      const userRoles = new Set(oidcUser[sails.config.custom.oidcRolesAttribute]);
+      isAdmin = sails.config.custom.oidcAdminRoles.findIndex((role) => userRoles.has(role)) > -1;
+    }
+
+    const newUser = {
+      email: oidcUser.email,
+      isAdmin,
+      name: oidcUser.name,
+      username: oidcUser.preferred_username,
+      subscribeToOwnCards: false,
+      createdAt: now,
+      updatedAt: now,
+      locked: true,
+    };
+
+    if (!newUser.email || !newUser.username || !newUser.name) {
+      sails.log.error(Errors.MISSING_VALUES.missingValues);
+      throw Errors.MISSING_VALUES;
+    }
+
+    const identityProviderUser = await IdentityProviderUser.findOne({
+      where: {
+        issuer: oidcUser.iss,
+        sub: oidcUser.sub,
+      },
+    }).populate('userId');
+
+    let user = identityProviderUser ? identityProviderUser.userId : {};
+    if (!identityProviderUser) {
+      user = await getOrCreateUser(newUser);
+      await IdentityProviderUser.create({
+        issuer: oidcUser.iss,
+        sub: oidcUser.sub,
+        userId: user.id,
+      });
+    }
+
+    const controlledFields = ['email', 'password', 'isAdmin', 'name', 'username'];
+    const updateFields = {};
+    controlledFields.forEach((field) => {
+      if (user[field] !== newUser[field]) {
+        updateFields[field] = newUser[field];
+      }
+    });
+
+    if (Object.keys(updateFields).length > 0) {
+      updateFields.updatedAt = now;
+      await User.updateOne({ id: user.id }).set(updateFields);
+    }
+
+    const plankaToken = sails.helpers.utils.createToken(user.id);
+
     const remoteAddress = getRemoteAddress(this.req);
-
-    const user = await sails.helpers.users
-      .getOrCreateOneByOidcToken(inputs.token)
-      .intercept('invalidToken', () => {
-        sails.log.warn(`Invalid token! (IP: ${remoteAddress})`);
-        return Errors.INVALID_TOKEN;
-      })
-      .intercept('emailAlreadyInUse', () => Errors.EMAIL_ALREADY_IN_USE)
-      .intercept('usernameAlreadyInUse', () => Errors.USERNAME_ALREADY_IN_USE)
-      .intercept('missingValues', () => Errors.MISSING_VALUES);
-
-    const accessToken = sails.helpers.utils.createToken(user.id);
-
     await Session.create({
-      accessToken,
+      accessToken: plankaToken,
       remoteAddress,
       userId: user.id,
       userAgent: this.req.headers['user-agent'],
     });
 
     return {
-      item: accessToken,
+      item: plankaToken,
     };
   },
 };

server/api/controllers/appconfig/index.js

@@ -0,0 +1,11 @@
+module.exports = {
+  async fn() {
+    const config = {
+      authority: sails.config.custom.oidcIssuer,
+      clientId: sails.config.custom.oidcClientId,
+      redirectUri: sails.config.custom.oidcredirectUri,
+      scopes: sails.config.custom.oidcScopes,
+    };
+    return config;
+  },
+};

server/api/controllers/show-config.js

@@ -1,16 +0,0 @@
-module.exports = {
-  fn() {
-    return {
-      item: {
-        oidc: sails.config.custom.oidcIssuer
-          ? {
-              issuer: sails.config.custom.oidcIssuer,
-              clientId: sails.config.custom.oidcClientId,
-              redirectUri: sails.config.custom.oidcRedirectUri,
-              scopes: sails.config.custom.oidcScopes,
-            }
-          : null,
-      },
-    };
-  },
-};

server/api/controllers/users/delete.js

@@ -1,7 +1,4 @@
 const Errors = {
-  NOT_ENOUGH_RIGHTS: {
-    notEnoughRights: 'Not enough rights',
-  },
   USER_NOT_FOUND: {
     userNotFound: 'User not found',
   },
@@ -17,9 +14,6 @@ module.exports = {
   },
 
   exits: {
-    notEnoughRights: {
-      responseType: 'forbidden',
-    },
     userNotFound: {
       responseType: 'notFound',
     },
@@ -33,7 +27,7 @@ module.exports = {
     }
 
     if (user.email === sails.config.custom.defaultAdminEmail) {
-      throw Errors.NOT_ENOUGH_RIGHTS;
+      throw Errors.USER_NOT_FOUND; // Forbidden
     }
 
     user = await sails.helpers.users.deleteOne.with({

server/api/controllers/users/update-email.js

@@ -1,9 +1,6 @@
 const bcrypt = require('bcrypt');
 
 const Errors = {
-  NOT_ENOUGH_RIGHTS: {
-    notEnoughRights: 'Not enough rights',
-  },
   USER_NOT_FOUND: {
     userNotFound: 'User not found',
   },
@@ -34,9 +31,6 @@ module.exports = {
   },
 
   exits: {
-    notEnoughRights: {
-      responseType: 'forbidden',
-    },
     userNotFound: {
       responseType: 'notFound',
     },
@@ -65,8 +59,8 @@ module.exports = {
       throw Errors.USER_NOT_FOUND;
     }
 
-    if (user.email === sails.config.custom.defaultAdminEmail || user.isSso) {
-      throw Errors.NOT_ENOUGH_RIGHTS;
+    if (user.email === sails.config.custom.defaultAdminEmail) {
+      throw Errors.USER_NOT_FOUND; // Forbidden
     }
 
     if (

server/api/controllers/users/update-password.js

@@ -4,9 +4,6 @@ const zxcvbn = require('zxcvbn');
 const { getRemoteAddress } = require('../../../utils/remoteAddress');
 
 const Errors = {
-  NOT_ENOUGH_RIGHTS: {
-    notEnoughRights: 'Not enough rights',
-  },
   USER_NOT_FOUND: {
     userNotFound: 'User not found',
   },
@@ -36,9 +33,6 @@ module.exports = {
   },
 
   exits: {
-    notEnoughRights: {
-      responseType: 'forbidden',
-    },
     userNotFound: {
       responseType: 'notFound',
     },
@@ -64,8 +58,8 @@ module.exports = {
       throw Errors.USER_NOT_FOUND;
     }
 
-    if (user.email === sails.config.custom.defaultAdminEmail || user.isSso) {
-      throw Errors.NOT_ENOUGH_RIGHTS;
+    if (user.email === sails.config.custom.defaultAdminEmail) {
+      throw Errors.USER_NOT_FOUND; // Forbidden
     }
 
     if (

server/api/controllers/users/update-username.js

@@ -1,9 +1,6 @@
 const bcrypt = require('bcrypt');
 
 const Errors = {
-  NOT_ENOUGH_RIGHTS: {
-    notEnoughRights: 'Not enough rights',
-  },
   USER_NOT_FOUND: {
     userNotFound: 'User not found',
   },
@@ -36,9 +33,6 @@ module.exports = {
   },
 
   exits: {
-    notEnoughRights: {
-      responseType: 'forbidden',
-    },
     userNotFound: {
       responseType: 'notFound',
     },
@@ -67,8 +61,8 @@ module.exports = {
       throw Errors.USER_NOT_FOUND;
     }
 
-    if (user.email === sails.config.custom.defaultAdminEmail || user.isSso) {
-      throw Errors.NOT_ENOUGH_RIGHTS;
+    if (user.email === sails.config.custom.defaultAdminEmail) {
+      throw Errors.USER_NOT_FOUND; // Forbidden
     }
 
     if (

server/api/controllers/users/update.js

@@ -72,8 +72,6 @@ module.exports = {
       delete inputs.isAdmin;
       delete inputs.name;
       /* eslint-enable no-param-reassign */
-    } else if (user.isSso) {
-      delete inputs.name; // eslint-disable-line no-param-reassign
     }
 
     const values = {

server/api/helpers/users/create-one.js

@@ -9,7 +9,7 @@ const valuesValidator = (value) => {
     return false;
   }
 
-  if (!_.isNil(value.password) && !_.isString(value.password)) {
+  if (!_.isString(value.password)) {
     return false;
   }
 
@@ -40,10 +40,6 @@ module.exports = {
   async fn(inputs) {
     const { values } = inputs;
 
-    if (values.password) {
-      values.password = bcrypt.hashSync(values.password, 10);
-    }
-
     if (values.username) {
       values.username = values.username.toLowerCase();
     }
@@ -51,6 +47,7 @@ module.exports = {
     const user = await User.create({
       ...values,
       email: values.email.toLowerCase(),
+      password: bcrypt.hashSync(values.password, 10),
     })
       .intercept(
         {

server/api/helpers/users/delete-one.js

@@ -10,10 +10,6 @@ module.exports = {
   },
 
   async fn(inputs) {
-    await IdentityProviderUser.destroy({
-      userId: inputs.record.id,
-    });
-
     await ProjectManager.destroy({
       userId: inputs.record.id,
     });

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

@@ -1,159 +0,0 @@
-const jwt = require('jsonwebtoken');
-const jwksClient = require('jwks-rsa');
-const openidClient = require('openid-client');
-
-const jwks = jwksClient({
-  jwksUri: sails.config.custom.oidcJwksUri,
-});
-
-const verifyOidcToken = async (oidcToken) => {
-  const signingKeys = await jwks.getSigningKeys();
-
-  const options = {
-    issuer: sails.config.custom.oidcIssuer,
-  };
-
-  if (sails.config.custom.oidcAudience) {
-    options.audience = sails.config.custom.oidcAudience;
-  }
-
-  let payload = null;
-  signingKeys.some((signingKey) => {
-    try {
-      const publicKey = signingKey.getPublicKey();
-      payload = jwt.verify(oidcToken, publicKey, options);
-    } catch (error) {
-      sails.log.error(error);
-    }
-
-    return !!payload;
-  });
-
-  return payload;
-};
-
-const getUserInfo = async (oidcToken) => {
-  const issuer = await openidClient.Issuer.discover(sails.config.custom.oidcIssuer);
-
-  const client = new issuer.Client({
-    client_id: 'irrelevant',
-  });
-
-  return client.userinfo(oidcToken);
-};
-
-module.exports = {
-  inputs: {
-    token: {
-      type: 'string',
-      required: true,
-    },
-  },
-
-  exits: {
-    invalidToken: {},
-    missingValues: {},
-    emailAlreadyInUse: {},
-    usernameAlreadyInUse: {},
-  },
-
-  async fn(inputs) {
-    const oidcUser = await verifyOidcToken(inputs.token);
-
-    if (!oidcUser) {
-      throw 'invalidToken';
-    }
-
-    if (!sails.config.custom.oidcSkipUserInfo) {
-      const userInfo = await getUserInfo(inputs.token);
-      Object.assign(oidcUser, userInfo);
-    }
-
-    if (!oidcUser.email || !oidcUser.name) {
-      throw 'missingValues';
-    }
-
-    let isAdmin = false;
-    if (sails.config.custom.oidcAdminRoles.includes('*')) {
-      isAdmin = true;
-    } else {
-      const roles = oidcUser[sails.config.custom.oidcRolesAttribute];
-
-      if (Array.isArray(roles)) {
-        isAdmin = sails.config.custom.oidcAdminRoles.some((role) => roles.includes(role));
-      }
-    }
-
-    const values = {
-      isAdmin,
-      email: oidcUser.email,
-      isSso: true,
-      name: oidcUser.name,
-      username: oidcUser.preferred_username,
-      subscribeToOwnCards: false,
-    };
-
-    let user;
-    /* eslint-disable no-constant-condition, no-await-in-loop */
-    while (true) {
-      let identityProviderUser = await IdentityProviderUser.findOne({
-        issuer: oidcUser.iss,
-        sub: oidcUser.sub,
-      });
-
-      if (identityProviderUser) {
-        user = await sails.helpers.users.getOne(identityProviderUser.userId);
-      } else {
-        while (true) {
-          user = await sails.helpers.users.getOne({
-            email: values.email,
-          });
-
-          if (!user) {
-            user = await sails.helpers.users
-              .createOne(values)
-              .tolerate('emailAlreadyInUse')
-              .intercept('usernameAlreadyInUse', 'usernameAlreadyInUse');
-          }
-
-          if (user) {
-            break;
-          }
-        }
-
-        identityProviderUser = await IdentityProviderUser.create({
-          userId: user.id,
-          issuer: oidcUser.iss,
-          sub: oidcUser.sub,
-        }).tolerate('E_UNIQUE');
-      }
-
-      if (identityProviderUser) {
-        break;
-      }
-    }
-    /* eslint-enable no-constant-condition, no-await-in-loop */
-
-    const updateFieldKeys = ['email', 'isAdmin', 'isSso', 'name', 'username'];
-
-    const updateValues = updateFieldKeys.reduce((result, fieldKey) => {
-      if (values[fieldKey] === user[fieldKey]) {
-        return result;
-      }
-
-      return {
-        ...result,
-        [fieldKey]: values[fieldKey],
-      };
-    }, {});
-
-    if (Object.keys(updateValues).length > 0) {
-      user = await sails.helpers.users
-        .updateOne(user, updateValues, {}) // FIXME: hack for last parameter
-        .intercept('emailAlreadyInUse', 'emailAlreadyInUse')
-        .intercept('usernameAlreadyInUse', 'usernameAlreadyInUse');
-    }
-
-    return user;
-  },
-};

server/api/models/User.js

@@ -24,11 +24,6 @@ module.exports = {
       defaultsTo: false,
       columnName: 'is_admin',
     },
-    isSso: {
-      type: 'boolean',
-      defaultsTo: false,
-      columnName: 'is_sso',
-    },
     name: {
       type: 'string',
       required: true,
@@ -72,6 +67,10 @@ module.exports = {
       type: 'ref',
       columnName: 'password_changed_at',
     },
+    locked: {
+      type: 'boolean',
+      columnName: 'locked',
+    },
 
     //  ╔═╗╔╦╗╔╗ ╔═╗╔╦╗╔═╗
     //  ║╣ ║║║╠╩╗║╣  ║║╚═╗
@@ -110,15 +109,12 @@ module.exports = {
   tableName: 'user_account',
 
   customToJSON() {
-    const isLockedAdmin = this.email === sails.config.custom.defaultAdminEmail;
-
     return {
-      ..._.omit(this, ['password', 'isSso', 'avatar', 'passwordChangedAt']),
-      isLockedAdmin,
-      isLocked: this.isSso || isLockedAdmin,
+      ..._.omit(this, ['password', 'avatar', 'passwordChangedAt']),
       avatarUrl:
         this.avatar &&
         `${sails.config.custom.userAvatarsUrl}/${this.avatar.dirname}/square-100.${this.avatar.extension}`,
+      isLocked: this.email === sails.config.custom.defaultAdminEmail,
     };
   },
 };

server/config/custom.js

@@ -31,15 +31,15 @@ module.exports.custom = {
   attachmentsPath: path.join(sails.config.appPath, 'private', 'attachments'),
   attachmentsUrl: `${process.env.BASE_URL}/attachments`,
 
-  defaultAdminEmail: process.env.DEFAULT_ADMIN_EMAIL,
-
   oidcIssuer: process.env.OIDC_ISSUER,
-  oidcClientId: process.env.OIDC_CLIENT_ID,
-  oidcRedirectUri: process.env.OIDC_REDIRECT_URI,
-  oidcScopes: process.env.OIDC_SCOPES || 'openid email profile',
-  oidcJwksUri: process.env.OIDC_JWKS_URI,
   oidcAudience: process.env.OIDC_AUDIENCE,
-  oidcAdminRoles: process.env.OIDC_ADMIN_ROLES ? process.env.OIDC_ADMIN_ROLES.split(',') : [],
+  oidcClientId: process.env.OIDC_CLIENT_ID,
   oidcRolesAttribute: process.env.OIDC_ROLES_ATTRIBUTE || 'groups',
+  oidcAdminRoles: process.env.OIDC_ADMIN_ROLES ? process.env.OIDC_ADMIN_ROLES.split(',') : [],
+  oidcredirectUri: process.env.OIDC_REDIRECT_URI,
+  oidcJwksUri: process.env.OIDC_JWKS_URI,
+  oidcScopes: process.env.OIDC_SCOPES || 'openid profile email',
   oidcSkipUserInfo: process.env.OIDC_SKIP_USER_INFO === 'true',
+
+  defaultAdminEmail: process.env.DEFAULT_ADMIN_EMAIL,
 };

server/config/policies.js

@@ -23,7 +23,7 @@ module.exports.policies = {
 
   'projects/create': ['is-authenticated', 'is-admin'],
 
-  'show-config': true,
   'access-tokens/create': true,
   'access-tokens/exchange': true,
+  'appconfig/index': true,
 };

server/config/routes.js

@@ -9,7 +9,7 @@
  */
 
 module.exports.routes = {
-  'GET /api/config': 'show-config',
+  'GET /api/appconfig': 'appconfig/index',
 
   'POST /api/access-tokens': 'access-tokens/create',
   'POST /api/access-tokens/exchange': 'access-tokens/exchange',

server/db/migrations/20230809022050_create_identity_provider_user.js

@@ -0,0 +1,24 @@
+module.exports.up = (knex) =>
+  knex.schema.createTable('identity_provider_user', (table) => {
+    /* Columns */
+
+    table.bigInteger('id').primary().defaultTo(knex.raw('next_id()'));
+    table.timestamp('created_at', true);
+    table.timestamp('updated_at', true);
+
+    table
+      .bigInteger('user_id')
+      .notNullable()
+      .references('id')
+      .inTable('user_account')
+      .onDelete('CASCADE');
+
+    table.text('issuer').notNullable();
+    table.text('sub').notNullable();
+
+    /* Indexes */
+
+    table.index('user_id');
+  });
+
+module.exports.down = (knex) => knex.schema.dropTable('identity_provider_user');

server/db/migrations/20230809022050_oidc_with_pkce_flow.js

@@ -1,44 +0,0 @@
-module.exports.up = async (knex) => {
-  await knex.schema.createTable('identity_provider_user', (table) => {
-    /* Columns */
-
-    table.bigInteger('id').primary().defaultTo(knex.raw('next_id()'));
-
-    table.bigInteger('user_id').notNullable();
-
-    table.text('issuer').notNullable();
-    table.text('sub').notNullable();
-
-    table.timestamp('created_at', true);
-    table.timestamp('updated_at', true);
-
-    /* Indexes */
-
-    table.unique(['issuer', 'sub']);
-    table.index('user_id');
-  });
-
-  await knex.schema.table('user_account', (table) => {
-    /* Columns */
-
-    table.boolean('is_sso').notNullable().default(false);
-
-    /* Modifications */
-
-    table.setNullable('password');
-  });
-
-  return knex.schema.alterTable('user_account', (table) => {
-    table.boolean('is_sso').notNullable().alter();
-  });
-};
-
-module.exports.down = async (knex) => {
-  await knex.schema.dropTable('identity_provider_user');
-
-  return knex.schema.table('user_account', (table) => {
-    table.dropColumn('is_sso');
-
-    table.dropNullable('password');
-  });
-};

server/db/migrations/20230809024146_all_null_password_field.js

@@ -0,0 +1,11 @@
+module.exports.up = async (knex) => {
+  return knex.schema.table('user_account', (table) => {
+    table.setNullable('password');
+  });
+};
+
+module.exports.down = async (knex) => {
+  return knex.schema.table('user_account', (table) => {
+    table.dropNullable('password');
+  });
+};

server/db/migrations/20230809025904_add_lock_to_user_account.js

@@ -0,0 +1,11 @@
+module.exports.up = async (knex) => {
+  return knex.schema.table('user_account', (table) => {
+    table.boolean('locked').default(false);
+  });
+};
+
+module.exports.down = async (knex) => {
+  return knex.schema.table('user_account', (table) => {
+    table.dropColumn('locked');
+  });
+};

server/db/seeds/default.js

@@ -3,7 +3,6 @@ const bcrypt = require('bcrypt');
 const buildData = () => {
   const data = {
     isAdmin: true,
-    isSso: false,
   };
 
   if (process.env.DEFAULT_ADMIN_PASSWORD) {

server/package-lock.json

@@ -18,7 +18,7 @@
         "move-file": "^2.1.0",
         "openid-client": "^5.4.3",
         "rimraf": "^3.0.2",
-        "sails": "^1.5.7",
+        "sails": "^1.5.3",
         "sails-hook-orm": "^4.0.2",
         "sails-hook-sockets": "^2.0.3",
         "sails-postgresql-redacted": "^1.0.2-9",
@@ -647,29 +647,29 @@
       "integrity": "sha512-OfdwXncy2KqoGIlXUqxe+xb7G54s8y5pdo96+KGQMkQMZ5C/rT26tT2IJxWtgiAPeklwAU6iXxxjX8b8blcTPQ=="
     },
     "node_modules/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "dependencies": {
-        "bytes": "3.1.2",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
       },
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -683,38 +683,30 @@
       }
     },
     "node_modules/body-parser/node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dependencies": {
         "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
         "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
+        "toidentifier": "1.0.0"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/body-parser/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/body-parser/node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "node_modules/body-parser/node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1216,16 +1208,21 @@
       "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
       "dependencies": {
-        "safe-buffer": "5.2.1"
+        "safe-buffer": "5.1.2"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -2163,16 +2160,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "dependencies": {
-        "accepts": "~1.3.8",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
-        "content-disposition": "0.5.4",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -2186,13 +2183,13 @@
         "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
-        "setprototypeof": "1.2.0",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
         "statuses": "~1.5.0",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
@@ -2259,14 +2256,6 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
       "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
     },
-    "node_modules/express/node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/express/node_modules/cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -2315,25 +2304,25 @@
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
     },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "node_modules/express/node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.17.1"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/express/node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -5329,14 +5318,11 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
       "engines": {
         "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/queue-microtask": {
@@ -5414,12 +5400,12 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -5428,40 +5414,32 @@
       }
     },
     "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/raw-body/node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dependencies": {
         "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
         "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
+        "toidentifier": "1.0.0"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/raw-body/node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "node_modules/raw-body/node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
+    "node_modules/raw-body/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
     },
     "node_modules/rc": {
       "version": "1.2.8",
@@ -5859,9 +5837,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sails": {
-      "version": "1.5.8",
-      "resolved": "https://registry.npmjs.org/sails/-/sails-1.5.8.tgz",
-      "integrity": "sha512-S1omXwRYsnJzQtnDG0pDOmLUT8WssFV3KMIE15grYo6gtOwUwPhITs8dSw1rzTCyV8TIt5vQzVbeL82vvfwINA==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/sails/-/sails-1.5.3.tgz",
+      "integrity": "sha512-JH9kKEtkBnb3NRNe7wMgbrlCpwIymiqMvFN8nG3S77gXBqnEGh2JMrmoiwLhRsK05Lisze8YvZ4ip27e7xoWHA==",
       "dependencies": {
         "@sailshq/lodash": "^3.10.2",
         "async": "2.6.4",
@@ -5876,7 +5854,7 @@
         "cookie-signature": "1.1.0",
         "csurf": "1.10.0",
         "ejs": "3.1.7",
-        "express": "4.17.3",
+        "express": "4.17.1",
         "express-session": "1.17.0",
         "flaverr": "^1.10.0",
         "glob": "7.1.2",
@@ -5899,7 +5877,7 @@
         "rttc": "^10.0.0-0",
         "sails-generate": "^2.0.3",
         "sails-stringfile": "^0.3.3",
-        "semver": "7.5.2",
+        "semver": "4.3.6",
         "serve-favicon": "2.4.5",
         "serve-static": "1.13.1",
         "skipper": "^0.9.0-0",
@@ -6275,6 +6253,14 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
+    "node_modules/sails/node_modules/semver": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+      "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/sails/node_modules/supports-color": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -6287,9 +6273,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -6301,9 +6287,9 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -6312,9 +6298,9 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "~1.7.2",
         "mime": "1.6.0",
-        "ms": "2.1.3",
+        "ms": "2.1.1",
         "on-finished": "~2.3.0",
         "range-parser": "~1.2.1",
         "statuses": "~1.5.0"
@@ -6336,38 +6322,10 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/send/node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/send/node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "node_modules/send/node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.0",
@@ -8621,26 +8579,26 @@
       "integrity": "sha512-OfdwXncy2KqoGIlXUqxe+xb7G54s8y5pdo96+KGQMkQMZ5C/rT26tT2IJxWtgiAPeklwAU6iXxxjX8b8blcTPQ=="
     },
     "body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
       "requires": {
-        "bytes": "3.1.2",
+        "bytes": "3.1.0",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.9.7",
-        "raw-body": "2.4.3",
-        "type-is": "~1.6.18"
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
       },
       "dependencies": {
         "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
         },
         "debug": {
           "version": "2.6.9",
@@ -8651,31 +8609,26 @@
           }
         },
         "http-errors": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-          "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+          "version": "1.7.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
           "requires": {
             "depd": "~1.1.2",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.2.0",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.1",
             "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.1"
+            "toidentifier": "1.0.0"
           }
         },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "setprototypeof": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-        },
-        "toidentifier": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
         }
       }
     },
@@ -9078,11 +9031,18 @@
       "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
       "requires": {
-        "safe-buffer": "5.2.1"
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        }
       }
     },
     "content-type": {
@@ -9814,16 +9774,16 @@
       }
     },
     "express": {
-      "version": "4.17.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz",
-      "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "requires": {
-        "accepts": "~1.3.8",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.2",
-        "content-disposition": "0.5.4",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.4.2",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -9837,24 +9797,19 @@
         "on-finished": "~2.3.0",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.9.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
-        "setprototypeof": "1.2.0",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
         "statuses": "~1.5.0",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
-        "cookie": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="
-        },
         "cookie-signature": {
           "version": "1.0.6",
           "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -9897,21 +9852,21 @@
           "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
           "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
         },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+        },
         "serve-static": {
-          "version": "1.14.2",
-          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-          "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+          "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
           "requires": {
             "encodeurl": "~1.0.2",
             "escape-html": "~1.0.3",
             "parseurl": "~1.3.3",
-            "send": "0.17.2"
+            "send": "0.17.1"
           }
-        },
-        "setprototypeof": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         }
       }
     },
@@ -12249,9 +12204,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
     },
     "queue-microtask": {
       "version": "1.2.3",
@@ -12301,42 +12256,37 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz",
-      "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
       "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "1.8.1",
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
       "dependencies": {
         "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
         },
         "http-errors": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-          "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+          "version": "1.7.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
           "requires": {
             "depd": "~1.1.2",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.2.0",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.1",
             "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.1"
+            "toidentifier": "1.0.0"
           }
         },
-        "setprototypeof": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-        },
-        "toidentifier": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
         }
       }
     },
@@ -12619,9 +12569,9 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sails": {
-      "version": "1.5.8",
-      "resolved": "https://registry.npmjs.org/sails/-/sails-1.5.8.tgz",
-      "integrity": "sha512-S1omXwRYsnJzQtnDG0pDOmLUT8WssFV3KMIE15grYo6gtOwUwPhITs8dSw1rzTCyV8TIt5vQzVbeL82vvfwINA==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/sails/-/sails-1.5.3.tgz",
+      "integrity": "sha512-JH9kKEtkBnb3NRNe7wMgbrlCpwIymiqMvFN8nG3S77gXBqnEGh2JMrmoiwLhRsK05Lisze8YvZ4ip27e7xoWHA==",
       "requires": {
         "@sailshq/lodash": "^3.10.2",
         "async": "2.6.4",
@@ -12636,7 +12586,7 @@
         "cookie-signature": "1.1.0",
         "csurf": "1.10.0",
         "ejs": "3.1.7",
-        "express": "4.17.3",
+        "express": "4.17.1",
         "express-session": "1.17.0",
         "flaverr": "^1.10.0",
         "glob": "7.1.2",
@@ -12659,7 +12609,7 @@
         "rttc": "^10.0.0-0",
         "sails-generate": "^2.0.3",
         "sails-stringfile": "^0.3.3",
-        "semver": "7.5.2",
+        "semver": "4.3.6",
         "serve-favicon": "2.4.5",
         "serve-static": "1.13.1",
         "skipper": "^0.9.0-0",
@@ -12733,6 +12683,11 @@
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
           "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
         },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha512-IrpJ+yoG4EOH8DFWuVg+8H1kW1Oaof0Wxe7cPcXW3x9BjkN/eVo54F15LyqemnDIUYskQWr9qvl/RihmSy6+xQ=="
+        },
         "supports-color": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
@@ -12981,17 +12936,17 @@
       "integrity": "sha512-fBMdntawlqd5N/1xL9Vu6l+J5zvy86jLUf0nFDal5McUeZzUy7PpNqq+Vx/F9KgItAyFJ7RoO3YltO9dD0Q5OQ=="
     },
     "semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
     },
     "send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
       "requires": {
         "debug": "2.6.9",
         "depd": "~1.1.2",
@@ -13000,9 +12955,9 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "~1.7.2",
         "mime": "1.6.0",
-        "ms": "2.1.3",
+        "ms": "2.1.1",
         "on-finished": "~2.3.0",
         "range-parser": "~1.2.1",
         "statuses": "~1.5.0"
@@ -13023,32 +12978,10 @@
             }
           }
         },
-        "http-errors": {
-          "version": "1.8.1",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-          "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.4",
-            "setprototypeof": "1.2.0",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.1"
-          }
-        },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        },
-        "setprototypeof": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-        },
-        "toidentifier": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },

server/package.json

@@ -39,7 +39,7 @@
     "move-file": "^2.1.0",
     "openid-client": "^5.4.3",
     "rimraf": "^3.0.2",
-    "sails": "^1.5.7",
+    "sails": "^1.5.3",
     "sails-hook-orm": "^4.0.2",
     "sails-hook-sockets": "^2.0.3",
     "sails-postgresql-redacted": "^1.0.2-9",