From 017d2deeee986b52fb2d64ca2736bd2910bbba13 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 11 Jun 2019 20:20:29 +0300 Subject: [PATCH 1/4] Fix Snap build. Thanks to xet7 ! --- CHANGELOG.md | 9 +++++++++ snapcraft.yaml | 2 ++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f30a14a9..a4b43566e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fix Snap build](https://github.com/wekan/wekan/commit/e1e20275a673d3065c6cf239db8d2f1a505baa69). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.76 2019-06-11 Wekan release This release adds the following new features: diff --git a/snapcraft.yaml b/snapcraft.yaml index 5a1c6b9fe..3cd3f3cfc 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -213,6 +213,8 @@ parts: cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/ rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan rm $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs + rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp + rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp organize: README: README.wekan prime: From 25e294fd92667807a93ebd73d70888cab66c104d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 11 Jun 2019 20:27:17 +0300 Subject: [PATCH 2/4] v2.77 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4b43566e..e3e6f4abb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.77 2019-06-11 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index b5c1f26de..453dd6a27 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.76.0" +appVersion: "v2.77.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 78ae0d79f..a9845003e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.76.0", + "version": "v2.77.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 4fa1ddf4f..eb697eb35 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 278, + appVersion = 279, # Increment this for every release. - appMarketingVersion = (defaultText = "2.76.0~2019-06-11"), + appMarketingVersion = (defaultText = "2.77.0~2019-06-11"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, From 8b31c0768c34fc4557b54cec936a0b4288a8e722 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 12 Jun 2019 06:29:57 +0300 Subject: [PATCH 3/4] Try to fix OIDC login. Thanks to xet7 ! --- packages/wekan-oidc/oidc_server.js | 12 ++++++------ server/authentication.js | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index e826d1f59..326238da6 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -13,12 +13,12 @@ OAuth.registerService('oidc', 2, null, function (query) { if (debug) console.log('XXX: userinfo:', userinfo); var serviceData = {}; - serviceData.id = userinfo[process.env.OAUTH2_ID_MAP] || userinfo["id"]; - serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP] || userinfo["uid"]; - serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"]; + serviceData.id = userinfo[process.env.OAUTH2_ID_MAP]; // || userinfo["id"]; + serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP]; // || userinfo["uid"]; + serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP]; // || userinfo["displayName"]; serviceData.accessToken = accessToken; serviceData.expiresAt = expiresAt; - serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"]; + serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"]; if (accessToken) { var tokenContent = getTokenContent(accessToken); @@ -31,8 +31,8 @@ OAuth.registerService('oidc', 2, null, function (query) { if (debug) console.log('XXX: serviceData:', serviceData); var profile = {}; - profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"]; - profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"]; + profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP]; // || userinfo["displayName"]; + profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"]; if (debug) console.log('XXX: profile:', profile); return { diff --git a/server/authentication.js b/server/authentication.js index b0da74f84..b1e7f8ecf 100644 --- a/server/authentication.js +++ b/server/authentication.js @@ -76,9 +76,11 @@ Meteor.startup(() => { 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: process.env.OAUTH2_REQUEST_PERMISSIONS || 'openid profile email', + idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS, + requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS, }, + // OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [], + // OAUTH2_REQUEST_PERMISSIONS || 'openid profile email', } ); } From 79745d189270f08c3747447ea84839deb19ad0d6 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 12 Jun 2019 06:34:46 +0300 Subject: [PATCH 4/4] v2.78 --- CHANGELOG.md | 9 +++++++++ Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3e6f4abb..b3fc0d645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v2.78 2019-06-12 Wekan release + +This release fixes the following bugs: + +- [Try to fix OIDC login](https://github.com/wekan/wekan/commit/8b31c0768c34fc4557b54cec936a0b4288a8e722). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v2.77 2019-06-11 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index 453dd6a27..ef8860d36 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.77.0" +appVersion: "v2.78.0" files: userUploads: - README.md diff --git a/package.json b/package.json index a9845003e..eefc1cc0c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.77.0", + "version": "v2.78.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index eb697eb35..b5e34d4fd 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 279, + appVersion = 280, # Increment this for every release. - appMarketingVersion = (defaultText = "2.77.0~2019-06-11"), + appMarketingVersion = (defaultText = "2.78.0~2019-06-12"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,