Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Totp change #2165

Merged
merged 12 commits into from
Oct 5, 2023
Merged

Totp change #2165

merged 12 commits into from
Oct 5, 2023

Conversation

SleeplessOne1917
Copy link
Member

@SleeplessOne1917 SleeplessOne1917 commented Oct 4, 2023

Description

This is an update so the UI works with the 2FA changes on the server side.

Screenshots

This is what shows when enabling 2FA:
enable_totp_demo.webm

This video shows using the new modal on the login screen:
totp_login_demo.webm

This video shows how the modal works when entering 1 character at a time and hitting backspace, as well as what happens when an incorrect token is entered:
totp_play_around.webm

TODO

Add translations

Copy link
Member

@dessalines dessalines left a comment

Choose a reason for hiding this comment

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

I tested this locally also, and it works great, thx a ton!

Just add the i18n stuff and we'll get it merged.

src/assets/css/main.css Show resolved Hide resolved
src/shared/components/common/totp-modal.tsx Outdated Show resolved Hide resolved
});
}
}
}
Copy link
Member

Choose a reason for hiding this comment

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

It looks really great, just wish we didn't have to rely on bootstrap modals, and so much custom dom manipulation.

Copy link
Member Author

Choose a reason for hiding this comment

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

I did a bit of refactoring to make handling the modal a bit more react-like.

src/shared/components/person/settings.tsx Outdated Show resolved Hide resolved
@SleeplessOne1917 SleeplessOne1917 marked this pull request as ready for review October 4, 2023 23:39
@SleeplessOne1917 SleeplessOne1917 enabled auto-merge (squash) October 4, 2023 23:51
Copy link
Member

@dessalines dessalines left a comment

Choose a reason for hiding this comment

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

GJ. I grepped and couldn't find any other of those states.

@dessalines
Copy link
Member

I'll fix that and merge.

@SleeplessOne1917 SleeplessOne1917 merged commit c6d6107 into main Oct 5, 2023
1 of 2 checks passed
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.

None yet

2 participants