src/app/actions/auth.ts

@@ -139,6 +139,7 @@ export type FormState = {
 		agree: string;
 	},
 	mailConfirm?: boolean,
+	userId?: number,
 	error: Record<string, string> | null
 };
 
@@ -219,19 +220,14 @@ export async function registration(
 		if (response.ok) {
 			let parsed = await response.json() as {
 				message_desc: string,
-				message_body: { token: string },
+				message_body: { token: string, userId: number },
 				message_code: string
 			};
+			console.log(parsed);
 			if (parsed.message_desc === 'Operation successful') {
-				await createSession(parsed.message_body.token, email as string);
-			} else {
-				throw parsed;
-			}
-		} else {
-			throw (`${response.status}`);
-		}
 
-		/* return {
+				/* await createSession(parsed.message_body.token, email as string); */
+				return {
 					previousState: {
 						fullName,
 						email,
@@ -242,8 +238,16 @@ export async function registration(
 						agree
 					},
 					mailConfirm: true,
+					userId: parsed.message_body.userId,
 					error: null
-		}; */
+				};
+			} else {
+				throw parsed;
+			}
+		} else {
+			throw (`${response.status}`);
+		}
+
 	} catch (error: unknown) {
 		if (error) {
 			const typedError = error as any;
@@ -282,6 +286,7 @@ export async function registration(
 					companyName,
 					agree
 				},
+				mailConfirm: false,
 				error: errors
 			};
 		}
@@ -327,9 +332,81 @@ export async function tokenLifeExtension() {
 
 export async function confirmEmail(
 	state: any | undefined,
-	formData: any,
+	formData: any
 ) {
 	console.log('confirmEmail');
 	const emailConfirm = formData.get('emailConfirm') as string || '';
-	console.log(emailConfirm);
+	const userId = formData.get('userId') as string || '';
+
+	try {
+		const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
+			method: 'POST',
+			headers: {
+				"Content-Type": "application/json",
+				"Accept": "application/json",
+			},
+			body: JSON.stringify({
+				version: 1,
+				msg_id: 20009,
+				message_body: {
+					resend: 0,
+					user_id: userId,
+					verify_token: emailConfirm
+				}
+			}),
+		});
+
+		if (response.ok) {
+			const parsed = await response.json();
+			console.log(parsed);
+
+			if (parsed.message_code === 0) {
+				await createSession(parsed.message_body.token, parsed.message_body.email as string);
+			}
+		}
+	} catch (error) {
+		return {
+			error: 'error'
+		}
+	}
+
+	redirect('/pages/dashboard');
+}
+
+export async function resendConfirmEmail(userId: number) {
+	console.log('resendConfirmEmail');
+
+
+	try {
+		const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
+			method: 'POST',
+			headers: {
+				"Content-Type": "application/json",
+				"Accept": "application/json",
+			},
+			body: JSON.stringify({
+				version: 1,
+				msg_id: 20009,
+				message_body: {
+					resend: 1,
+					user_id: userId,
+				}
+			}),
+		});
+
+		if (response.ok) {
+			const parsed = await response.json();
+			console.log(parsed);
+
+			if (parsed.message_code === 0) {
+				return {
+					fine: true
+				}
+			}
+		}
+	} catch (error) {
+		return {
+			fine: false
+		}
+	}
 }

src/app/ui/forms/register-form.tsx

@@ -1,8 +1,8 @@
 'use client'
 
 import styles from '@/app/styles/module/login.module.scss';
-import { ChangeEvent, useActionState, useEffect, useRef, useState } from 'react';
-import { registration, FormState, confirmEmail } from '@/app/actions/auth';
+import { ChangeEvent, useActionState, useEffect, useRef, useState, MouseEvent } from 'react';
+import { registration, FormState, confirmEmail, resendConfirmEmail } from '@/app/actions/auth';
 import PhoneInput from '@/app/ui/inputs/phone-input';
 import Link from 'next/link';
 import { useTranslations } from 'next-intl';
@@ -113,8 +113,23 @@ export default function RegisterForm() {
 		}
 	}
 
+	async function reSendEmailConfirmCode(e: MouseEvent) {
+		e.preventDefault();
+		console.log(state?.userId ? state?.userId : '');
+		if (state?.userId) {
+			await resendConfirmEmail(state?.userId);
+		}
+	}
+
 	return (
 		<>
+			<button
+				onClick={() => {
+					setShowMailConfirmWindow(!showMailConfirmWindow)
+				}}
+			>
+				show modal
+			</button>
 			{showMailConfirmWindow && (
 				<div
 					className="modal-wrapper"
@@ -151,10 +166,31 @@ export default function RegisterForm() {
 										onChange={(e) => {
 										}}
 									/>
+									<input
+										type="hiden"
+										id="userId"
+										name="userId"
+										style={{ display: 'none' }}
+										defaultValue={state?.userId ? state?.userId : ''}
+									/>
 								</div>
+								<div>
+									{stateEmailConfrim?.error}
+								</div>
+								<div className="flex gap-2">
 									<button type="submit" className={`${styles['btn']}`}>
 										Проверить
 									</button>
+									<button
+										className={`${styles['btn']}`}
+										onClick={(e) => {
+											reSendEmailConfirmCode(e);
+										}}
+									>
+										test
+									</button>
+								</div>
+
 							</form>
 						</div>
 					</div>