Added logout button

Logout button was added to Web UI.

Click on logout button executes session_logout command. If command succeeds or xhr stutus is 401 (unauthorized - already logged out) page is redirected to logout.html.

logout.html is a simple page with "You have been logged out" text and a link to return back to main page.

https://fedorahosted.org/freeipa/ticket/2363

9 files changed, 104 insertions, 6 deletions

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 47d0f281..44e48286 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -551,6 +551,7 @@ fi
 %{_usr}/share/ipa/migration/migration.py*
 %dir %{_usr}/share/ipa/ui
 %{_usr}/share/ipa/ui/index.html
+%{_usr}/share/ipa/ui/logout.html
 %{_usr}/share/ipa/ui/*.ico
 %{_usr}/share/ipa/ui/*.css
 %{_usr}/share/ipa/ui/*.js
@@ -667,6 +668,9 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Wed Feb 29 2012 Petr Vobornik <pvoborni@redhat.com> - 2.2.0-13
+- Add Web UI logout page
+
 * Mon Feb 27 2012 Rob Crittenden <rcritten@redhat.com> - 2.2.0-12
 - Add Requires to ipa-client on oddjob-mkhomedir
 
diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am
index d87a0944..a4d083ac 100644
--- a/install/ui/Makefile.am
+++ b/install/ui/Makefile.am
@@ -38,6 +38,7 @@ app_DATA =				\
 	jquery.js			\
 	jquery.ordered-map.js 		\
 	json2.js			\
+	logout.html			\
 	navigation.js			\
 	net.js				\
 	netgroup.js 			\
diff --git a/install/ui/index.html b/install/ui/index.html
index db314331..6b1be869 100644
--- a/install/ui/index.html
+++ b/install/ui/index.html
@@ -66,14 +66,17 @@
 
         <div id="header">
             <span class="header-logo">
-                 <a href="#"><img src="images/ipa-logo.png" /><img src="images/ipa-banner.png" /></a>
+                <a href="#"><img src="images/ipa-logo.png" /><img src="images/ipa-banner.png" /></a>
             </span>
             <span class="header-right">
                 <span id="loggedinas" class="header-loggedinas">
-                     <a href="#"><span id="login_header">Logged in as</span>: <strong>user@FREEIPA.ORG</strong></a>
+                    <a href="#"><span id="login_header">Logged in as</span>: <strong>user@FREEIPA.ORG</strong></a>
+                </span>
+                <span class="header-loggedinas">
+                    | <a href="#logout" id="logout">Logout</a>
                 </span>
                 <span id="header-network-activity-indicator" class="network-activity-indicator">
-                     <img src="images/spinner-header.gif" />
+                    <img src="images/spinner-header.gif" />
                 </span>
             </span>
         </div>
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index d1bb0421..0afa4f09 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -295,7 +295,6 @@ IPA.get_credentials = function() {
         status = xhr.status;
     }
 
-
     function success_handler(data, text_status, xhr) {
         status = xhr.status;
     }
@@ -313,6 +312,51 @@ IPA.get_credentials = function() {
     return status;
 };
 
+IPA.logout = function() {
+
+    function show_error(message) {
+        var dialog = IPA.message_dialog({
+            message: message,
+            title: IPA.messages.login.logout_error
+        });
+        dialog.open();
+    }
+
+    function redirect () {
+        window.location = 'logout.html';
+    }
+
+    function success_handler(data, text_status, xhr) {
+        if (data && data.error) {
+            show_error(data.error.message);
+        } else {
+            redirect();
+        }
+    }
+
+    function error_handler(xhr, text_status, error_thrown) {
+        if (xhr.status === 401) {
+            redirect();
+        } else {
+            show_error(text_status);
+        }
+    }
+
+    var command = {
+        method: 'session_logout',
+        params: [[], {}]
+    };
+
+    var request = {
+        url: IPA.json_url || IPA.json_path + '/session_logout.json',
+        data: JSON.stringify(command),
+        success: success_handler,
+        error: error_handler
+    };
+
+    $.ajax(request);
+};
+
 /**
  * Call an IPA command over JSON-RPC.
  *
diff --git a/install/ui/logout.html b/install/ui/logout.html
new file mode 100644
index 00000000..e356d2a5
--- /dev/null
+++ b/install/ui/logout.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>IPA: Identity Policy Audit</title>
+
+    <link rel="stylesheet" type="text/css" href="ipa.css" />
+
+</head>
+
+<body class="info-page">
+
+    <div class="container_1">
+
+        <div class="header-logo">
+            <img src="images/ipa-logo.png" /><img src="images/ipa-banner.png" />
+        </div>
+
+        <div class="textblockkrb">
+            <h1>You have been logged out</h1>
+            <p>
+                <a href="index.html">Return to main page.</a>
+            </p>
+        </div>
+
+    </div>
+
+</body>
+
+</html>
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 29880b2e..e5b4be16 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -110,7 +110,9 @@
                     },
                     "false": "False",
                     "login": {
-                        "header": "Logged In As"
+                        "header": "Logged In As",
+                        "logout": "Logout",
+                        "logout_error": "Logout error"
                     },
                     "objects": {
                         "aci": {
diff --git a/install/ui/test/data/session_logout.json b/install/ui/test/data/session_logout.json
new file mode 100644
index 00000000..13410c6e
--- /dev/null
+++ b/install/ui/test/data/session_logout.json
@@ -0,0 +1,7 @@
+{
+    "error": null,
+    "id": null,
+    "result": {
+        "result": null
+    }
+}
\ No newline at end of file
diff --git a/install/ui/webui.js b/install/ui/webui.js
index b8394d28..5d32e797 100644
--- a/install/ui/webui.js
+++ b/install/ui/webui.js
@@ -170,6 +170,11 @@ $(function() {
         $('#loggedinas a').fragment(
             {'user-facet': 'details', 'user-pkey': IPA.whoami_pkey}, 2);
 
+        $('#logout').click(function() {
+            IPA.logout();
+            return false;
+        }).text(IPA.messages.login.logout);
+
         IPA.nav = create_navigation();
         IPA.nav.create();
         IPA.nav.update();
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index c346b442..4ccbe5cd 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -245,7 +245,9 @@ class i18n_messages(Command):
         },
         "false": _("False"),
         "login": {
-            "header": _("Logged In As")
+            "header": _("Logged In As"),
+            "logout": _("Logout"),
+            "logout_error": _("Logout error"),
         },
         "objects": {
             "aci": {