Skip to content

Conversation

@nedbat
Copy link
Contributor

@nedbat nedbat commented Mar 15, 2019

Squashed from:

80b977f Make the studio login over the lms optional using a feature flag
14b4223 Addressing feedback
9195ec9 Addressing second feedback about redirect logic on logout behing feature flag
923a917 Fixing lettuce tests

(cherry picked from commit 6f91a0d9e8ea2364f58a2cd38e804ac57f8f416b)

Commit 6f91a0d9 was a squashed version of the four original commits, to
make resolving conflicts easier.

Squashed from:

80b977f Make the studio login over the lms optional using a feature flag
14b4223 Addressing feedback
9195ec9 Addressing second feedback about redirect logic on logout behing feature flag
923a917 Fixing lettuce tests

(cherry picked from commit 6f91a0d9e8ea2364f58a2cd38e804ac57f8f416b)

Commit 6f91a0d9 was a squashed version of the four original commits, to
make resolving conflicts easier.
@nedbat nedbat force-pushed the nedbat/ironwood-19845 branch from 10780a5 to f8319d8 Compare March 15, 2019 14:51
@nedbat nedbat requested review from nasthagiri and pwnage101 March 15, 2019 14:51
@nedbat
Copy link
Contributor Author

nedbat commented Mar 15, 2019

@nasthagiri @pwnage101 @felipemontoya I've cherry-picked #19845, but there were conflicts. I think I got it right, but please take a quick look. Thanks.

@felipemontoya
Copy link
Member

By looking at the code, everything looks good to me. I'm launching a new ironwood devstack to test it

@nedbat
Copy link
Contributor Author

nedbat commented Mar 15, 2019

@felipemontoya The tests are failing, due to /logout returning 200 instead of other things. @pwnage101 is looking into it.

@pwnage101
Copy link
Contributor

@ned @felipemontoya

The reason the tests are failing is because the backported changes in openedx/core/djangoapps/user_authn/views/logout.py DEPEND ON the the following two additional PRs that were not yet backported to ironwood:

https://github.com/edx/edx-platform/pull/19804
https://github.com/edx/edx-platform/pull/19790

@felipemontoya
Copy link
Member

@nedbat @pwnage101 do you reckon we should backport those? or should I modify this lightly so that it works on top of ironwood as it is?

@pwnage101
Copy link
Contributor

pwnage101 commented Mar 15, 2019

I just spoke with @doctoryes about that option (slightly modify this backport PR logic to make it work), but we decided against that because we want to avoid diverging codebases as much as possible. If we diverge, that may cause another merge conflict in a future backport.

pwnage101 and others added 2 commits March 15, 2019 13:18
Currently, the LMS logout endpoint should iframe in the logout pages of
all the IDAs you were logged into. In short, this was made possible with
DOP because keeping track of the logout URIs and leaving a trail of
evidence in the user cookies was part of what we added in our fork of
DOP.  In the case of DOT, we don't have time or desire to fork DOT to
mirror this behavior, so our stop-gap solution is to log out the user
from a list of logout URIs in settings.

(cherry picked from commit 10afe5e)
I missed the LMS production settings, and Studio in its entirety.

(cherry picked from commit 11c3588)
@nedbat
Copy link
Contributor Author

nedbat commented Mar 15, 2019

I have now cherry-picked the changes from #19790 and #19804.

Copy link
Contributor

@pwnage101 pwnage101 left a comment

Choose a reason for hiding this comment

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

It also occurs to me that If we backport those extra PRs, we also should backport the corresponding config PR: https://github.com/edx/configuration/pull/5011/files

@nedbat
Copy link
Contributor Author

nedbat commented Mar 15, 2019

ironwood run bokchoy

1 similar comment
@nedbat
Copy link
Contributor Author

nedbat commented Mar 15, 2019

ironwood run bokchoy

@edx-status-bot
Copy link

Your PR has finished running tests. There were no failures.

@nedbat nedbat merged commit 4241edf into open-release/ironwood.master Mar 16, 2019
@nedbat nedbat deleted the nedbat/ironwood-19845 branch March 16, 2019 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants