summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2015-07-28 14:01:34 +0200
committerMartin Basti <mbasti@redhat.com>2015-07-29 17:13:31 +0200
commit66bd2094f97f277cc480d5887b79bb7b8c237b72 (patch)
treeedc106aa3b537171a13d8ff2db93948206e2d9a9
parentcea52ce186d9341f126ef6a9ac5f0287c4f16ada (diff)
downloadfreeipa-66bd2094f97f277cc480d5887b79bb7b8c237b72.zip
freeipa-66bd2094f97f277cc480d5887b79bb7b8c237b72.tar.gz
freeipa-66bd2094f97f277cc480d5887b79bb7b8c237b72.tar.xz
webui: fix regressions failed auth messages
1. after logout, krb auth no longer shows "session expired" but correct "Authentication with Kerberos failed". 2. "The password or username you entered is incorrect." is showed on failed forms-based auth. https://fedorahosted.org/freeipa/ticket/5163 Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r--install/ui/src/freeipa/ipa.js8
-rw-r--r--install/ui/src/freeipa/widgets/LoginScreen.js2
2 files changed, 5 insertions, 5 deletions
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index 75dd73c..eaaaaf7 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -32,6 +32,7 @@ define([
'./json2',
'./_base/i18n',
'./auth',
+ './config',
'./datetime',
'./metadata',
'./builder',
@@ -41,7 +42,8 @@ define([
'./util',
'exports'
], function(declare, Deferred, Evented, keys, topic, $, JSON, i18n, auth,
- datetime, metadata_provider, builder, reg, rpc, text, util, exports) {
+ config, datetime, metadata_provider, builder, reg, rpc, text,
+ util, exports) {
/**
* @class
@@ -127,11 +129,9 @@ var IPA = function () {
// if current path matches live server path, use live data
if (that.url && window.location.pathname.substring(0, that.url.length) === that.url) {
that.json_url = params.url || '/ipa/session/json';
- that.login_url = params.url || '/ipa/session/login_kerberos';
} else { // otherwise use fixtures
that.json_path = params.url || "test/data";
- // that.login_url is not needed for fixtures
}
$.ajaxSetup(that.ajax_options);
@@ -377,7 +377,7 @@ IPA.get_credentials = function() {
}
var request = {
- url: IPA.login_url,
+ url: config.krb_login_url,
cache: false,
type: "GET",
success: success_handler,
diff --git a/install/ui/src/freeipa/widgets/LoginScreen.js b/install/ui/src/freeipa/widgets/LoginScreen.js
index fb7cccc..eb95b91 100644
--- a/install/ui/src/freeipa/widgets/LoginScreen.js
+++ b/install/ui/src/freeipa/widgets/LoginScreen.js
@@ -232,8 +232,8 @@ define(['dojo/_base/declare',
this.set('view', 'reset');
val_summary.add_info('login', this.password_expired);
} else {
- val_summary.add_error('login', this.form_auth_failed);
password_f.set_value('');
+ val_summary.add_error('login', this.form_auth_failed);
}
}));
},