Implemented client side checks of authorizeRoomJoin flag.

static/js/directives/welcome.js

@@ -32,6 +32,7 @@ define([], function() {
 
 			$scope.randomRoom = rooms.randomRoom;
 			$scope.canCreateRooms = rooms.canCreateRooms;
+			$scope.canJoinRooms = rooms.canJoinRooms;
 			$scope.joinRoomByName = function(name) {
 				if ($scope.welcome.$invalid) {
 					return;

static/js/services/rooms.js

@@ -34,7 +34,8 @@ define([
 		var helloedRoomName = null;
 		var currentRoom = null;
 		var randomRoom = null;
-		var canCreateRooms = !mediaStream.config.AuthorizeRoomCreation;
+		var canJoinRooms = !mediaStream.config.AuthorizeRoomJoin;
+		var canCreateRooms = canJoinRooms ? !mediaStream.config.AuthorizeRoomCreation : false;
 
 		var joinFailed = function(error) {
 			setCurrentRoom(null);
@@ -144,10 +145,11 @@ define([
 
 		appData.e.on("selfReceived", function(event, data) {
 			_.defer(joinRequestedRoom);
-			if (mediaStream.config.AuthorizeRoomCreation && !$rootScope.myuserid) {
+			canJoinRooms = (!mediaStream.config.AuthorizeRoomJoin || $rootScope.myuserid) ? true : false
-				canCreateRooms = false;
+			if (canJoinRooms) {
+				canCreateRooms = (!mediaStream.config.AuthorizeRoomCreation || $rootScope.myuserid) ? true : false;
 			} else {
-				canCreateRooms = true;
+				canCreateRooms = false;
 			}
 		});
 
@@ -206,6 +208,9 @@ define([
 			canCreateRooms: function() {
 				return canCreateRooms;
 			},
+			canJoinRooms: function() {
+				return canJoinRooms;
+			},
 			joinByName: function(name, replace) {
 				name = $window.encodeURIComponent(name);
 				name = name.replace(/^%40/, "@");

static/partials/page/welcome.html

@@ -1,6 +1,6 @@
-<div welcome ng-form="welcome" class="welcome container-fluid" ng-show="!peer">
+<div welcome ng-form="welcome" class="welcome container-fluid" ng-show="!peer" ng-controller="UsersettingsController as usersettings">
 	<div class="welcome-logo"></div>
-	<div class="welcome-container" ng-controller="UsersettingsController as usersettings">
+	<div ng-if="canJoinRooms()" class="welcome-container">
 		<h1>{{_("Enter a room name")}}</h1>
 		<div class="form-group welcome-input" ng-class="{'has-error': welcome.$invalid, 'has-success': welcome.$valid && roomdata.name}">
 			<input type="text" class="form-control roomdata-link-input input-lg" ng-model="roomdataInput.name" ng-maxlength="30" on-enter="joinRoomByName(roomdata.name)" placeholder="{{roomdata.placeholder}}">
@@ -23,4 +23,10 @@
 			<a ng-repeat="room in roomsHistory" ng-click="joinRoomByName(room)"><span class="label label-default">{{room}}</span></a>
 		</p>
 	</div>
+	<div ng-if="!canJoinRooms()" class="welcome-container">
+		<div class="welcome-login">
+			<p class="h4">{{_("Please sign in.")}}</p>
+			<button ng-if="!myuserid && usersettings.loginUserid" type="button" class="btn btn-primary" ng-click="usersettings.loginUserid()">{{_('Sign in')}}</button>
+		</div>
+	</div>
 </div>