Skip to content

Masterbar: allow logging out of wpcom when logging out of site.#12457

Merged
jeherve merged 1 commit intomasterfrom
fix/masterbar-amp
May 24, 2019
Merged

Masterbar: allow logging out of wpcom when logging out of site.#12457
jeherve merged 1 commit intomasterfrom
fix/masterbar-amp

Conversation

@jeherve
Copy link
Copy Markdown
Member

@jeherve jeherve commented May 23, 2019

Fixes #12456

Changes proposed in this Pull Request:

This change avoids initialiazing all of the Masterbar after admin_bar_init. We want the module to be available after logging out as well, so the function hooked into wp_logout can be triggered.

Testing instructions:

  1. Install and activate the AMP plugin.
  2. Activate the WordPress.com Toolbar feature on your site, under Jetpack > Settings > Writing
  3. Make sure you are logged in with your WordPress.com account.
  4. In the masterbar, click on your gravatar.
  5. Click sign out.
  6. You will be signed out of your site, and should get signed out of WordPress.com as well.
  7. Make sure you get no PHP warnings from the AMP plugin.
  8. Make sure that in AMP views, the Masterbar is not active.

Proposed changelog entry for your changes:

  • Masterbar: Log out of WordPress.com when logging out of site.

@jeherve
Masterbar: allow logging out of wpcom when logging out of site.
5e07f91 
Fixes #12456

This change avoids initialiazing all of the Masterbar after admin_bar_init. We want the module to be available after logging out as well, so the function hooked into wp_logout can be triggered.
@jeherve jeherve added Bug When a feature is broken and / or not performing as intended [Status] Needs Review This PR is ready for review. [Pri] High [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations labels May 23, 2019
@jeherve jeherve added this to the 7.4 milestone May 23, 2019
@jeherve jeherve requested review from a team, jmdodd and kraftbj May 23, 2019 20:18
@jeherve jeherve self-assigned this May 23, 2019
@jetpackbot
Copy link
Copy Markdown
Collaborator

jetpackbot commented May 23, 2019

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Scheduled Jetpack release: June 4, 2019.
Scheduled code freeze: May 28, 2019

Generated by 🚫 dangerJS against 5e07f91

brbrr
brbrr previously requested changes May 24, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@brbrr brbrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works well for the first log-out attempt: I got logged out from both WP site and WPCOM. When I tried to log out for the second time, it won't log me out from WPCOM. I tried logging out from both admin pages and a non-amp frontend view

@brbrr brbrr added [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. and removed [Status] Needs Review This PR is ready for review. labels May 24, 2019
@jeherve
Copy link
Copy Markdown
Member Author

jeherve commented May 24, 2019

@brbrr Could you clarify the steps you followed:

  1. You logged out using the Masterbar once.
  2. You logged back into WordPress.com.
  3. In a separate window, you logged back into the site?
  4. At that point, you tried using the Masterbar again to log out, and it only logged out of the site?

Were you using SSO on the site?

@brbrr
Copy link
Copy Markdown
Contributor

brbrr commented May 24, 2019

Yeah, I should mention that I’ve been using SSO for most of my testing.

The steps are correct, although 2,3 are combined to single step since I used SSO to login

@brbrr
Copy link
Copy Markdown
Contributor

brbrr commented May 24, 2019

I retested it with SSO enabled and disabled and I can replicate the issue I mentioned above. So logging out via WPCOM masterbar did not logs you out from WPCOM on subsequent attempts

@jeherve
Copy link
Copy Markdown
Member Author

jeherve commented May 24, 2019

I can't seem to reproduce unfortunately. It always appears to log me out of both instances. :(

@kraftbj Do you think you could give it a try as well?

kraftbj
kraftbj requested changes May 24, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@kraftbj kraftbj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, good catch @brbrr. I was able the failure on the second attempt both with SSO on and off.

kraftbj
kraftbj approved these changes May 24, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@kraftbj kraftbj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue previously reported (unable to log out on a second attempt) still exists; however, confirmed it was present before the bug this PR is trying to fixed was introduced.

I'm approving as this fixes the behavior back to JP 6.9, but we need a new one to fix the second logout issue.

@jeherve jeherve dismissed brbrr’s stale review May 24, 2019 21:19

This seems to be a separate issue from this PR. It existed in previous versions of Jetpack. I logged it in #12465

@jeherve jeherve added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels May 24, 2019
@jeherve jeherve merged commit 865ea01 into master May 24, 2019
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Ready to Merge Go ahead, you can push that green button! labels May 24, 2019
@jeherve jeherve deleted the fix/masterbar-amp branch May 24, 2019 21:21
jeherve added a commit that referenced this pull request May 24, 2019
@jeherve
Changelog: add #12457
797d076
jeherve added a commit that referenced this pull request May 27, 2019
@kraftbj @jeherve
7.4 Changelog (#12304)
0fb4436 
* Kick off the changelog

* Add 7.3.1

* Update date and post link

* changelog: add #12219

* changelog: add #12170

* changelog: add #12184

* Changelog: add #12268

* Changelog: add #12081

* Changelog: add #12323

* Changelog: add #12204

* Changelog: add #12269

* Changelog: add #12332

* changelog: add #12339

* changelog: add #12209

* Changelog: add #12319

* Changelog: add #12357

* Changelog: add #12124

* Changelog: add #12373

* Changelog: add #12252

* Changelog: add #12383

* Changelog: add #12372

* changelog: add #12337

* Changelog: add #12290

* Changelog: add #12301

* Changelog: add #12061

* Testing list: add instructions for #12061

* Changelog: add #12393

* Update minimum supported version

See #12287

* Changelog: add #12406

* Testing list: add #12406

* Changelog: add #12277

* Changelog: add #12412

* Changelog: add #11318

* Changelog: add #12328

* Changelog: add #12425

* Changelog: add #12380

* Changelog: add #12428

* Changelog: add #12414

* Changelog: add #12395

* Changelog & Testing list: add #12416, #12417, #12418, and #12348

* changelog: add #12379

* Changelog: add #12341

* changelog: add #12444

* Changelog: add #12434

* Changelog: add #12454

* Changelog: add #12460

* Changelog: add #12463

* Changelog: add #12457

* Changelog / testing list: add #10333

* Changelog: add #12467


Co-authored-by: Jeremy Herve <jeremy@jeremy.hu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kraftbj kraftbj kraftbj approved these changes

@jmdodd jmdodd Awaiting requested review from jmdodd

+1 more reviewer

@brbrr brbrr brbrr left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@jeherve jeherve

Labels

Bug When a feature is broken and / or not performing as intended [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Pri] High

Projects

None yet

Milestone

7.4

Development

Successfully merging this pull request may close these issues.

Masterbar: logging out of your site does not log you out of WordPress.com

5 participants

@jeherve @jetpackbot @brbrr @kraftbj @matticbot