Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add ldap authentication #268

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Add ldap authentication #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17,283 changes: 11,075 additions & 6,208 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,23 @@
}
},
"dependencies": {
"assert": "^2.0.0",
"buffer": "^6.0.3",
"classnames": "^2.2.6",
"connected-react-router": "^6.9.2",
"date-fns": "^2.28.0",
"dequal": "^2.0.2",
"dtrace-provider": "^0.8.8",
"express": "^4.18.1",
"history": "^4.10.1",
"i18next": "^21.6.16",
"i18next-browser-languagedetector": "^6.1.4",
"initials": "^3.1.2",
"js-cookie": "^3.0.1",
"ldap-authentication": "^2.2.9",
"ldapjs": "^2.3.2",
"lodash": "^4.17.20",
"net": "^1.0.2",
"node-sass": "^7.0.1",
"photoswipe": "^5.2.7",
"prop-types": "^15.8.1",
Expand All @@ -99,7 +106,11 @@
"sails.io.js": "^1.2.1",
"semantic-ui-react": "^2.1.2",
"socket.io-client": "^2.3.1",
"stream-browserify": "^3.0.0",
"tls": "^0.0.1",
"url": "^0.11.0",
"validator": "^13.7.0",
"webcrypto": "^0.1.1",
"whatwg-fetch": "^3.5.0"
},
"devDependencies": {
Expand All @@ -119,4 +130,4 @@
"prettier": "2.6.2",
"react-test-renderer": "^17.0.2"
}
}
}
5 changes: 5 additions & 0 deletions client/src/components/Login/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ const createMessage = (error) => {
type: 'error',
content: 'common.invalidPassword',
};
case 'Ldap authentication failed':
return {
type: 'error',
content: 'common.invalidLdap',
};
case 'Failed to fetch':
return {
type: 'warning',
Expand Down
5 changes: 5 additions & 0 deletions client/src/components/UserEmailEditStep/UserEmailEditStep.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ const createMessage = (error) => {
type: 'error',
content: 'common.invalidCurrentPassword',
};
case 'Action not possible':
return {
type: 'error',
content: 'common.impossibleAction',
};
default:
return {
type: 'warning',
Expand Down
5 changes: 5 additions & 0 deletions client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ const createMessage = (error) => {
type: 'error',
content: 'common.invalidCurrentPassword',
};
case 'Action not possible':
return {
type: 'error',
content: 'common.impossibleAction',
};
default:
return {
type: 'warning',
Expand Down
1 change: 1 addition & 0 deletions client/src/locales/en/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export default {
fromComputer_title: 'From Computer',
general: 'General',
hours: 'Hours',
impossibleAction: 'Action not possible',
invalidCurrentPassword: 'Invalid current password',
labels: 'Labels',
leaveBoard_title: 'Leave Board',
Expand Down
1 change: 1 addition & 0 deletions client/src/locales/en/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export default {
common: {
emailOrUsername: 'E-mail or username',
invalidEmailOrUsername: 'Invalid e-mail or username',
invalidLdap: 'Ldap connection failure',
invalidPassword: 'Invalid password',
logInToPlanka: 'Log in to Planka',
noInternetConnection: 'No internet connection',
Expand Down
1 change: 1 addition & 0 deletions client/src/locales/fr/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export default {
filterByMembers_title: 'Filtrer par membres',
fromComputer_title: "Depuis l'ordinateur",
hours: 'Les heures',
impossibleAction: 'Action impossible',
invalidCurrentPassword: 'Mot de passe actuel invalide',
labels: 'Étiquettes',
list: 'Lister',
Expand Down
1 change: 1 addition & 0 deletions client/src/locales/fr/login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export default {
common: {
emailOrUsername: "Email ou nom d'utilisateur",
invalidEmailOrUsername: "Email ou nom d'utilisateur invalide",
invalidLdap: "Connexion à l'AD échouée",
invalidPassword: 'Mot de passe invalide',
logInToPlanka: 'Se connecter à Planka',
noInternetConnection: 'Aucune connection internet',
Expand Down
Loading