Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: work better if there is only one LoginMethod 

If there is only 1 login method and local logins are disabled
take user directly to the login provider
This commit is contained in:
Sam 2014-08-14 15:13:11 +10:00
parent f2b6846070
commit 985b356fe9
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/assets/javascripts/discourse/routes/application.js.es6
View File

@ -23,6 +23,8 @@ var ApplicationRoute = Em.Route.extend({
}, },
showLogin: function() { showLogin: function() {
var self = this;
if (Discourse.get("isReadOnly")) { if (Discourse.get("isReadOnly")) {
bootbox.alert(I18n.t("read_only_mode.login_disabled")); bootbox.alert(I18n.t("read_only_mode.login_disabled"));
} else { } else {
@ -30,14 +32,31 @@ var ApplicationRoute = Em.Route.extend({
var returnPath = encodeURIComponent(window.location.pathname); var returnPath = encodeURIComponent(window.location.pathname);
window.location = Discourse.getURL('/session/sso?return_path=' + returnPath); window.location = Discourse.getURL('/session/sso?return_path=' + returnPath);
} else { } else {
Discourse.Route.showModal(this, 'login'); this.send('autoLogin', function(){
this.controllerFor('login').resetForm(); Discourse.Route.showModal(self, 'login');
self.controllerFor('login').resetForm();
});
} }
} }
}, },
showCreateAccount: function() { showCreateAccount: function() {
Discourse.Route.showModal(this, 'createAccount'); var self = this;
self.send('autoLogin', function(){
Discourse.Route.showModal(self, 'createAccount');
});
},
autoLogin: function(onFail){
var methods = Em.get('Discourse.LoginMethod.all');
if (!Discourse.SiteSettings.enable_local_logins &&
methods.length === 1) {
Discourse.Route.showModal(this, 'login');
this.controllerFor('login').send("externalLogin", methods[0]);
} else {
onFail();
}
}, },
showForgotPassword: function() { showForgotPassword: function() {