MFA improvements #2460

Open
feld wants to merge 4 commits from gitlab-mr-iid-1193 into develop
Owner
No description provided.
Author
Owner

Some browsers will handle this correctly and only allow 6 digits.

Due to complexity of the shared input toggled via javascript for the 2fa/backup codes we aren't applying this over there

Some browsers will handle this correctly and only allow 6 digits. Due to complexity of the shared input toggled via javascript for the 2fa/backup codes we aren't applying this over there
Member

seems ok, but it appears that MFA crashes the js when trying to turn it on currently so it's hard to test

seems ok, but it appears that MFA crashes the js when trying to turn it on currently so it's hard to test
Author
Owner

MFA crashed only in develop mode because it's trying to hit http://localhost:8080/__webpack_hmr but I just tried again today and it's working...

MFA crashed only in develop mode because it's trying to hit `http://localhost:8080/__webpack_hmr` but I just tried again today and it's working...
Member

could be conflicting with totp in totp_form.vue?

not entirely sure tho

could be conflicting with totp in `totp_form.vue`? not entirely sure tho
Member

this will break the label, label has for="code" which should match the id

this will break the label, label has `for="code"` which should match the id
Member

ping @feld

ping @feld
This pull request has changes conflicting with the target branch.
  • src/components/mfa_form/totp_form.vue
  • src/components/settings_modal/tabs/security_tab/mfa.vue
  • src/components/settings_modal/tabs/security_tab/security_tab.vue
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-1193:gitlab-mr-iid-1193
git switch gitlab-mr-iid-1193

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff gitlab-mr-iid-1193
git switch gitlab-mr-iid-1193
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-1193
git switch gitlab-mr-iid-1193
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-1193
git switch develop
git merge --squash gitlab-mr-iid-1193
git switch develop
git merge --ff-only gitlab-mr-iid-1193
git switch develop
git merge gitlab-mr-iid-1193
git push origin develop
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
3 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!2460
No description provided.