Merge upstream

README.md

@@ -65,6 +65,11 @@ Support this project by becoming a sponsor. Your name will show up in the Contri
           Alexander Casassovici<br />(@alexksso)
         </a>
       </td>
+      <td align="center" valign="middle" width="148">
+        <a href="https://github.com/broxen" target="_blank">
+          Broxen<br />(@broxen)
+        </a>
+      </td>
       <td align="center" valign="middle" width="148">
         <a href="https://github.com/xDacon" target="_blank">
           Dacon<br />(@xDacon)
@@ -85,11 +90,6 @@ Support this project by becoming a sponsor. Your name will show up in the Contri
           Oleksii<br />(@idokka)
         </a>
       </td>
-      <td align="center" valign="middle" width="148">
-        <a href="https://github.com/TheodoreChu" target="_blank">
-          Theodore Chu<br />(@TheodoreChu)
-        </a>
-      </td>
       <!--<td align="center" valign="middle" width="148">
         <a href="https://github.com/sponsors/NGPixel" target="_blank">
           <img src="https://static.requarks.io/sponsors/become-148x72.png">
@@ -110,6 +110,7 @@ Support this project by becoming a sponsor. Your name will show up in the Contri
 - Dragan Espenschied ([@despens](https://github.com/despens))
 - Elijah Zobenko ([@he110](https://github.com/he110))
 - Ernie ([@iamernie](https://github.com/iamernie))
+- Fabio Ferrari ([@devxops](https://github.com/devxops))
 - Florian Moss ([@florianmoss](https://github.com/florianmoss))
 - HeavenBay ([@HeavenBay](https://github.com/heavenbay))
 - Jaimyn Mayer ([@jabelone](https://github.com/jabelone))
@@ -127,6 +128,7 @@ Support this project by becoming a sponsor. Your name will show up in the Contri
 - Robert Lanzke ([@winkelement](https://github.com/winkelement))
 - Sam Martin ([@winkelement](https://github.com/ABitMoreDepth))
 - Sean Coffey ([@seanecoffey](https://github.com/seanecoffey))
+- Theodore Chu ([@TheodoreChu](https://github.com/TheodoreChu))
 - Victor Bilgin ([@vbilgin](https://github.com/vbilgin))
 - VMO Solutions ([@vmosolutions](https://github.com/vmosolutions))
 - aniketpanjwani ([@aniketpanjwani](https://github.com/aniketpanjwani))

server/modules/authentication/rocketchat/authentication.js

@@ -23,7 +23,7 @@ module.exports = {
           cb(null, {
             id: usr._id,
             displayName: _.isEmpty(usr.name) ? usr.username : usr.name,
-            email: usr.email,
+            email: usr.emails[0].address,
             picture: usr.avatarUrl
           })
         } catch (err) {

server/setup.js

@@ -288,7 +288,7 @@ module.exports = () => {
       // Create root administrator
       WIKI.logger.info('Creating root administrator...')
       const adminUser = await WIKI.models.users.query().insert({
-        email: req.body.adminEmail,
+        email: req.body.adminEmail.toLowerCase(),
         provider: 'local',
         password: req.body.adminPassword,
         name: 'Administrator',