Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-23 09:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into feature-ostrio-files

Browse source
This commit is contained in:
David Arnold 2020-10-20 11:43:12 -05:00
commit 620cc0dedc
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
95 changed files with 1070 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

150
server/authentication.js
View file

@ -64,6 +64,28 @@ Meteor.startup(() => {
if (Meteor.isServer) {
if (
process.env.ORACLE_OIM_ENABLED === 'true' ||
process.env.ORACLE_OIM_ENABLED === true
) {
ServiceConfiguration.configurations.upsert(
// eslint-disable-line no-undef
{ service: 'oidc' },
{
$set: {
loginStyle: process.env.OAUTH2_LOGIN_STYLE,
clientId: process.env.OAUTH2_CLIENT_ID,
secret: process.env.OAUTH2_SECRET,
serverUrl: process.env.OAUTH2_SERVER_URL,
authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
idTokenWhitelistFields:
process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
requestPermissions: 'BDFUserProfile.me',
},
},
);
} else if (
process.env.OAUTH2_ENABLED === 'true' ||
process.env.OAUTH2_ENABLED === true
) {
@ -87,73 +109,73 @@ Meteor.startup(() => {
// OAUTH2_REQUEST_PERMISSIONS || 'openid profile email',
},
);
}
} else if (
process.env.CAS_ENABLED === 'true' ||
process.env.CAS_ENABLED === true
) {
ServiceConfiguration.configurations.upsert(
// eslint-disable-line no-undef
{ service: 'cas' },
{
$set: {
baseUrl: process.env.CAS_BASE_URL,
loginUrl: process.env.CAS_LOGIN_URL,
serviceParam: 'service',
popupWidth: 810,
popupHeight: 610,
popup: true,
autoClose: true,
validateUrl: process.env.CASE_VALIDATE_URL,
casVersion: 3.0,
attributes: {
debug: process.env.DEBUG,
} else if (
process.env.CAS_ENABLED === 'true' ||
process.env.CAS_ENABLED === true
) {
ServiceConfiguration.configurations.upsert(
// eslint-disable-line no-undef
{ service: 'cas' },
{
$set: {
baseUrl: process.env.CAS_BASE_URL,
loginUrl: process.env.CAS_LOGIN_URL,
serviceParam: 'service',
popupWidth: 810,
popupHeight: 610,
popup: true,
autoClose: true,
validateUrl: process.env.CASE_VALIDATE_URL,
casVersion: 3.0,
attributes: {
debug: process.env.DEBUG,
},
},
},
},
);
} else if (
process.env.SAML_ENABLED === 'true' ||
process.env.SAML_ENABLED === true
) {
ServiceConfiguration.configurations.upsert(
// eslint-disable-line no-undef
{ service: 'saml' },
{
$set: {
provider: process.env.SAML_PROVIDER,
entryPoint: process.env.SAML_ENTRYPOINT,
issuer: process.env.SAML_ISSUER,
cert: process.env.SAML_CERT,
idpSLORedirectURL: process.env.SAML_IDPSLO_REDIRECTURL,
privateKeyFile: process.env.SAML_PRIVATE_KEYFILE,
publicCertFile: process.env.SAML_PUBLIC_CERTFILE,
identifierFormat: process.env.SAML_IDENTIFIER_FORMAT,
localProfileMatchAttribute:
process.env.SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE,
attributesSAML: process.env.SAML_ATTRIBUTES || [
'sn',
'givenName',
'mail',
],
);
} else if (
process.env.SAML_ENABLED === 'true' ||
process.env.SAML_ENABLED === true
) {
ServiceConfiguration.configurations.upsert(
// eslint-disable-line no-undef
{ service: 'saml' },
{
$set: {
provider: process.env.SAML_PROVIDER,
entryPoint: process.env.SAML_ENTRYPOINT,
issuer: process.env.SAML_ISSUER,
cert: process.env.SAML_CERT,
idpSLORedirectURL: process.env.SAML_IDPSLO_REDIRECTURL,
privateKeyFile: process.env.SAML_PRIVATE_KEYFILE,
publicCertFile: process.env.SAML_PUBLIC_CERTFILE,
identifierFormat: process.env.SAML_IDENTIFIER_FORMAT,
localProfileMatchAttribute:
process.env.SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE,
attributesSAML: process.env.SAML_ATTRIBUTES || [
'sn',
'givenName',
'mail',
],
/*
settings = {"saml":[{
"provider":"openam",
"entryPoint":"https://openam.idp.io/openam/SSORedirect/metaAlias/zimt/idp",
"issuer": "https://sp.zimt.io/", //replace with url of your app
"cert":"MIICizCCAfQCCQCY8tKaMc0 LOTS OF FUNNY CHARS ==",
"idpSLORedirectURL": "http://openam.idp.io/openam/IDPSloRedirect/metaAlias/zimt/idp",
"privateKeyFile": "certs/mykey.pem", // path is relative to $METEOR-PROJECT/private
"publicCertFile": "certs/mycert.pem", // eg $METEOR-PROJECT/private/certs/mycert.pem
"dynamicProfile": true // set to true if we want to create a user in Meteor.users dynamically if SAML assertion is valid
"identifierFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", // Defaults to urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
"localProfileMatchAttribute": "telephoneNumber" // CAUTION: this will be mapped to profile.<localProfileMatchAttribute> attribute in Mongo if identifierFormat (see above) differs from urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress,
"attributesSAML": [telephoneNumber, sn, givenName, mail], // attrs from SAML attr statement, which will be used for local Meteor profile creation. Currently no real attribute mapping. If required use mapping on IdP side.
}]}
*/
/*
settings = {"saml":[{
"provider":"openam",
"entryPoint":"https://openam.idp.io/openam/SSORedirect/metaAlias/zimt/idp",
"issuer": "https://sp.zimt.io/", //replace with url of your app
"cert":"MIICizCCAfQCCQCY8tKaMc0 LOTS OF FUNNY CHARS ==",
"idpSLORedirectURL": "http://openam.idp.io/openam/IDPSloRedirect/metaAlias/zimt/idp",
"privateKeyFile": "certs/mykey.pem", // path is relative to $METEOR-PROJECT/private
"publicCertFile": "certs/mycert.pem", // eg $METEOR-PROJECT/private/certs/mycert.pem
"dynamicProfile": true // set to true if we want to create a user in Meteor.users dynamically if SAML assertion is valid
"identifierFormat": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified", // Defaults to urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
"localProfileMatchAttribute": "telephoneNumber" // CAUTION: this will be mapped to profile.<localProfileMatchAttribute> attribute in Mongo if identifierFormat (see above) differs from urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress,
"attributesSAML": [telephoneNumber, sn, givenName, mail], // attrs from SAML attr statement, which will be used for local Meteor profile creation. Currently no real attribute mapping. If required use mapping on IdP side.
}]}
*/
},
},
},
);
);
}
}
});

16
server/migrations.js
View file

@ -1045,6 +1045,22 @@ Migrations.add('add-default-profile-view', () => {
}
});
});
Migrations.add('add-hide-logo-by-default', () => {
Settings.update(
{
hideLogo: {
hideLogo: false,
},
},
{
$set: {
hideLogo: true,
},
},
noValidateMulti,
);
});
Migrations.add(
'adapt-attachments-to-ostrio-files-api-using-meta-and-drp-cfs-leacy',
() => {

5
server/publications/settings.js
View file

@ -12,6 +12,11 @@ Meteor.publish('setting', () => {
disableRegistration: 1,
productName: 1,
hideLogo: 1,
customLoginLogoImageUrl: 1,
customLoginLogoLinkUrl: 1,
textBelowCustomLoginLogo: 1,
customTopLeftCornerLogoImageUrl: 1,
customTopLeftCornerLogoLinkUrl: 1,
customHTMLafterBodyStart: 1,
customHTMLbeforeBodyEnd: 1,
displayAuthenticationMethod: 1,