diff --git a/NEWS b/NEWS
index b3681cd88..60e3456c1 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ New features
Enhancements
- [web] don't allow a recurrence rule to end before the first occurrence
- [web] updated Angular Material to version 1.1.0
+ - [web] show user's name upon successful login
Bug fixes
- [eas] properly generate the BusyStatus for normal events
diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings
index 1b5376140..e8d25e090 100644
--- a/UI/MainUI/English.lproj/Localizable.strings
+++ b/UI/MainUI/English.lproj/Localizable.strings
@@ -11,7 +11,7 @@
"Authenticating" = "Authenticating";
/* Appears when authentication succeeds */
-"Success" = "Success";
+"Welcome" = "Welcome";
"Authentication Failed" = "Authentication Failed";
"Wrong username or password." = "Wrong username or password.";
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 03df55d33..fa0802e53 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -126,7 +126,7 @@
ng-switch-when="logged">
done
-
+ {{app.cn}}
diff --git a/UI/WebServerResources/js/Common/Authentication.service.js b/UI/WebServerResources/js/Common/Authentication.service.js
index f1a883f9a..a4c304ba4 100644
--- a/UI/WebServerResources/js/Common/Authentication.service.js
+++ b/UI/WebServerResources/js/Common/Authentication.service.js
@@ -120,7 +120,7 @@
//showPasswordDialog('expiration', createPasswordExpirationDialog, data['expire']);
}
else {
- d.resolve(redirectUrl(username, domain));
+ d.resolve({ cn: data.cn, url: redirectUrl(username, domain) });
}
}
else {
diff --git a/UI/WebServerResources/js/Main/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js
index 239631e16..1f37a6405 100644
--- a/UI/WebServerResources/js/Main/Main.app.js
+++ b/UI/WebServerResources/js/Main/Main.app.js
@@ -25,15 +25,16 @@
function login() {
vm.loginState = 'authenticating';
Authentication.login(vm.creds)
- .then(function(url) {
+ .then(function(data) {
vm.loginState = 'logged';
+ vm.cn = data.cn;
// Let the user see the succesfull message before reloading the page
$timeout(function() {
- if (window.location.href === url)
+ if (window.location.href === data.url)
window.location.reload(true);
else
- window.location.href = url;
+ window.location.href = data.url;
}, 1000);
}, function(msg) {
vm.loginState = 'error';