This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

merge hotfix for issue #754 into beta: train-2011.12.08

  • Loading branch information...
lloyd committed Dec 14, 2011
2 parents 33770f2 + c7a2c62 commit f8c2efd65190c4f414759c4a228ebc6778be5e96
View
@@ -38,6 +38,7 @@ train-2011.12.01:
* (hotfix on 2011.12.02) Fix regression where emails sent out had no newlines: #684
* (hotfix on 2011.12.08) Fix bug where domain key update detection was not working properly, preventing users from logging in: #734
* (hotfix on 2011.12.08) Fix bugs in "internal api" used by native code (like openwebapps stuff): #601
+ * (hotfix on 2011.12.14) Fix required email -> forgot password -> cancel button (was non-operational): #754
train-2011.11.17:
* frontend code restructuring and refactoring
@@ -64,7 +64,7 @@ BrowserID.Modules.Dialog = (function() {
email: email,
verifier: verifier,
verificationMessage: message
- });
+ });
controller.startCheck();
}
@@ -245,8 +245,7 @@ BrowserID.Modules.Dialog = (function() {
user.checkAuthenticationAndSync(function onSuccess() {},
function onComplete(authenticated) {
if (self.requiredEmail) {
- // XXX get this out of here and into the state machine!
- self.doAuthenticateWithRequiredEmail({
+ self.publish("authenticate_with_required_email", {
email: self.requiredEmail,
authenticated: authenticated
});
@@ -55,7 +55,7 @@
var args = [].slice.call(arguments, 1),
controller = this.controller;
- // Remember the state and the information for the state in case we have to
+ // Remember the state and the information for the state in case we have to
// go back to it.
stateStack.push({
funcName: funcName,
@@ -65,7 +65,7 @@
controller[funcName].apply(controller, args);
}
- // Used for when the current state is being cancelled and the user wishes to
+ // Used for when the current state is being cancelled and the user wishes to
// go to the previous state.
function popState() {
// Skip the first state, it is where the user is at now.
@@ -85,7 +85,7 @@
controller = self.controller,
gotoState = pushState.bind(self),
cancelState = popState.bind(self);
-
+
subscribe("offline", function(msg, info) {
gotoState("doOffline");
});
@@ -102,6 +102,10 @@
gotoState("doEmailConfirmed");
});
+ subscribe("authenticate_with_required_email", function(msg, info) {
+ gotoState("doAuthenticateWithRequiredEmail", info);
+ });
+
subscribe("pick_email", function() {
gotoState("doPickEmail");
});
@@ -161,15 +165,15 @@
}
var StateMachine = BrowserID.Class({
- init: function() {
+ init: function() {
// empty
},
start: function(options) {
options = options || {};
this.controller = options.controller;
startStateMachine.call(this);
- },
+ },
stop: function() {
unsubscribeAll();
View
@@ -2,7 +2,7 @@
Name: browserid-server
Version: 0.2011.12.08
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: BrowserID server
Packager: Pete Fritchman <petef@mozilla.com>
Group: Development/Libraries

0 comments on commit f8c2efd

Please sign in to comment.