cab1273e9c
- Introduced a new SQL migration to optimize the invitation signup process, allowing invited users to skip organization and team creation. - Updated the `register_user` and `register_google_user` functions to handle invitation signups effectively. - Enhanced the `deserialize_user` function to include an `invitation_accepted` flag. - Added new localization keys for creating organizations and related messages in multiple languages, improving user experience across the application. - Updated the SwitchTeamButton component to support organization creation and improved styling for better usability.
93 lines
2.8 KiB
TypeScript
93 lines
2.8 KiB
TypeScript
import React, { useEffect } from 'react';
|
|
import { Card, Flex, Spin, Typography } from 'antd/es';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { useNavigate } from 'react-router-dom';
|
|
|
|
import { verifyAuthentication } from '@/features/auth/authSlice';
|
|
import { useAppDispatch } from '@/hooks/useAppDispatch';
|
|
import { setSession } from '@/utils/session-helper';
|
|
import { setUser } from '@/features/user/userSlice';
|
|
import logger from '@/utils/errorLogger';
|
|
import { WORKLENZ_REDIRECT_PROJ_KEY } from '@/shared/constants';
|
|
|
|
const REDIRECT_DELAY = 500; // Delay in milliseconds before redirecting
|
|
|
|
const AuthenticatingPage: React.FC = () => {
|
|
const { t } = useTranslation('auth/auth-common');
|
|
const navigate = useNavigate();
|
|
const dispatch = useAppDispatch();
|
|
|
|
const handleSuccessRedirect = () => {
|
|
const project = localStorage.getItem(WORKLENZ_REDIRECT_PROJ_KEY);
|
|
if (project) {
|
|
localStorage.removeItem(WORKLENZ_REDIRECT_PROJ_KEY);
|
|
window.location.href = `/worklenz/projects/${project}?tab=tasks-list`;
|
|
return;
|
|
}
|
|
|
|
navigate('/worklenz/home');
|
|
};
|
|
|
|
useEffect(() => {
|
|
const handleAuthentication = async () => {
|
|
try {
|
|
const session = await dispatch(verifyAuthentication()).unwrap();
|
|
|
|
if (!session.authenticated) {
|
|
return navigate('/auth/login');
|
|
}
|
|
|
|
// Set user session and state
|
|
setSession(session.user);
|
|
dispatch(setUser(session.user));
|
|
|
|
// Check if user joined via invitation
|
|
if (session.user.invitation_accepted) {
|
|
// For invited users, redirect directly to their team
|
|
// They don't need to go through setup as they're joining an existing team
|
|
setTimeout(() => {
|
|
handleSuccessRedirect();
|
|
}, REDIRECT_DELAY);
|
|
return;
|
|
}
|
|
|
|
// For regular users (team owners), check if setup is needed
|
|
if (!session.user.setup_completed) {
|
|
return navigate('/worklenz/setup');
|
|
}
|
|
|
|
// Redirect based on setup status
|
|
setTimeout(() => {
|
|
handleSuccessRedirect();
|
|
}, REDIRECT_DELAY);
|
|
} catch (error) {
|
|
logger.error('Authentication verification failed:', error);
|
|
navigate('/auth/login');
|
|
}
|
|
};
|
|
|
|
void handleAuthentication();
|
|
}, [dispatch, navigate]);
|
|
|
|
const cardStyles = {
|
|
width: '100%',
|
|
boxShadow: 'none',
|
|
};
|
|
|
|
return (
|
|
<Card style={cardStyles}>
|
|
<Flex vertical align="center" gap="middle">
|
|
<Spin size="large" />
|
|
<Typography.Title level={3}>
|
|
{t('authenticating', { defaultValue: 'Authenticating...' })}
|
|
</Typography.Title>
|
|
<Typography.Text>
|
|
{t('gettingThingsReady', { defaultValue: 'Getting things ready for you...' })}
|
|
</Typography.Text>
|
|
</Flex>
|
|
</Card>
|
|
);
|
|
};
|
|
|
|
export default AuthenticatingPage;
|