bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'awaiting-approval-message' into 'develop'

Browse source 
Show appropriate message when account is awaiting approval

See merge request soapbox-pub/soapbox!2205
This commit is contained in:
marcin mikołajczak 2023-01-20 15:17:41 +00:00
commit 3c7aa81be1
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/soapbox/actions/auth.ts
View file

@ -50,6 +50,7 @@ const customApp = custom('app');
export const messages = defineMessages({
loggedOut: { id: 'auth.logged_out', defaultMessage: 'Logged out.' },
awaitingApproval: { id: 'auth.awaiting_approval', defaultMessage: 'Your account is awaiting approval' },
invalidCredentials: { id: 'auth.invalid_credentials', defaultMessage: 'Wrong username or password' },
});
@ -187,6 +188,8 @@ export const logIn = (username: string, password: string) =>
if ((error.response?.data as any)?.error === 'mfa_required') {
// If MFA is required, throw the error and handle it in the component.
throw error;
} else if ((error.response?.data as any)?.identifier === 'awaiting_approval') {
toast.error(messages.awaitingApproval);
} else {
// Return "wrong password" message.
toast.error(messages.invalidCredentials);

1
app/soapbox/locales/en.json
View file

@ -169,6 +169,7 @@
"app_create.scopes_placeholder": "e.g. 'read write follow'",
"app_create.submit": "Create app",
"app_create.website_label": "Website",
"auth.awaiting_approval": "Your account is awaiting approval",
"auth.invalid_credentials": "Wrong username or password",
"auth.logged_out": "Logged out.",
"auth_layout.register": "Create an account",