🩹 (simple-fix) fix handler error request
This commit is contained in:
@ -1,8 +1,27 @@
|
|||||||
"use server";
|
"use server";
|
||||||
|
|
||||||
|
import { apiErrorHandler } from "@/shared/lib/ky/errorHandler";
|
||||||
import { RegisterInputs } from "../ui/components/ProvisionInput";
|
import { RegisterInputs } from "../ui/components/ProvisionInput";
|
||||||
|
import { ServerRequestCallback } from "@/shared/types/serverRequestCallback";
|
||||||
|
|
||||||
export const submitRegisterForm = async (data: RegisterInputs) => {
|
export const submitRegisterForm = async (
|
||||||
|
data: RegisterInputs
|
||||||
|
): Promise<ServerRequestCallback> => {
|
||||||
|
if (data.password !== data.confirmPassword)
|
||||||
|
return apiErrorHandler([], {
|
||||||
|
success: false,
|
||||||
|
status: 400,
|
||||||
|
text: { message: "Password and Confirm Password do not match" },
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
await new Promise((resolve) => setTimeout(resolve, 3000));
|
await new Promise((resolve) => setTimeout(resolve, 3000));
|
||||||
return data;
|
return {
|
||||||
|
success: true,
|
||||||
|
status: 200,
|
||||||
|
text: { message: "Registration successful" },
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
return apiErrorHandler(error);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { Button, Form, Input } from "@heroui/react";
|
import { addToast, Button, Form, Input } from "@heroui/react";
|
||||||
import { SubmitHandler, useForm } from "react-hook-form";
|
import { SubmitHandler, useForm } from "react-hook-form";
|
||||||
import { submitRegisterForm } from "../../models/submitRegisterForm";
|
import { submitRegisterForm } from "../../models/submitRegisterForm";
|
||||||
|
|
||||||
@ -22,9 +22,16 @@ const ProvisionInput = ({ fullname }: Props) => {
|
|||||||
|
|
||||||
const [submitStatus, setSubmitStatus] = useState(false);
|
const [submitStatus, setSubmitStatus] = useState(false);
|
||||||
const onSubmit: SubmitHandler<RegisterInputs> = async (data) => {
|
const onSubmit: SubmitHandler<RegisterInputs> = async (data) => {
|
||||||
|
setSubmitStatus(true);
|
||||||
console.log("Mensubmit");
|
console.log("Mensubmit");
|
||||||
const returnData = await submitRegisterForm(data);
|
const returnData = await submitRegisterForm(data);
|
||||||
console.log(returnData);
|
console.log(returnData);
|
||||||
|
addToast({
|
||||||
|
color: "danger",
|
||||||
|
title: "😬 Oops, something went wrong!",
|
||||||
|
description: returnData.text.message,
|
||||||
|
});
|
||||||
|
setSubmitStatus(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -1,14 +1,7 @@
|
|||||||
"use server";
|
"use server";
|
||||||
import { api } from "@/shared/lib/ky/connector";
|
import { api } from "@/shared/lib/ky/connector";
|
||||||
import { apiErrorHandler } from "@/shared/lib/ky/errorHandler";
|
import { apiErrorHandler } from "@/shared/lib/ky/errorHandler";
|
||||||
import { HTTPError } from "ky";
|
import { ServerRequestCallback } from "@/shared/types/serverRequestCallback";
|
||||||
|
|
||||||
interface SendCallbackResponse {
|
|
||||||
success: boolean;
|
|
||||||
status: number;
|
|
||||||
text: { message: string };
|
|
||||||
data?: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @function SendCallbackToServer
|
* @function SendCallbackToServer
|
||||||
@ -64,7 +57,7 @@ interface SendCallbackResponse {
|
|||||||
export const SendCallbackToServer = async (
|
export const SendCallbackToServer = async (
|
||||||
data: string,
|
data: string,
|
||||||
provider: string
|
provider: string
|
||||||
): Promise<SendCallbackResponse> => {
|
): Promise<ServerRequestCallback> => {
|
||||||
// Construct the backend and frontend handler URLs
|
// Construct the backend and frontend handler URLs
|
||||||
const backendHandlerUrl = `auth/${provider}/callback/`;
|
const backendHandlerUrl = `auth/${provider}/callback/`;
|
||||||
const frontendHandlerUrl = `${process.env
|
const frontendHandlerUrl = `${process.env
|
||||||
|
|||||||
@ -2,9 +2,15 @@
|
|||||||
|
|
||||||
import { HTTPError } from "ky";
|
import { HTTPError } from "ky";
|
||||||
|
|
||||||
|
export type CallApiErrorHandler = {
|
||||||
|
success?: boolean;
|
||||||
|
status?: number;
|
||||||
|
text?: { message?: string };
|
||||||
|
};
|
||||||
|
|
||||||
export const apiErrorHandler = async (
|
export const apiErrorHandler = async (
|
||||||
error: unknown,
|
error: unknown,
|
||||||
safeFail: boolean = false
|
safeFail?: CallApiErrorHandler
|
||||||
) => {
|
) => {
|
||||||
if (error instanceof HTTPError) {
|
if (error instanceof HTTPError) {
|
||||||
return {
|
return {
|
||||||
@ -16,9 +22,11 @@ export const apiErrorHandler = async (
|
|||||||
|
|
||||||
if (safeFail) {
|
if (safeFail) {
|
||||||
return {
|
return {
|
||||||
success: false,
|
success: safeFail.success || false,
|
||||||
status: 500,
|
status: safeFail.status || 500,
|
||||||
text: { message: "An unexpected error occurred" },
|
text: {
|
||||||
|
message: safeFail.text?.message || "An unexpected error occurred",
|
||||||
|
},
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
throw error;
|
throw error;
|
||||||
|
|||||||
7
shared/types/ServerRequestCallback.ts
Normal file
7
shared/types/ServerRequestCallback.ts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
export type ServerRequestCallback = {
|
||||||
|
success: boolean;
|
||||||
|
status: number;
|
||||||
|
text: { message: string };
|
||||||
|
data?: any;
|
||||||
|
error?: unknown;
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user