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

Update the value for login type (#9329)

Browse source 
* Update the value for login type

* Centralize login type in a constant
This commit is contained in:
Daniel Espino García 2025-12-12 16:26:22 +01:00 committed by GitHub
parent 23fec945a4
commit b237b3639c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/constants/sso.ts
View file

@ -7,6 +7,11 @@ import keyMirror from '@utils/key_mirror';
export const REDIRECT_URL_SCHEME = LocalConfig.AuthUrlScheme;
export const REDIRECT_URL_SCHEME_DEV = LocalConfig.AuthUrlSchemeDev;
export const LOGIN_TYPE = {
MAGIC_LINK: 'magic_link',
EMAIL_PASSWORD: '',
} as const;
const constants = keyMirror({
SAML: null,
GITLAB: null,
@ -17,6 +22,7 @@ const constants = keyMirror({
export default {
...constants,
...LOGIN_TYPE,
REDIRECT_URL_SCHEME,
REDIRECT_URL_SCHEME_DEV,
};

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

@ -13,6 +13,7 @@ import CompassIcon from '@components/compass_icon';
import FloatingTextInput from '@components/floating_input/floating_text_input_label';
import FormattedText from '@components/formatted_text';
import {FORGOT_PASSWORD, MFA} from '@constants/screens';
import {LOGIN_TYPE} from '@constants/sso';
import {useAvoidKeyboard} from '@hooks/device';
import {usePreventDoubleTap} from '@hooks/utils';
import {goToScreen, loginAnimationOptions, resetToHome} from '@screens/navigation';
@ -45,7 +46,7 @@ function getButtonDisabled(loginId: string, password: string, userLoginType: Log
return true;
}
if (magicLinkEnabled && (userLoginType === 'guest_magic_link' || userLoginType === undefined)) {
if (magicLinkEnabled && (userLoginType === LOGIN_TYPE.MAGIC_LINK || userLoginType === undefined)) {
return false;
}
@ -248,7 +249,7 @@ const LoginForm = ({
Keyboard.dismiss();
if (magicLinkEnabled && userLoginType === undefined) {
const receivedUserLoginType = await checkUserLoginType();
if (receivedUserLoginType === 'guest_magic_link') {
if (receivedUserLoginType === LOGIN_TYPE.MAGIC_LINK) {
setMagicLinkSent(true);
}
if (isDeactivated) {
@ -310,7 +311,7 @@ const LoginForm = ({
}, [managedConfig?.username]);
const onIdInputSubmitting = useCallback(() => {
if (!magicLinkEnabled || (userLoginType !== 'guest_magic_link')) {
if (!magicLinkEnabled || (userLoginType !== LOGIN_TYPE.MAGIC_LINK)) {
focusPassword();
return;
}
@ -319,7 +320,7 @@ const LoginForm = ({
}, [focusPassword, onLogin, magicLinkEnabled, userLoginType]);
const buttonDisabled = getButtonDisabled(loginId, password, userLoginType, isDeactivated, magicLinkEnabled);
const showPasswordInput = !magicLinkEnabled || (userLoginType !== 'guest_magic_link' && userLoginType !== undefined && !isDeactivated);
const showPasswordInput = !magicLinkEnabled || (userLoginType !== LOGIN_TYPE.MAGIC_LINK && userLoginType !== undefined && !isDeactivated);
let userInputError = error;
if (showPasswordInput) {
// error is passed to the password input box, so we use this

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

@ -163,4 +163,4 @@ type GetUsersOptions = {
team_roles?: string;
};
type LoginType = '' | 'guest_magic_link';
type LoginType = '' | 'magic_link';