Browse Source

Support iframe certificate login.

pull/28/head
Simon Eisenmann 11 years ago
parent
commit
4cb46e3829
  1. 16
      static/js/services/mediastream.js
  2. 1
      static/partials/settings.html

16
static/js/services/mediastream.js

@ -84,6 +84,22 @@ define([ @@ -84,6 +84,22 @@ define([
idE=null;
sidE=null;
}, 0);
var retries = 0;
var authorize = function() {
mediaStream.users.authorize({}, function(data) {
console.info("Retrieved nonce - authenticating as user:", data.userid);
mediaStream.api.requestAuthentication(data.userid, data.nonce);
delete data.nonce;
}, function(data, status) {
retries++;
if (retries <= 10) {
$timeout(authorize, 2000);
} else {
console.error("Failed to authorize session", status, data);
}
});
};
$timeout(authorize, 1500);
} else {
// AJAX mode.
var data = {

1
static/partials/settings.html

@ -55,7 +55,6 @@ @@ -55,7 +55,6 @@
<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>
<hr/>
<div ng-show="mediaSources.supported" class="form-group">

Loading…
Cancel
Save