From 6c45df6eeec169d0fb4e23f49a0d6c32d76bcb26 Mon Sep 17 00:00:00 2001 From: Bradley Hilton Date: Tue, 17 Apr 2018 00:08:39 -0500 Subject: [PATCH 1/2] [FIX] Even TypeErrors with SAML (#10475) --- packages/meteor-accounts-saml/saml_utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meteor-accounts-saml/saml_utils.js b/packages/meteor-accounts-saml/saml_utils.js index 30eec18b57ba1..75bf93fb8d2eb 100644 --- a/packages/meteor-accounts-saml/saml_utils.js +++ b/packages/meteor-accounts-saml/saml_utils.js @@ -396,9 +396,9 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) { attributes.forEach(function(attribute) { const value = self.getElement(attribute, 'AttributeValue'); if (typeof value[0] === 'string') { - profile[attribute.$.Name] = value[0]; + profile[attribute.$.Name.value] = value[0]; } else { - profile[attribute.$.Name] = value[0]._; + profile[attribute.$.Name.value] = value[0]._; } }); } From e1143c527f964b2925788ecc799650ee8db5bdd9 Mon Sep 17 00:00:00 2001 From: Bradley Hilton Date: Tue, 17 Apr 2018 00:10:05 -0500 Subject: [PATCH 2/2] Bump version to 0.63.2 --- .docker/Dockerfile | 2 +- .docker/Dockerfile.rhel | 2 +- .github/history.json | 18 ++++++++++++++++++ .sandstorm/sandstorm-pkgdef.capnp | 2 +- .travis/snap.sh | 2 +- HISTORY.md | 14 ++++++++++++++ package.json | 2 +- packages/rocketchat-lib/rocketchat.info | 2 +- 8 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 08bc27b32bf3a..33f6da117eb7b 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,6 +1,6 @@ FROM rocketchat/base:8 -ENV RC_VERSION 0.63.1 +ENV RC_VERSION 0.63.2 MAINTAINER buildmaster@rocket.chat diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index ee41afb5a6d67..a342fbb619fd5 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 -ENV RC_VERSION 0.63.1 +ENV RC_VERSION 0.63.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 1c523399eede8..9a8a304445a75 100644 --- a/.github/history.json +++ b/.github/history.json @@ -12207,5 +12207,23 @@ "web-flow" ] } + ], + "0.63.2": [ + { + "pr": "10475", + "title": "[FIX] Even TypeErrors with SAML", + "userLogin": "graywolf336", + "contributors": [ + "graywolf336" + ] + }, + { + "pr": "10408", + "title": "add redhat dockerfile to master", + "userLogin": "geekgonecrazy", + "contributors": [ + "geekgonecrazy" + ] + } ] } \ No newline at end of file diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index e904c24b4384a..f6680c7bc61c3 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = ( appVersion = 62, # Increment this for every release. - appMarketingVersion = (defaultText = "0.63.1"), + appMarketingVersion = (defaultText = "0.63.2"), # Human-readable representation of appVersion. Should match the way you # identify versions of your app in documentation and marketing. diff --git a/.travis/snap.sh b/.travis/snap.sh index a0be6fc1e43e6..f7d412f91bf90 100755 --- a/.travis/snap.sh +++ b/.travis/snap.sh @@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then RC_VERSION=$TRAVIS_TAG else CHANNEL=edge - RC_VERSION=0.63.1 + RC_VERSION=0.63.2 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index 23102f27536aa..d8b67eb2bb48e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,18 @@ +# 0.63.2 +`2018-04-17 ยท 1 ๐Ÿ› ยท 1 ๐Ÿ”` + +### ๐Ÿ› Bug fixes + +- Even TypeErrors with SAML ([#10475](https://github.com/RocketChat/Rocket.Chat/pull/10475)) + +
+๐Ÿ” Minor changes + +- add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408)) + +
+ # 0.63.1 `2018-04-07 ยท 5 ๐Ÿ› ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/package.json b/package.json index f4f231619594b..35fa4f0fb14ec 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "0.63.1", + "version": "0.63.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" diff --git a/packages/rocketchat-lib/rocketchat.info b/packages/rocketchat-lib/rocketchat.info index eb0c811e983bb..7cecdbe3af67b 100644 --- a/packages/rocketchat-lib/rocketchat.info +++ b/packages/rocketchat-lib/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "0.63.1" + "version": "0.63.2" }