pleroma/pleroma
Watch
3
6
Fork
You've already forked pleroma
 15
Code Issues 359 Pull requests 54 Projects Releases 1 Packages 13 Wiki Activity

Fix password reset for non-test env #4824

Closed
eugenijm wants to merge 1 commit from gitlab-mr-iid-1441 into develop
pull from: gitlab-mr-iid-1441
merge into: pleroma:develop
Conversation 2 Commits 1 Files changed 5 +10 -8
eugenijm commented 2019-07-17 16:29:10 +00:00
Member
Copy link
No description provided.
eugenijm commented 2019-07-17 16:31:30 +00:00
Author
Member
Copy link

Fixes Plug.Conn.NotSentError that causes a 500 error in a non-test env.

Fixes `Plug.Conn.NotSentError` that causes a 500 error in a non-test env.
eugenijm commented 2019-07-17 16:37:59 +00:00
Author
Member
Copy link

Pleroma.Emails.Mailer.deliver_async returns
:ok when PleromaJobQueue is enabled and {:ok, _} when it's disabled. This causes an error in controller actions that expect {:ok, _} format (MastodonAPIController.password_reset and TwitterAPI.Controller.password_reset), which doesn't happen in tests where PleromaJobQueue is disabled.

`Pleroma.Emails.Mailer.deliver_async` returns `:ok` when `PleromaJobQueue` is enabled and `{:ok, _}` when it's disabled. This causes an error in controller actions that expect `{:ok, _}` format ([`MastodonAPIController.password_reset`](https://git.pleroma.social/pleroma/pleroma/blob/ca1efb0c02592a808411ce72769aba32a5ead2ff/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex#L1823) and [`TwitterAPI.Controller.password_reset`](https://git.pleroma.social/pleroma/pleroma/blob/ca1efb0c02592a808411ce72769aba32a5ead2ff/lib/pleroma/web/twitter_api/twitter_api_controller.ex#L439)), which doesn't happen in tests where `PleromaJobQueue` is disabled.

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
AP C2S

   
AdminAPI

   
Breaking API
Affects clients

  
Breaks existing config

   
Check if still valid

   
Data Protection

   
Do not merge

   
Document in the changelog

   
Doing

   
Feature Request / Enhancement

   
MastoAPI

   
NL2
Improved Mobile Experience

  
NL4
Improved instance customization and QoL options

  
OStatus

   
OTP Releases

   
Refactor

   
Security

   
To Do

   
TwitterAPI

   
bug

   
complicated

   
confirmed

   
deps

   
discussion

   
documentation

   
easy

   
feature: to be merged in stable

   
fix: to be merged in stable

   
incident
Denotes a disruption to IT services and the associated issues require immediate attention

  
needs to be backported to maint

   
needs-changes

   
needs-info

   
needs-review

   
performance

   
regression

   
unclear
No labels
AP C2S
AdminAPI
Breaking API
Breaks existing config
Check if still valid
Data Protection
Do not merge
Document in the changelog
Doing
Feature Request / Enhancement
MastoAPI
NL2
NL4
OStatus
OTP Releases
Refactor
Security
To Do
TwitterAPI
bug
complicated
confirmed
deps
discussion
documentation
easy
feature: to be merged in stable
fix: to be merged in stable
incident
needs to be backported to maint
needs-changes
needs-info
needs-review
performance
regression
unclear
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
pleroma/pleroma!4824
No description provided.