toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[MM-53249] Allow server to hide or customize the Forgot Password link (#7429)

Browse source 
* [MM-53249] Allow server to hide or customize the Forgot Password link

* Update app/screens/login/form.tsx

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

* Fix issue for older servers

* Sort imports

---------

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Devin Binnie 2023-07-18 12:31:35 -04:00 committed by GitHub
parent 3effecd6a4
commit 21fc831554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/screens/login/form.tsx
View file

@ -19,6 +19,7 @@ import {buttonBackgroundStyle, buttonTextStyle} from '@utils/buttonStyles';
import {getFullErrorMessage, isErrorWithMessage, isServerError} from '@utils/errors';
import {preventDoubleTap} from '@utils/tap';
import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
import {tryOpenURL} from '@utils/url';
import type {LaunchProps} from '@typings/launch';
@ -206,6 +207,11 @@ const LoginForm = ({config, extra, serverDisplayName, launchError, launchType, l
}, [error]);
const onPressForgotPassword = useCallback(() => {
if (config.ForgotPasswordLink) {
tryOpenURL(config.ForgotPasswordLink);
return;
}
const passProps = {
theme,
serverUrl,
@ -334,7 +340,7 @@ const LoginForm = ({config, extra, serverDisplayName, launchError, launchType, l
endAdornment={endAdornment}
/>
{(emailEnabled || usernameEnabled) && (
{(emailEnabled || usernameEnabled) && config.PasswordEnableForgotLink !== 'false' && (
<Button
onPress={onPressForgotPassword}
containerStyle={[styles.forgotPasswordBtn, error ? styles.forgotPasswordError : undefined]}

2
types/api/config.d.ts vendored
View file

@ -121,6 +121,7 @@ interface ClientConfig {
FeatureFlagCollapsedThreads?: string;
FeatureFlagGraphQL?: string;
FeatureFlagPostPriority?: string;
ForgotPasswordLink?: string;
GfycatApiKey: string;
GfycatApiSecret: string;
GoogleDeveloperKey: string;
@ -147,6 +148,7 @@ interface ClientConfig {
MinimumHashtagLength: string;
OpenIdButtonColor: string;
OpenIdButtonText: string;
PasswordEnableForgotLink: string;
PasswordMinimumLength: string;
PasswordRequireLowercase: string;
PasswordRequireNumber: string;