awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

finalized signup/signin ux regarding redirects

Browse Source
This commit is contained in:
Sheen Capadngan
2023-05-07 20:54:30 +08:00
parent ea86e59d4f
commit 4c434555a4
9 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/controllers/v3/authController.ts
View File

@@ -28,6 +28,7 @@ declare module 'jsonwebtoken' {
userId: string;
email: string;
authProvider: AuthProvider;
isUserCompleted: boolean,
}
}

3
backend/src/utils/auth.ts
View File

@@ -74,7 +74,7 @@ const initializePassport = async () => {
let user = await User.findOne({
authProvider: AuthProvider.GOOGLE,
authId: profile.id,
})
}).select('+publicKey')
if (!user) {
user = await new User({
@@ -89,6 +89,7 @@ const initializePassport = async () => {
userId: user._id.toString(),
email: user.email,
authProvider: user.authProvider,
isUserCompleted: !!user.publicKey
},
expiresIn: await getJwtProviderAuthLifetime(),
secret: await getJwtProviderAuthSecret(),

6
frontend/src/components/login/PasswordInputStep.tsx
View File

@@ -33,15 +33,15 @@ export default function PasswordInputStep({
const handleLogin = async () => {
try {
setIsLoading(true);
const isLoginSuccessful = await attemptLogin({
const loginAttempt = await attemptLogin({
email,
password
});
if (isLoginSuccessful && isLoginSuccessful.success) {
if (loginAttempt && loginAttempt.success) {
// case: login was successful
if (isLoginSuccessful.mfaEnabled) {
if (loginAttempt.mfaEnabled) {
// case: login requires MFA step
setStep(2);
setIsLoading(false);

1
frontend/src/components/signup/UserInfoStep.tsx
View File

@@ -167,6 +167,7 @@ export default function UserInfoStep({
// unset signup JWT token and set JWT token
SecurityClient.setSignupToken('');
SecurityClient.setToken(response.token);
SecurityClient.setProviderAuthToken('');
saveTokenToLocalStorage({
publicKey,

4
frontend/src/components/utilities/attemptLogin.ts
View File

@@ -91,7 +91,9 @@ const attemptLogin = async (
token
) {
// case: MFA is not enabled
// unset provider auth token in case it was used
SecurityClient.setProviderAuthToken('');
// set JWT token
SecurityClient.setToken(token);

6
frontend/src/components/utilities/attemptLoginMfa.ts
View File

@@ -36,7 +36,10 @@ const attemptLoginMfa = async ({
}, async () => {
try {
const clientPublicKey = client.getPublicKey();
const { salt } = await login1(email, clientPublicKey);
const { salt } = await login1({
email,
clientPublicKey,
});
const {
encryptionVersion,
@@ -56,6 +59,7 @@ const attemptLoginMfa = async ({
// unset temporary (MFA) JWT token and set JWT token
SecurityClient.setMfaToken('');
SecurityClient.setToken(token);
SecurityClient.setProviderAuthToken('');
const privateKey = await KeyService.decryptPrivateKey({
encryptionVersion,

20
frontend/src/hooks/useProviderAuth.ts
View File

@@ -9,14 +9,19 @@ export const useProviderAuth = () => {
const [providerAuthToken, setProviderAuthToken] = useState<string>(
SecurityClient.getProviderAuthToken() || ''
);
const [isProviderUserCompleted, setIsProviderUserCompleted] = useState<boolean>();
useEffect(() => {
const handleStorageChange = (event: StorageEvent) => {
if (event.storageArea === localStorage && event.key === PROVIDER_AUTH_TOKEN_KEY) {
if (event.newValue) {
const token = event.newValue;
const { userId: resultUserId, email: resultEmail } = jwt_decode(token) as any;
const {
userId: resultUserId,
email: resultEmail,
isUserCompleted: resultIsUserCompleted,
} = jwt_decode(token) as any;
setIsProviderUserCompleted(resultIsUserCompleted);
setProviderAuthToken(token);
setEmail(resultEmail);
setUserId(resultUserId);
@@ -24,6 +29,7 @@ export const useProviderAuth = () => {
setProviderAuthToken('');
setEmail('');
setUserId('');
setIsProviderUserCompleted(false);
}
setProviderAuthToken(event.newValue || '');
}
@@ -32,9 +38,14 @@ export const useProviderAuth = () => {
window.addEventListener('storage', handleStorageChange);
if (providerAuthToken) {
const { userId: resultUserId, email: resultEmail } = jwt_decode(providerAuthToken) as any;
const {
userId: resultUserId,
email: resultEmail,
isUserCompleted: resultIsUserCompleted,
} = jwt_decode(providerAuthToken) as any;
setEmail(resultEmail);
setUserId(resultUserId);
setIsProviderUserCompleted(resultIsUserCompleted);
}
return () => {
@@ -44,10 +55,11 @@ export const useProviderAuth = () => {
return {
email,
isProviderUserCompleted,
providerAuthToken,
userId,
setProviderAuthToken,
setEmail,
setProviderAuthToken,
setUserId,
};
};

7
frontend/src/pages/login.tsx
View File

@@ -27,9 +27,14 @@ export default function Login() {
const {
providerAuthToken,
email: providerEmail,
setProviderAuthToken
setProviderAuthToken,
isProviderUserCompleted,
} = useProviderAuth();
if (providerAuthToken && isProviderUserCompleted === false) {
router.push('/signup');
}
const setLanguage = async (to: string) => {
router.push('/login', '/login', { locale: to });
localStorage.setItem('lang', to);

10
frontend/src/pages/signup.tsx
View File

@@ -35,7 +35,15 @@ export default function SignUp() {
const { data: serverDetails } = useFetchServerStatus();
const [isSignupWithEmail, setIsSignupWithEmail] = useState(false);
const { t } = useTranslation();
const { email: providerEmail, providerAuthToken } = useProviderAuth();
const {
email: providerEmail,
providerAuthToken,
isProviderUserCompleted,
} = useProviderAuth();
if (providerAuthToken && isProviderUserCompleted) {
router.push('/login');
}
if (providerAuthToken && step < 3) {
setStep(3);