From e9eb38fd74cb13e85a0d31cd359894a1eea5d535 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 19 Jan 2017 11:05:08 +0100
Subject: [PATCH] Update propTypes and do null checks

---
 src/components/structures/login/Registration.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index f89b627e8d..b092e0a9fb 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -57,6 +57,11 @@ module.exports = React.createClass({
                 "name": React.PropTypes.string,
                 // The suffix with which every team email address ends
                 "emailSuffix": React.PropTypes.string,
+                // The rooms to use during auto-join
+                "rooms": React.PropTypes.arrayOf(React.PropTypes.shape({
+                    "id": React.PropTypes.string,
+                    "autoJoin": React.PropTypes.bool,
+                })),
             })).required,
         }),
 
@@ -180,11 +185,14 @@ module.exports = React.createClass({
             });
 
             // Auto-join rooms
-            if (self.props.teamsConfig) {
+            if (self.props.teamsConfig && self.props.teamsConfig.teams) {
                 for (let i = 0; i < self.props.teamsConfig.teams.length; i++) {
                     let team = self.props.teamsConfig.teams[i];
                     if (self.state.formVals.email.endsWith(team.emailSuffix)) {
                         console.log("User successfully registered with team " + team.name);
+                        if (!team.rooms) {
+                            break;
+                        }
                         team.rooms.forEach((room) => {
                             if (room.autoJoin) {
                                 console.log("Auto-joining " + room.id);