This repository has been archived by the owner. It is now read-only.
Backport email opt-in code to train-38 #2532
Merged
Conversation
(cherry picked from commit 4cbfed3)
* Strip the "Bearer " portion of a token before verification. * Enable CORS from the content server. * Handle errors from both the OAuth and Basket servers. (cherry picked from commit cc0dfdb)
(cherry picked from commit dcb48de)
(cherry picked from commit fa5aa01)
(cherry picked from commit 3d9d882)
(cherry picked from commit f6a1690)
(cherry picked from commit dcd6a50)
(cherry picked from commit 1c53fc9)
* `verifyApiKey` is already middleware, do not make a function call when setting it up as middleware. * Fetch the parameters from the right place. (cherry picked from commit effd5d3)
(cherry picked from commit 4e8e2dc)
(cherry picked from commit 5046377)
(cherry picked from commit a43061d)
|
(Also includes the fix from #2531) |
|
I've got a green tick from travis here, and a clean run of |
This comment has been minimized.
This comment has been minimized.
|
!! So this is why I kept getting 404s on lookup-user calls. |
This comment has been minimized.
This comment has been minimized.
|
Hmmm... it's a URI component though, isn't it? |
zaach
added a commit
that referenced
this pull request
Jun 5, 2015
Backport email opt-in code to train-38 r=zaach,jrgm
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
/cc @jrgm @zaach
Here's my attempt at cherry-picking the email optin commits from master over into the train-38 branch. I'm not sure it actually skips much extra code from master though.
It also hides the "communication preferences" link which was suggested by @ryanfeeley and the engagment team if we're still testing the corner-cases in that UI. Since each email will contain an "unsubscribe" link, we should be safe to ship just the opt-in checkbox for a short while, and users will still have a way to opt back out.
Now, let's see if it'll actually build and pass tests...