diff --git a/src/app/spreed-speakfreely-server/config.go b/src/app/spreed-speakfreely-server/config.go index fe3fec09..f3b4c2d3 100644 --- a/src/app/spreed-speakfreely-server/config.go +++ b/src/app/spreed-speakfreely-server/config.go @@ -37,12 +37,13 @@ type Config struct { Version string // Server version number UsersEnabled bool // Flag if users are enabled UsersAllowRegistration bool // Flag if users can register + UsersMode string // Users mode string Plugin string // Plugin to load globalRoomid string // Id of the global room (not exported to Javascript) defaultRoomEnabled bool // Flag if default room ("") is enabled } -func NewConfig(title, ver, runtimeVersion, basePath, serverToken string, stunURIs, turnURIs []string, tokens bool, globalRoomid string, defaultRoomEnabled, usersEnabled, usersAllowRegistration bool, plugin string) *Config { +func NewConfig(title, ver, runtimeVersion, basePath, serverToken string, stunURIs, turnURIs []string, tokens bool, globalRoomid string, defaultRoomEnabled, usersEnabled, usersAllowRegistration bool, usersMode, plugin string) *Config { sv := fmt.Sprintf("static/ver=%s", ver) return &Config{ Title: title, @@ -56,6 +57,7 @@ func NewConfig(title, ver, runtimeVersion, basePath, serverToken string, stunURI Version: runtimeVersion, UsersEnabled: usersEnabled, UsersAllowRegistration: usersAllowRegistration, + UsersMode: usersMode, Plugin: plugin, globalRoomid: globalRoomid, defaultRoomEnabled: defaultRoomEnabled, diff --git a/src/app/spreed-speakfreely-server/main.go b/src/app/spreed-speakfreely-server/main.go index cadac032..bbb1c6a1 100644 --- a/src/app/spreed-speakfreely-server/main.go +++ b/src/app/spreed-speakfreely-server/main.go @@ -286,6 +286,8 @@ func runner(runtime phoenix.Runtime) error { serverRealm = "local" } + usersMode, _ := runtime.GetString("users", "mode") + // Create token provider. var tokenProvider TokenProvider if tokenFile != "" { @@ -294,7 +296,7 @@ func runner(runtime phoenix.Runtime) error { } // Create configuration data structure. - config = NewConfig(title, ver, runtimeVersion, basePath, serverToken, stunURIs, turnURIs, tokenProvider != nil, globalRoomid, defaultRoomEnabled, usersEnabled, usersAllowRegistration, plugin) + config = NewConfig(title, ver, runtimeVersion, basePath, serverToken, stunURIs, turnURIs, tokenProvider != nil, globalRoomid, defaultRoomEnabled, usersEnabled, usersAllowRegistration, usersMode, plugin) // Load templates. tt := template.New("") @@ -377,7 +379,7 @@ func runner(runtime phoenix.Runtime) error { api.AddResourceWithWrapper(&Tokens{tokenProvider}, httputils.MakeGzipHandler, "/tokens") if usersEnabled { // Create Users handler. - users := NewUsers(hub, serverRealm, runtime) + users := NewUsers(hub, usersMode, serverRealm, runtime) api.AddResource(&Sessions{hub: hub, users: users}, "/sessions/{id}/") if usersAllowRegistration { api.AddResource(users, "/users") diff --git a/src/app/spreed-speakfreely-server/users.go b/src/app/spreed-speakfreely-server/users.go index f60b0bf7..972b0aa6 100644 --- a/src/app/spreed-speakfreely-server/users.go +++ b/src/app/spreed-speakfreely-server/users.go @@ -252,7 +252,7 @@ type Users struct { handler UsersHandler } -func NewUsers(hub *Hub, realm string, runtime phoenix.Runtime) *Users { +func NewUsers(hub *Hub, mode, realm string, runtime phoenix.Runtime) *Users { var users = &Users{ hub: hub, @@ -263,7 +263,6 @@ func NewUsers(hub *Hub, realm string, runtime phoenix.Runtime) *Users { var err error // Create handler based on mode. - mode, _ := runtime.GetString("users", "mode") if handler, err = users.createHandler(mode, runtime); err == nil { users.handler = handler // Register handler Get at the hub. diff --git a/static/js/directives/settings.js b/static/js/directives/settings.js index 87e04a88..a7c9869e 100644 --- a/static/js/directives/settings.js +++ b/static/js/directives/settings.js @@ -39,6 +39,7 @@ define(['underscore', 'text!partials/settings.html'], function(_, template) { ]; $scope.withUsers = mediaStream.config.UsersEnabled; $scope.withUsersRegistration = mediaStream.config.UsersAllowRegistration; + $scope.withUsersMode = mediaStream.config.UsersMode; _.each(availableLanguages, function(name, code) { $scope.availableLanguages.push({ diff --git a/static/js/services/mediastream.js b/static/js/services/mediastream.js index 63ecab90..a71b0d1c 100644 --- a/static/js/services/mediastream.js +++ b/static/js/services/mediastream.js @@ -68,6 +68,7 @@ define([ register: function(form, success_cb, error_cb) { var url = mediaStream.url.api("users"); if (form) { + // Form submit mode. $(form).attr("action", url).attr("method", "POST"); var idE = $(''); idE.val(mediaStream.api.id); @@ -76,7 +77,6 @@ define([ $(form).append(idE); $(form).append(sidE); var iframe = $(form).find("iframe"); - console.log("xxxx", iframe[0]); form.submit(); $timeout(function() { idE.remove(); @@ -85,6 +85,7 @@ define([ sidE=null; }, 0); } else { + // AJAX mode. var data = { id: mediaStream.api.id, sid: mediaStream.api.sid @@ -113,12 +114,6 @@ define([ }, authorize: function(data, success_cb, error_cb) { var url = mediaStream.url.api("sessions") + "/" + mediaStream.api.id + "/"; - /*var data = { - id: mediaStream.api.id, - sid: mediaStream.api.sid, - useridcombo: useridCombo, - secret: secret - }*/ var login = _.clone(data); login.id = mediaStream.api.id; login.sid = mediaStream.api.sid; diff --git a/static/partials/settings.html b/static/partials/settings.html index f4096157..a5b3c6ae 100644 --- a/static/partials/settings.html +++ b/static/partials/settings.html @@ -28,26 +28,30 @@
- -
- - - 
{{userid}}
- -
- -
- - 
{{userid}}
- +
+
+
+ + + +
+
+ 
{{userid}}
+ {{_('Authenticated by certificate.')}} +
+
+
+ + 
{{userid}}
+ +
-
{{_('Only register an ID if this is your private browser.')}}