mirror of
https://github.com/plankanban/planka.git
synced 2025-12-06 01:10:11 +03:00
Compare commits
3 Commits
fedee157c7
...
d472da7523
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d472da7523 | ||
|
|
f030b78f82 | ||
|
|
b94759d399 |
@@ -13,12 +13,12 @@ version-template.ejs
|
||||
.gitignore
|
||||
.npmrc
|
||||
|
||||
.tmp
|
||||
.venv
|
||||
dist
|
||||
logs
|
||||
node_modules
|
||||
test
|
||||
.tmp
|
||||
.venv
|
||||
|
||||
views/*
|
||||
|
||||
|
||||
@@ -84,8 +84,8 @@ module.exports = {
|
||||
}
|
||||
}
|
||||
|
||||
const email = claims[sails.config.custom.oidcEmailAttribute];
|
||||
const name = claims[sails.config.custom.oidcNameAttribute];
|
||||
const email = _.get(claims, sails.config.custom.oidcEmailAttribute);
|
||||
const name = _.get(claims, sails.config.custom.oidcNameAttribute);
|
||||
|
||||
if (!email || !name) {
|
||||
throw 'missingValues';
|
||||
@@ -93,7 +93,7 @@ module.exports = {
|
||||
|
||||
let role = User.Roles.BOARD_USER;
|
||||
if (!sails.config.custom.oidcIgnoreRoles) {
|
||||
const claimsRoles = claims[sails.config.custom.oidcRolesAttribute];
|
||||
const claimsRoles = _.get(claims, sails.config.custom.oidcRolesAttribute);
|
||||
|
||||
if (Array.isArray(claimsRoles)) {
|
||||
// Use a Set here to avoid quadratic time complexity
|
||||
@@ -123,7 +123,7 @@ module.exports = {
|
||||
isSsoUser: true,
|
||||
};
|
||||
if (!sails.config.custom.oidcIgnoreUsername) {
|
||||
values.username = claims[sails.config.custom.oidcUsernameAttribute];
|
||||
values.username = _.get(claims, sails.config.custom.oidcUsernameAttribute);
|
||||
}
|
||||
|
||||
// This whole block technically needs to be executed in a transaction
|
||||
|
||||
23
server/package-lock.json
generated
23
server/package-lock.json
generated
@@ -24,7 +24,7 @@
|
||||
"lodash": "^4.17.21",
|
||||
"mime": "^3.0.0",
|
||||
"moment": "^2.30.1",
|
||||
"nodemailer": "^7.0.10",
|
||||
"nodemailer": "^7.0.11",
|
||||
"openid-client": "^5.7.1",
|
||||
"patch-package": "^8.0.1",
|
||||
"pg": "^8.16.3",
|
||||
@@ -432,6 +432,7 @@
|
||||
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.726.0.tgz",
|
||||
"integrity": "sha512-5JzTX9jwev7+y2Jkzjz0pd1wobB5JQfPOQF3N2DrJ5Pao0/k6uRYwE4NqB0p0HlGrMTDm7xNq7OSPPIPG575Jw==",
|
||||
"license": "Apache-2.0",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@aws-crypto/sha256-browser": "5.2.0",
|
||||
"@aws-crypto/sha256-js": "5.2.0",
|
||||
@@ -485,6 +486,7 @@
|
||||
"resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.726.1.tgz",
|
||||
"integrity": "sha512-qh9Q9Vu1hrM/wMBOBIaskwnE4GTFaZu26Q6WHwyWNfj7J8a40vBxpW16c2vYXHLBtwRKM1be8uRLkmDwghpiNw==",
|
||||
"license": "Apache-2.0",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@aws-crypto/sha256-browser": "5.2.0",
|
||||
"@aws-crypto/sha256-js": "5.2.0",
|
||||
@@ -2759,6 +2761,7 @@
|
||||
"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"bin": {
|
||||
"acorn": "bin/acorn"
|
||||
},
|
||||
@@ -4524,6 +4527,7 @@
|
||||
"deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@eslint-community/eslint-utils": "^4.2.0",
|
||||
"@eslint-community/regexpp": "^4.6.1",
|
||||
@@ -4610,6 +4614,7 @@
|
||||
"integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"bin": {
|
||||
"eslint-config-prettier": "bin/cli.js"
|
||||
},
|
||||
@@ -4673,6 +4678,7 @@
|
||||
"integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"dependencies": {
|
||||
"@rtsao/scc": "^1.1.0",
|
||||
"array-includes": "^3.1.9",
|
||||
@@ -6847,12 +6853,12 @@
|
||||
}
|
||||
},
|
||||
"node_modules/jws": {
|
||||
"version": "3.2.2",
|
||||
"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
|
||||
"integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
|
||||
"version": "3.2.3",
|
||||
"resolved": "https://registry.npmjs.org/jws/-/jws-3.2.3.tgz",
|
||||
"integrity": "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"jwa": "^1.4.1",
|
||||
"jwa": "^1.4.2",
|
||||
"safe-buffer": "^5.0.1"
|
||||
}
|
||||
},
|
||||
@@ -7718,9 +7724,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/nodemailer": {
|
||||
"version": "7.0.10",
|
||||
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.10.tgz",
|
||||
"integrity": "sha512-Us/Se1WtT0ylXgNFfyFSx4LElllVLJXQjWi2Xz17xWw7amDKO2MLtFnVp1WACy7GkVGs+oBlRopVNUzlrGSw1w==",
|
||||
"version": "7.0.11",
|
||||
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.11.tgz",
|
||||
"integrity": "sha512-gnXhNRE0FNhD7wPSCGhdNh46Hs6nm+uTyg+Kq0cZukNQiYdnCsoQjodNP9BQVG9XrcK/v6/MgpAPBUFyzh9pvw==",
|
||||
"license": "MIT-0",
|
||||
"engines": {
|
||||
"node": ">=6.0.0"
|
||||
@@ -8486,6 +8492,7 @@
|
||||
"integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"bin": {
|
||||
"prettier": "bin/prettier.cjs"
|
||||
},
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
"lodash": "^4.17.21",
|
||||
"mime": "^3.0.0",
|
||||
"moment": "^2.30.1",
|
||||
"nodemailer": "^7.0.10",
|
||||
"nodemailer": "^7.0.11",
|
||||
"openid-client": "^5.7.1",
|
||||
"patch-package": "^8.0.1",
|
||||
"pg": "^8.16.3",
|
||||
|
||||
Reference in New Issue
Block a user