Compatibility with masquerade

Seems rtbc to me.

+++ b/bakery.module
@@ -980,12 +980,15 @@ function _bakery_taste_chocolatechip_cookie() {
-      if (!user_access('bypass bakery')) {
+      if (!(user_access('bypass bakery') || (module_exists('masquerade') && isset($_SESSION['masquerading'])))) {
         watchdog('bakery', 'Logging out the user with the bad cookie.');
         _bakery_user_logout();
       }
-- 
1.7.10.2 (Apple Git-33)

If the user doesn't have the bypass bakery permission this will still log those users out.

I am able to get it to work sometimes for users without that permission but the masquerade ability of returning to the original user doesn't work. Putting back to CNW to look into whether there's a better way to do this.

Developing a site where Masquerade and Bakery were a client requirement, and we had to apply the patch in #4 to get both working together.

For some reason, the patch in #4 stopped being effective recently.

For anyone looking to get these two modules working together, we eventually used the experiment rules integration in Masquerade Extras (after applying the patch to Masquerade here) and then created a custom rule to handle users who were masquerading getting the correct bakery credentials.

Re rolled against dev and I think I fixed the issue that was introduced / mentioned. I had to integrate with Masquerade before for an internal authentication method (cosign) that was really aggressive as to how it integrated with drupal (not unlike bakery). The issue is that your account doesn't have the ability to skip logout, you are masquerading which alters your session / cookie token, and as you are in the process of "logging in" you get logged out.

The way around this is to set a value in the masquerade form that indicates the user account is about to masquerade. You write this into the form to fire prior to the masquerade form submission being processed. It kicks you over to login / a new page load after it has switched your account to the new user. It notices the "about to masquerade" property on your user account and prevents it from killing the request.

I've tested this for all of 5 minutes and it appears to be working on the site you masquerade with. Obviously once you switch to another site it doesn't know you were masquerading and so your session gets dumped on other services (or could be).