Implemented settings users controller as overrideable.

static/js/controllers/controllers.js

@@ -24,13 +24,15 @@ define([
 	'controllers/mediastreamcontroller',
 	'controllers/statusmessagecontroller',
 	'controllers/chatroomcontroller',
-	'controllers/roomchangecontroller'], function(_, MediastreamController, StatusmessageController, ChatroomController, RoomchangeController) {
+	'controllers/roomchangecontroller',
+	'controllers/usersettingscontroller'], function(_, MediastreamController, StatusmessageController, ChatroomController, RoomchangeController, UsersettingsController) {
 
 	var controllers = {
 		MediastreamController: MediastreamController,
 		StatusmessageController: StatusmessageController,
 		ChatroomController: ChatroomController,
-		RoomchangeController: RoomchangeController
+		RoomchangeController: RoomchangeController,
+		UsersettingsController: UsersettingsController
 	};
 
 	var initialize = function(angModule) {

static/js/controllers/usersettingscontroller.js

@@ -0,0 +1,66 @@
+/*
+ * Spreed WebRTC.
+ * Copyright (C) 2013-2014 struktur AG
+ *
+ * This file is part of Spreed WebRTC.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+define([], function() {
+
+	// UsersettingsController
+	return ["$scope", "$element", "mediaStream", function($scope, $element, mediaStream) {
+
+		$scope.withUsersForget = true;
+
+		this.registerUserid = function(btn) {
+
+			var successHandler = function(data) {
+				console.info("Created new userid:", data.userid);
+				// If the server provided us a nonce, we can do everthing on our own.
+				mediaStream.users.store(data);
+				$scope.loadedUserlogin = true;
+				safeApply($scope);
+				// Directly authenticate ourselves with the provided nonce.
+				mediaStream.api.requestAuthentication(data.userid, data.nonce);
+				delete data.nonce;
+			};
+
+			console.log("No userid - creating one ...");
+			mediaStream.users.register(btn.form, function(data) {
+				if (data.nonce) {
+					successHandler(data);
+				} else {
+					// No nonce received. So this means something we cannot do on our own.
+					// Make are GET request and retrieve nonce that way and let the
+					// browser/server do the rest.
+					mediaStream.users.authorize(data, successHandler, function(data, status) {
+						console.error("Failed to get nonce after create", status, data);
+					});
+				}
+			}, function(data, status) {
+				console.error("Failed to create userid", status, data);
+			});
+
+		};
+
+		this.forgetUserid = function() {
+			mediaStream.users.forget();
+			mediaStream.connector.forgetAndReconnect();
+		};
+
+	}];
+
+});

static/js/directives/settings.js

@@ -74,42 +74,6 @@ define(['jquery', 'underscore', 'text!partials/settings.html'], function($, _, t
 				});
 			};
 
-			$scope.registerUserid = function(btn) {
-
-				var successHandler = function(data) {
-					console.info("Created new userid:", data.userid);
-					// If the server provided us a nonce, we can do everthing on our own.
-					mediaStream.users.store(data);
-					$scope.loadedUserlogin = true;
-					safeApply($scope);
-					// Directly authenticate ourselves with the provided nonce.
-					mediaStream.api.requestAuthentication(data.userid, data.nonce);
-					delete data.nonce;
-				};
-
-				console.log("No userid - creating one ...");
-				mediaStream.users.register(btn.form, function(data) {
-					if (data.nonce) {
-						successHandler(data);
-					} else {
-						// No nonce received. So this means something we cannot do on our own.
-						// Make are GET request and retrieve nonce that way and let the
-						// browser/server do the rest.
-						mediaStream.users.authorize(data, successHandler, function(data, status) {
-							console.error("Failed to get nonce after create", status, data);
-						});
-					}
-				}, function(data, status) {
-					console.error("Failed to create userid", status, data);
-				});
-
-			};
-
-			$scope.forgetUserid = function() {
-				mediaStream.users.forget();
-				mediaStream.connector.forgetAndReconnect();
-			};
-
 			$scope.checkDefaultMediaSources = function() {
 				if ($scope.master.settings.microphoneId && !$scope.mediaSources.hasAudioId($scope.master.settings.microphoneId)) {
 					$scope.master.settings.microphoneId = null;

static/partials/settings.html

@@ -19,35 +19,35 @@
           <span class="help-block">{{_('Your picture and name are visible to others.')}}</span>
         </div>
       </div>
-      <div class="form-group" ng-if="(withUsers && withUsersRegistration) || userid">
+      <div ng-controller="UsersettingsController as usersettings">
-        <label class="col-xs-4 control-label">{{_('Your ID')}}</label>
+        <div class="form-group" ng-if="(withUsers && withUsersRegistration) || userid">
-        <div ng-switch="withUsersMode">
+          <label class="col-xs-4 control-label">{{_('Your ID')}}</label>
-          <form ng-switch-when="certificate" class="col-xs-8" target="users_registration_certificate_iframe">
+          <div ng-switch="withUsersMode">
-            <div ng-if="!userid">
+            <form ng-switch-when="certificate" class="col-xs-8" target="users_registration_certificate_iframe">
-              <keygen style="display:none" name="pubkey"/>
+              <div ng-if="!userid">
+                <keygen style="display:none" name="pubkey"/>
+                <label ng-if="!userid && withUsersRegistration">
+                  <button class="btn btn-small btn-primary" ng-click="usersettings.registerUserid($event.target)">{{_('Register')}}</button>
+                </label>
+                <iframe style="display:none" name="users_registration_certificate_iframe"></iframe>
+              </div>
+              <div ng-if="userid">
+                <pre class="small">{{userid}}</pre>
+                <span class-"help-block">{{_('Authenticated by certificate. To log out you have to remove your certificate from the browser.')}}</span>
+              </div>
+            </form>
+            <div ng-switch-default class="col-xs-8">
               <label ng-if="!userid && withUsersRegistration">
-                <button class="btn btn-small btn-primary" ng-click="registerUserid($event.target)">{{_('Register')}}</button>
+                <button ng-if="usersettings.loginUserid" class="btn btn-small btn-primary" ng-click="usersettings.loginUserid()">{{_('Login')}}</button>
+                <button class="btn btn-small btn-default" ng-click="usersettings.registerUserid($event.target)">{{_('Register')}}</button>
+              </label>
+              <pre class="small" ng-if="userid">{{userid}}</pre>
+              <label ng-if="userid && withUsersForget">
+                <button class="btn btn-small btn-default" ng-click="usersettings.forgetUserid()">{{_('Log out')}}</button>
               </label>
-              <iframe style="display:none" name="users_registration_certificate_iframe"></iframe>
-            </div>
-            <div ng-if="userid">
-              <pre class="small">{{userid}}</pre>
-              <span class-"help-block">{{_('Authenticated by certificate. To log out you have to remove your certificate from the browser.')}}</span>
             </div>
-          </form>
-          <div ng-switch-default class="col-xs-8">
-            <label ng-if="!userid && withUsersRegistration">
-              <button class="btn btn-small btn-primary" ng-click="registerUserid($event.target)">{{_('Register')}}</button>
-            </label>
-            <pre class="small" ng-if="userid">{{userid}}</pre>
-            <label ng-if="userid && loadedUserlogin">
-              <button class="btn btn-small btn-default" ng-click="forgetUserid()">{{_('Log out')}}</button>
-            </label>
           </div>
         </div>
-        <div class="col-xs-8 col-xs-offset-4" ng-if="!userid && withUsersRegistration">
-          <span class="help-block">{{_('Only register an ID if this is your private browser.')}}</span>
-        </div>
       </div>
       <div ng-show="mediaSources.supported">
         <hr/>