From 7f9441c33da07b215efcb51668434b3957559fd3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 20 Oct 2009 16:32:22 -0700
Subject: Changes to Identity interface to allow for multiple Identity
 providers.  What I've tested to this point, is you can install a new
 provider, switch to it, login as administrator, uninstall the default user
 module, reinstall the user module, switch back to the user module and login.

---
 modules/gallery/controllers/admin_identity.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/controllers')

diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index dd1cfb4b..9d756a5c 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -21,7 +21,7 @@ class Admin_Identity_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_identity.html");
-    $view->content->available = Identity::active();
+    $view->content->available = Identity::providers();
     $view->content->active = module::get_var("gallery", "identity_provider", "user");
     print $view;
   }
@@ -39,18 +39,36 @@ class Admin_Identity_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $active_provider = module::get_var("gallery", "identity_provider", "user");
-    $providers = Identity::active();
+    $providers = Identity::providers();
 
     $new_provider = $this->input->post("provider");
 
     if ($new_provider != $active_provider) {
-      module::event("identity_change", $new_provider);
+
+      module::event("pre_identity_change", $active_provider, $new_provider);
+
+      Identity::deactivate();
+
+      // Switch authentication
+      module::set_var("gallery", "identity_provider", $new_provider);
+      Identity::reset();
+
+      Identity::activate();
 
       // @todo this type of collation is questionable from an i18n perspective
       message::success(t("Changed to %description",
                          array("description" => $providers->$new_provider)));
+
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        // We don't care if there was a problem destroying the session.
+      }
+      url::redirect(item::root()->abs_url());
     }
 
+    message::info(t("The selected provider \"%description\" is already active.",
+                    array("description" => $providers->$new_provider)));
     url::redirect("admin/identity");
   }
 }
-- 
cgit v1.2.3