pleroma/pleroma-fe
Watch
2
2
Fork
You've already forked pleroma-fe
 10
Code Issues 351 Pull requests 26 Projects Releases 5 Packages 1 Wiki Activity

Require password reset #2225

Closed
maxf wants to merge 7 commits from gitlab-mr-iid-958 into develop
pull from: gitlab-mr-iid-958
merge into: pleroma:develop
Conversation 11 Commits 7 Files changed 5 +27 -3
maxf commented 2019-09-27 14:59:29 +00:00
Member
Copy link

If user is attempting to log in and API returns "password reset required" we redirect user to password reset page

If user is attempting to log in and API returns "password reset required" we redirect user to password reset page
hj commented 2019-09-27 15:44:50 +00:00
Member
Copy link

looks weird, why would one type of error be snake_case and other plain english...

looks weird, why would one type of error be snake_case and other plain english...
maxf commented 2019-09-27 15:47:03 +00:00
Author
Member
Copy link

agree, let's unify. Do you think we should have snake case in both cases?

agree, let's unify. Do you think we should have snake case in both cases?
maxf commented 2019-09-27 15:51:19 +00:00
Author
Member
Copy link

Now it looks weierd in back end context: pleroma/pleroma#5115/diffs

:thinking_face:

Now it looks weierd in back end context: https://git.pleroma.social/pleroma/pleroma/pulls/5115/diffs :thinking_face:
maxf commented 2019-09-27 15:52:27 +00:00
Author
Member
Copy link

Before:

      {:auth_active, false} ->
        # Per https://github.com/tootsuite/mastodon/blob/
        #   51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
        render_error(conn, :forbidden, "Your login is missing a confirmed e-mail address")

      {:user_active, false} ->
        render_error(conn, :forbidden, "Your account is currently disabled")

      {:password_reset_pending, true} ->
        render_error(conn, :forbidden, "Password reset is required")

Now:

      {:auth_active, false} ->
        # Per https://github.com/tootsuite/mastodon/blob/
        #   51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
        render_error(conn, :forbidden, "Your login is missing a confirmed e-mail address")

      {:user_active, false} ->
        render_error(conn, :forbidden, "Your account is currently disabled")

      {:password_reset_pending, true} ->
        render_error(conn, :forbidden, "password_reset_required")
Before: ```elixir {:auth_active, false} -> # Per https://github.com/tootsuite/mastodon/blob/ # 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76 render_error(conn, :forbidden, "Your login is missing a confirmed e-mail address") {:user_active, false} -> render_error(conn, :forbidden, "Your account is currently disabled") {:password_reset_pending, true} -> render_error(conn, :forbidden, "Password reset is required") ``` Now: ```elixir {:auth_active, false} -> # Per https://github.com/tootsuite/mastodon/blob/ # 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76 render_error(conn, :forbidden, "Your login is missing a confirmed e-mail address") {:user_active, false} -> render_error(conn, :forbidden, "Your account is currently disabled") {:password_reset_pending, true} -> render_error(conn, :forbidden, "password_reset_required") ```
hj commented 2019-09-27 15:55:42 +00:00
Member
Copy link

well, unify on something at least then. Something that won't get changed because wording is bad.

well, unify on something at least then. Something that won't get changed because wording is bad.
maxf commented 2019-09-28 00:10:02 +00:00
Author
Member
Copy link

I've did it via redirect

I've did it via redirect
maxf commented 2019-10-03 00:57:50 +00:00
Author
Member
Copy link

@hj take a look please

@hj take a look please
hj commented 2019-10-15 15:54:27 +00:00
Member
Copy link

theme support

theme support
hj commented 2019-10-15 15:59:13 +00:00
Member
Copy link

I'd give it a bit more descriptive name like "passwordResetRequested"

I'd give it a bit more descriptive name like "passwordResetRequested"
hj commented 2019-10-15 16:00:57 +00:00
Member
Copy link

I'd add a sanity check so that we get "password_reset_required" we don't redirect to /password-reset if password reset is disabled, but show a message to contact administrator instead.

I'd add a sanity check so that we get "password_reset_required" we don't redirect to `/password-reset` if password reset is disabled, but show a message to contact administrator instead.
hj commented 2019-10-15 16:01:37 +00:00
Member
Copy link

is this used anywhere? I'd move the $t() to the template.

is this used anywhere? I'd move the `$t()` to the template.

Pull request closed

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

   
Backlog

   
Better behavior

   
Blocked by deps

   
Bug

   
Code Review

   
Discussion

   
Doing

   
Feature Request / Enhancement

   
In the shining bright future maybe

   
It's complicated

   
MS Edge

   
Mememoon (or other niche browsers)

   
Missing API

   
Missing feature

   
Missing l10n/i18n

   
NL1
Instance Admin Dashboard

  
NL2
Improved Mobile Experience

  
NL4
Improved instance customization and QoL options

  
Need to verify on develop

   
RELEASE BLOCKER

   
Reassign or Close

   
Refactor

   
Regression

   
Safari

   
To Do

   
User story

   
Waiting on godot

   
accessibility
https://git.pleroma.social/pleroma/pleroma-fe/-/snippets/7746

  
better documentation

   
chore

   
confirmed

   
easy ticket

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

  
l10n update

   
mastoapi

   
mobile

   
needs design

   
needs-info

   
needs-review

   
stupid
No labels
BE Request
Backlog
Better behavior
Blocked by deps
Bug
Code Review
Discussion
Doing
Feature Request / Enhancement
In the shining bright future maybe
It's complicated
MS Edge
Mememoon (or other niche browsers)
Missing API
Missing feature
Missing l10n/i18n
NL1
NL2
NL4
Need to verify on develop
RELEASE BLOCKER
Reassign or Close
Refactor
Regression
Safari
To Do
User story
Waiting on godot
accessibility
better documentation
chore
confirmed
easy ticket
incident
l10n update
mastoapi
mobile
needs design
needs-info
needs-review
stupid
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
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-fe!2225
No description provided.