Merge pull request #678 from assistify/release/3.6.3

Release 3.6.3

.circleci/update-releases.sh

@@ -2,9 +2,9 @@
 set -euvo pipefail
 IFS=$'\n\t'
 
-curl -X POST \
--H "X-Update-Token: ${UPDATE_TOKEN}" \
-https://releases.rocket.chat/update
+curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
+    "{\"commit\": \"$CIRCLE_SHA1\", \"tag\": \"$RC_VERSION\", \"branch\": \"$CIRCLE_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\" }" \
+    https://releases.rocket.chat/update
 
 # Makes build fail if the release isn't there
 curl --fail https://releases.rocket.chat/$RC_VERSION/info

.docker-mongo/Dockerfile

@@ -1,24 +1,40 @@
-FROM rocketchat/base:12.16.1
+FROM node:12.18.4-buster-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 
+# Install MongoDB and dependencies
 RUN set -x \
- && apt-get update \
- && apt-get install -y wget \
- && wget -qO - https://www.mongodb.org/static/pgp/server-4.0.asc | apt-key add - \
- && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
- && apt-get update \
- && apt-get install -y pwgen mongodb-org \
- && apt-get clean my room
+    && apt-get update \
+    && apt-get install -y wget gnupg dirmngr pwgen \
+    && wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - \
+    && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list \
+    && apt-get update \
+    && apt-get install -y mongodb-org fontconfig \
+    && apt-get clean my room \
+    && groupadd -g 65533 -r rocketchat \
+    && useradd -u 65533 -r -g rocketchat rocketchat \
+    && mkdir -p /app/uploads \
+    && chown rocketchat:rocketchat /app/uploads
 
 ADD . /app
 ADD entrypoint.sh /app/bundle/
 
-RUN set -x \
- && cd /app/bundle/programs/server \
- && npm install \
- && npm cache clear --force \
- && chown -R rocketchat:rocketchat /app
+RUN aptMark="$(apt-mark showmanual)" \
+    && apt-get install -y --no-install-recommends g++ make python ca-certificates \
+    && cd /app/bundle/programs/server \
+    && npm install \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $aptMark > /dev/null \
+    && find /usr/local -type f -executable -exec ldd '{}' ';' \
+       | awk '/=>/ { print $(NF-1) }' \
+       | sort -u \
+       | xargs -r dpkg-query --search \
+       | cut -d: -f1 \
+       | sort -u \
+       | xargs -r apt-mark manual \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && npm cache clear --force \
+    && chown -R rocketchat:rocketchat /app
 
 VOLUME /app/uploads
 

.docker-mongo/entrypoint.sh

@@ -39,7 +39,7 @@ echo """
 ╚═╝  ╚═╝ ╚═════╝  ╚═════╝╚═╝  ╚═╝╚══════╝   ╚═╝╚═╝ ╚═════╝╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝       ╚═╝     ╚═╝  ╚═╝╚══════╝  ╚═══╝  ╚═╝╚══════╝ ╚══╝╚══╝
 """
 
-mongod --smallfiles --storageEngine=mmapv1 --fork --replSet rs0 --config /etc/mongod.conf
+mongod --fork --replSet rs0 --config /etc/mongod.conf
 
 until mongo --eval "db" &> /dev/null; do
 	echo "MongoDB still not ready, sleeping"

.docker/Dockerfile

@@ -1,14 +1,33 @@
-FROM rocketchat/base:12.16.1
-
-ADD . /app
+FROM node:12.18.4-buster-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 
-RUN set -x \
- && cd /app/bundle/programs/server \
- && npm install \
- && npm cache clear --force \
- && chown -R rocketchat:rocketchat /app
+# dependencies
+RUN groupadd -g 65533 -r rocketchat \
+    && useradd -u 65533 -r -g rocketchat rocketchat \
+    && mkdir -p /app/uploads \
+    && chown rocketchat:rocketchat /app/uploads \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends fontconfig
+
+ADD . /app
+
+RUN aptMark="$(apt-mark showmanual)" \
+    && apt-get install -y --no-install-recommends g++ make python ca-certificates \
+    && cd /app/bundle/programs/server \
+    && npm install \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $aptMark > /dev/null \
+    && find /usr/local -type f -executable -exec ldd '{}' ';' \
+       | awk '/=>/ { print $(NF-1) }' \
+       | sort -u \
+       | xargs -r dpkg-query --search \
+       | cut -d: -f1 \
+       | sort -u \
+       | xargs -r apt-mark manual \
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && npm cache clear --force \
+    && chown -R rocketchat:rocketchat /app
 
 USER rocketchat
 

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.2.2
+ENV RC_VERSION 3.8.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

.eslintignore

@@ -9,13 +9,12 @@ packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
 app/theme/client/vendor/
 app/ui/client/lib/Modernizr.js
-public/mp3-realtime-worker.js
-public/lame.min.js
 public/packages/rocketchat_videobridge/client/public/external_api.js
 packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
 private/moment-locales/
 public/livechat/
 !.scripts
 public/pdf.worker.min.js
+public/workers/**/*
 imports/client/
 !/.storybook/

.eslintrc

@@ -11,7 +11,8 @@
     "jscolor": false
   },
   "plugins": [
-    "react"
+    "react",
+    "react-hooks"
   ],
   "rules": {
     "jsx-quotes": [
@@ -24,7 +25,9 @@
     "react/jsx-fragments": [
       "error",
       "syntax"
-    ]
+    ],
+    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/exhaustive-deps": "warn"
   },
   "settings": {
     "import/resolver": {
@@ -70,10 +73,15 @@
         "@typescript-eslint"
       ],
       "rules": {
+        "func-call-spacing": "off",
         "jsx-quotes": [
           "error",
           "prefer-single"
         ],
+        "indent": "off",
+        "no-extra-parens": "off",
+        "no-spaced-func": "off",
+        "no-useless-constructor": "off",
         "react/jsx-uses-react": "error",
         "react/jsx-uses-vars": "error",
         "react/jsx-no-undef": "error",
@@ -84,7 +92,21 @@
         "@typescript-eslint/ban-ts-ignore": "off",
         "@typescript-eslint/indent": [
           "error",
-          "tab"
+          "tab",
+          {
+            "SwitchCase": 1
+          }
+        ],
+        "@typescript-eslint/no-extra-parens": [
+          "error",
+          "all",
+          {
+            "conditionalAssign": true,
+            "nestedBinaryExpressions": false,
+            "returnAssign": true,
+            "ignoreJSX": "all",
+            "enforceForArrowConditionals": false
+          }
         ],
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/interface-name-prefix": [

.github/CONTRIBUTING.md

@@ -1,42 +1,27 @@
 # Contributing to Rocket.Chat
 
-:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+**First off, thanks for taking the time to contribute! :tada::+1:**
 
-The following is a set of guidelines for contributing to Rocket.Chat and its packages, which are hosted in the [Rocket.Chat Organization](https://github.com/RocketChat) on GitHub.
+> There are many ways to contribute to Rocket.Chat even if you're not technical or a developer:
+>
+> * Email us at marketing@rocket.chat to tell us how much you love the project
+> * Write about us in your blogs
+> * Fix some small typos in our [documentation](https://docs.rocket.chat/contributing)
+> * Become our [GitHub sponsor](https://github.com/sponsors/RocketChat)
+> * Tell others about us and help us spread the word
+>
+> Every bit of contribution is appreciated 🙂 thank you!
 
-__Note:__ If there's a feature you'd like, there's a bug you'd like to fix, or you'd just like to get involved please raise an issue and start a conversation. We'll help as much as we can so you can get contributing - although we may not always be able to respond right away :)
-
-## ECMAScript 2015 vs CoffeeScript
-
-While we still have a lot of CoffeeScript files you should not create new ones. New code contributions should be in **ECMAScript 2015**.
-
-## Coding standards
-
-Most of the coding standards are covered by `.editorconfig` and `.eslintrc.js`.
-
-Things not covered by `eslint`:
+The following is a set of guidelines for contributing to Rocket.Chat, which are hosted in the [Rocket.Chat Organization](https://github.com/RocketChat) on GitHub.
 
-* `exports`/`module.exports` should be at the end of the file
-* Longer, descriptive variable names are preferred, e.g. `error` vs `err`
-
-We acknowledge all the code does not meet these standards but we are working to change this over time.
-
-### Syntax check
-
-Before submitting a PR you should get no errors on `eslint`.
-
-To check your files, first install `eslint`:
+__Note:__ If there's a feature you'd like, there's a bug you'd like to fix, or you'd just like to get involved please raise an issue and start a conversation. We'll help as much as we can so you can get contributing - although we may not always be able to respond right away :)
 
-```
-npm install -g eslint
-```
+## Development Guidelines
 
-Then run:
+Check out our Handbook for the [Development Guidelines](https://handbook.rocket.chat/product/development/development-guidelines) on how to setup your enviroment, do code, test and push your code. There you find our patterns on how to compose your Pull Requests' titles to have your contribution accepted.
 
-```
-eslint .
-```
+## Contributor License Agreement
 
-# Contributor License Agreement
+To have your contribution accepted you must sign our [Contributor License Agreement](https://cla-assistant.io/RocketChat/Rocket.Chat). In case you submit a Pull Request before sign the CLA GitHub will alert you with a new comment asking you to sign and will block the Pull Request from be merged by us.
 
 Please review and sign our CLA at https://cla-assistant.io/RocketChat/Rocket.Chat

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,46 @@
-<!-- INSTRUCTION: Your Pull Request name should start with one of the following tags -->
+<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
+<!-- Your Pull Request name should start with one of the following tags -->
 <!-- [NEW] For new features -->
 <!-- [FIX] For bug fixes -->
 <!-- [BREAK] For pull requests including breaking changes -->
 
-<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
-Closes #ISSUE_NUMBER
+## Proposed changes
+<!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue below. -->
 
-<!-- INSTRUCTION: Link to a https://github.com/RocketChat/docs PR with added/updated documentation or an update to the missing/outdated documentation list, see https://rocket.chat/docs/contributing/documentation/  -->
+## Issue(s)
+<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
+
+## How to test or reproduce
+<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
+
+## Screenshots
+
+## Types of changes
+<!-- What types of changes does your code introduce to Rocket.Chat? -->
+<!-- Put an `x` in the boxes that apply -->
+
+- [ ] Bugfix (non-breaking change which fixes an issue)
+- [ ] Improvement (non-breaking change which improves a current function)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Hotfix (a major bugfix that has to be merged asap)
+- [ ] Documentation Update (if none of the other choices apply)
+
+## Checklist
+<!-- Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code. -->
+
+- [ ] I have read the [CONTRIBUTING](https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat) doc
+- [ ] I have signed the [CLA](https://cla-assistant.io/RocketChat/Rocket.Chat)
+- [ ] Lint and unit tests pass locally with my changes
+- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
+- [ ] I have added necessary documentation (if applicable)
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+## Changelog
+<!-- CHANGELOG -->
+<!-- Enter HERE a brief text that would go up on the changelog on our releases page -->
+<!-- END CHANGELOG -->
+
+## Further comments
+<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
 
-<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->

.github/history-manual.json

@@ -21,5 +21,12 @@
 		"title": "[BREAK] TLS v1.0 and TLS v1.1 were disabled by due to NodeJS update to v12. You can still enable them by using flags like `--tls-min-v1.0` and `--tls-min-v1.1`",
 		"userLogin": "sampaiodiego",
 		"contributors": []
+	}],
+	"3.6.0-rc.0": [{
+		"pr": "18642",
+		"title": "[NEW] Admin option to reset other users’ E2E encryption key",
+		"userLogin": "rodrigok",
+		"contributors": [],
+		"description": "Requires the 2FA password fallback enforcement enabled to work"
 	}]
 }