Merge pull request #23554 from RocketChat/release-4.0.5

sampaiodiego · web-flow · commit 803e9cfda697 · 2021-10-25T17:33:23.000-03:00
Release 4.0.5
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.0.4
+ENV RC_VERSION 4.0.5
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
@@ -66254,6 +66254,29 @@
           ]
         }
       ]
+    },
+    "4.0.5": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.28.0",
+      "mongo_versions": [
+        "3.6",
+        "4.0",
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "23541",
+          "title": "[FIX] OAuth login not working on mobile app",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "4.0.5",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/4.0.4/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/4.0.5/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 4.0.4
+version: 4.0.5
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,22 @@
 
+# 4.0.5
+`2021-10-25  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.22.1`
+- NPM: `6.14.1`
+- MongoDB: `3.6, 4.0, 4.2, 4.4, 5.0`
+- Apps-Engine: `1.28.0`
+
+### 🐛 Bug fixes
+
+
+- OAuth login not working on mobile app ([#23541](https://github.com/RocketChat/Rocket.Chat/pull/23541))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
+
 # 4.0.4
 `2021-10-21  ·  2 🐛  ·  3 👩‍💻👨‍💻`
 
@@ -14857,15 +14875,15 @@
 <summary>🔍 Minor changes</summary>
 
 
-- Add reetp to the issues' bot whitelist ([#12227](https://github.com/RocketChat/Rocket.Chat/pull/12227))
+- Add reetp to the issues' bot whitelist ([#12227](https://github.com/RocketChat/Rocket.Chat/pull/12227) by [@theorenck](https://github.com/theorenck))
 
 - Fix: Remove semver satisfies from Apps details that is already done my marketplace ([#12268](https://github.com/RocketChat/Rocket.Chat/pull/12268))
 
 - Merge master into develop & Set version to 0.71.0-develop ([#12264](https://github.com/RocketChat/Rocket.Chat/pull/12264) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
 
 - Regression: fix modal submit ([#12233](https://github.com/RocketChat/Rocket.Chat/pull/12233))
 
-- Release 0.70.1 ([#12270](https://github.com/RocketChat/Rocket.Chat/pull/12270) by [@Hudell](https://github.com/Hudell) & [@edzluhan](https://github.com/edzluhan))
+- Release 0.70.1 ([#12270](https://github.com/RocketChat/Rocket.Chat/pull/12270) by [@Hudell](https://github.com/Hudell) & [@edzluhan](https://github.com/edzluhan) & [@theorenck](https://github.com/theorenck))
 
 </details>
 
@@ -14875,6 +14893,7 @@
 - [@cardoso](https://github.com/cardoso)
 - [@edzluhan](https://github.com/edzluhan)
 - [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
+- [@theorenck](https://github.com/theorenck)
 - [@timkinnane](https://github.com/timkinnane)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -14884,7 +14903,6 @@
 - [@rodrigok](https://github.com/rodrigok)
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
-- [@theorenck](https://github.com/theorenck)
 
 # 0.70.0
 `2018-09-28  ·  2 ️️️⚠️  ·  18 🎉  ·  3 🚀  ·  35 🐛  ·  19 🔍  ·  32 👩‍💻👨‍💻`
diff --git a/app/google-oauth/server/index.js b/app/google-oauth/server/index.js
@@ -22,6 +22,7 @@ Meteor.startup(() => {
 			credentialSecret: escape(options.credentialSecret),
 			storagePrefix: escape(OAuth._storageTokenPrefix),
 			redirectUrl: escape(options.redirectUrl),
+			isCordova: Boolean(options.isCordova),
 		};
 
 		let template;
@@ -64,12 +65,14 @@ Meteor.startup(() => {
 			}
 		}
 
+		const isCordova = OAuth._isCordovaFromQuery(details.query);
 
 		if (details.error) {
 			res.end(renderEndOfLoginResponse({
 				loginStyle: details.loginStyle,
 				setCredentialToken: false,
 				redirectUrl,
+				isCordova,
 			}), 'utf-8');
 			return;
 		}
@@ -83,6 +86,7 @@ Meteor.startup(() => {
 			credentialToken: details.credentials.token,
 			credentialSecret: details.credentials.secret,
 			redirectUrl,
+			isCordova,
 		}), 'utf-8');
 	};
 });
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "4.0.4"
+	"version": "4.0.5"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "4.0.4",
+	"version": "4.0.5",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 -ENV RC_VERSION 4.0.4
 +ENV RC_VERSION 4.0.5
 MAINTAINER [email protected]
Original file line number	Diff line number	Diff line change
`@@ -66254,6 +66254,29 @@`
`66254`	`66254`	`]`
`66255`	`66255`	`}`
`66256`	`66256`	`]`
	`66257`	`+ },`
	`66258`	`+ "4.0.5": {`
	`66259`	`+ "node_version": "12.22.1",`
	`66260`	`+ "npm_version": "6.14.1",`
	`66261`	`+ "apps_engine_version": "1.28.0",`
	`66262`	`+ "mongo_versions": [`
	`66263`	`+ "3.6",`
	`66264`	`+ "4.0",`
	`66265`	`+ "4.2",`
	`66266`	`+ "4.4",`
	`66267`	`+ "5.0"`
	`66268`	`+ ],`
	`66269`	`+ "pull_requests": [`
	`66270`	`+ {`
	`66271`	`+ "pr": "23541",`
	`66272`	`+ "title": "[FIX] OAuth login not working on mobile app",`
	`66273`	`+ "userLogin": "pierre-lehnen-rc",`
	`66274`	`+ "milestone": "4.0.5",`
	`66275`	`+ "contributors": [`
	`66276`	`+ "pierre-lehnen-rc"`
	`66277`	`+ ]`
	`66278`	`+ }`
	`66279`	`+ ]`
`66257`	`66280`	`}`
`66258`	`66281`	`}`
`66259`	`66282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "4.0.4"`
	`2`	`+ "version": "4.0.5"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Rocket.Chat",`
`3`	`3`	`"description": "The Ultimate Open Source WebChat Platform",`
`4`		`- "version": "4.0.4",`
	`4`	`+ "version": "4.0.5",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Rocket.Chat",`
`7`	`7`	`"url": "https://rocket.chat/"`