+
+ • {t("After v1-0-2, this setup guide is not needed anymore")}.
+
•{" "}
{t(
diff --git a/app/api/admin/configs/route.ts b/app/api/admin/configs/route.ts
index 911407f..b9b2aa5 100644
--- a/app/api/admin/configs/route.ts
+++ b/app/api/admin/configs/route.ts
@@ -23,6 +23,7 @@ export async function GET(req: NextRequest) {
"enable_google_oauth",
"enable_liunxdo_oauth",
"enable_resend_email_login",
+ "enable_email_password_login",
]);
return Response.json(configs, { status: 200 });
diff --git a/app/api/auth/credentials/route.ts b/app/api/auth/credentials/route.ts
new file mode 100644
index 0000000..8e4b777
--- /dev/null
+++ b/app/api/auth/credentials/route.ts
@@ -0,0 +1,46 @@
+import { NextRequest } from "next/server";
+import { compare, hash } from "bcrypt";
+
+import { prisma } from "@/lib/db";
+
+export async function POST(req: NextRequest) {
+ try {
+ const { email, password, name } = await req.json();
+ if (!email || !password) {
+ return Response.json("email and password is required", { status: 400 });
+ }
+
+ const user = await prisma.user.findUnique({
+ where: {
+ email,
+ },
+ });
+
+ if (!user) {
+ const newUser = await prisma.user.create({
+ data: {
+ name: "",
+ email,
+ password: await hash(password, 10),
+ active: 1,
+ role: "USER",
+ team: "free",
+ createdAt: new Date().toISOString(),
+ updatedAt: new Date().toISOString(),
+ },
+ });
+ return Response.json(newUser, { status: 200 });
+ } else {
+ const passwordCorrect = await compare(password, user.password || "");
+
+ if (passwordCorrect) {
+ return Response.json(user, { status: 200 });
+ }
+ }
+
+ return Response.json(null, { status: 400 });
+ } catch (error) {
+ console.error("[Auth Error]", error);
+ return Response.json(error.message || "Server error", { status: 500 });
+ }
+}
diff --git a/app/api/feature/route.ts b/app/api/feature/route.ts
index 0eb336b..c708fb2 100644
--- a/app/api/feature/route.ts
+++ b/app/api/feature/route.ts
@@ -2,7 +2,7 @@ import { getMultipleConfigs } from "@/lib/dto/system-config";
export const dynamic = "force-dynamic";
-export async function GET(req: Request) {
+export async function GET() {
try {
const configs = await getMultipleConfigs([
"enable_user_registration",
@@ -12,12 +12,14 @@ export async function GET(req: Request) {
"enable_google_oauth",
"enable_liunxdo_oauth",
"enable_resend_email_login",
+ "enable_email_password_login",
]);
return Response.json({
google: configs.enable_google_oauth,
github: configs.enable_github_oauth,
linuxdo: configs.enable_liunxdo_oauth,
resend: configs.enable_resend_email_login,
+ credentials: configs.enable_email_password_login,
registration: configs.enable_user_registration,
});
} catch (error) {
diff --git a/app/api/record/add/route.ts b/app/api/record/add/route.ts
index 4158220..115a016 100644
--- a/app/api/record/add/route.ts
+++ b/app/api/record/add/route.ts
@@ -58,10 +58,10 @@ export async function POST(req: Request) {
if (!matchedZone) {
return Response.json(
- `No matching zone found for domain: ${record_name}`,
+ `No matching zone found for domain: ${record.zone_name}`,
{
status: 400,
- statusText: "Invalid domain",
+ statusText: "Invalid zone name",
},
);
}
@@ -78,6 +78,7 @@ export async function POST(req: Request) {
record.type,
record_name,
record.content,
+ record.zone_name,
1,
);
if (user_record && user_record.length > 0) {
diff --git a/app/api/record/admin/add/route.ts b/app/api/record/admin/add/route.ts
index 26a7ff0..7f07c0a 100644
--- a/app/api/record/admin/add/route.ts
+++ b/app/api/record/admin/add/route.ts
@@ -87,6 +87,7 @@ export async function POST(req: Request) {
record.type,
record_name,
record.content,
+ record.zone_name,
1,
);
if (user_record && user_record.length > 0) {
diff --git a/app/api/record/admin/apply/route.ts b/app/api/record/admin/apply/route.ts
index a23c3c8..6ebb320 100644
--- a/app/api/record/admin/apply/route.ts
+++ b/app/api/record/admin/apply/route.ts
@@ -20,7 +20,6 @@ export async function POST(req: Request) {
const { record: reviewRecord, userId, id } = await req.json();
const record = {
...reviewRecord,
- // comment: "Created by wr.do (review mode)",
id,
};
@@ -40,9 +39,11 @@ export async function POST(req: Request) {
record,
);
+ console.log("[data]", data);
+
if (!data.success || !data.result?.id) {
- return Response.json(data.messages, {
- status: 501,
+ return Response.json(data.errors[0].message, {
+ status: 503,
});
} else {
const res = await updateUserRecordReview(userId, id, {
diff --git a/app/api/record/delete/route.ts b/app/api/record/delete/route.ts
index e2bdebf..155f14e 100644
--- a/app/api/record/delete/route.ts
+++ b/app/api/record/delete/route.ts
@@ -28,14 +28,22 @@ export async function POST(req: Request) {
});
}
- const res = await deleteDNSRecord(
- matchedZone.cf_zone_id!,
- matchedZone.cf_api_key!,
- matchedZone.cf_email!,
- record_id,
- );
+ if (active !== 3) {
+ const res = await deleteDNSRecord(
+ matchedZone.cf_zone_id!,
+ matchedZone.cf_api_key!,
+ matchedZone.cf_email!,
+ record_id,
+ );
- if (res && res.result?.id) {
+ if (res && res.result?.id) {
+ await deleteUserRecord(user.id, record_id, zone_id, active);
+ return Response.json("success", {
+ status: 200,
+ statusText: "success",
+ });
+ }
+ } else {
await deleteUserRecord(user.id, record_id, zone_id, active);
return Response.json("success", {
status: 200,
diff --git a/app/manifest.json b/app/manifest.json
index 54f6e8b..b33d2a2 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -3,7 +3,7 @@
"short_name": "WR.DO",
"description": "Shorten links with analytics, manage emails and control subdomains—all on one platform.",
"appid": "com.wr.do",
- "versionName": "1.0.1",
+ "versionName": "1.0.2",
"versionCode": "1",
"start_url": "/",
"orientation": "portrait",
diff --git a/auth.config.ts b/auth.config.ts
index 3d17fb1..0b84f1a 100644
--- a/auth.config.ts
+++ b/auth.config.ts
@@ -1,4 +1,5 @@
import type { NextAuthConfig } from "next-auth";
+import Credentials from "next-auth/providers/credentials";
import Github from "next-auth/providers/github";
import Google from "next-auth/providers/google";
import Resend from "next-auth/providers/resend";
@@ -67,5 +68,29 @@ export default {
},
}),
linuxDoProvider,
+ Credentials({
+ name: "Credentials",
+ credentials: {
+ name: { label: "name", type: "text" },
+ email: { label: "Email", type: "email" },
+ password: { label: "Password", type: "password" },
+ },
+ async authorize(credentials) {
+ const res = await fetch(
+ process.env.AUTH_URL + "/api/auth/credentials",
+ {
+ method: "POST",
+ body: JSON.stringify(credentials),
+ },
+ );
+ // console.log("[res]", res);
+
+ if (res.ok) {
+ return res.json();
+ }
+
+ return null;
+ },
+ }),
],
} satisfies NextAuthConfig;
diff --git a/auth.ts b/auth.ts
index 8421fbe..a657a09 100644
--- a/auth.ts
+++ b/auth.ts
@@ -53,7 +53,6 @@ export const {
return session;
},
-
async jwt({ token }) {
if (!token.sub) return token;
diff --git a/components/forms/record-form.tsx b/components/forms/record-form.tsx
index f908422..bb445ed 100644
--- a/components/forms/record-form.tsx
+++ b/components/forms/record-form.tsx
@@ -65,9 +65,7 @@ export function RecordForm({
const [currentRecordType, setCurrentRecordType] = useState(
initData?.type || "CNAME",
);
- const [currentZoneName, setCurrentZoneName] = useState(
- initData?.zone_name || "wr.do",
- );
+ const [currentZoneName, setCurrentZoneName] = useState(initData?.zone_name);
const [email, setEmail] = useState(initData?.user.email || user.email);
const [allowedRecordTypes, setAllowedRecordTypes] = useState([]);
const isAdmin = action.indexOf("admin") > -1;
@@ -83,7 +81,7 @@ export function RecordForm({
} = useForm({
resolver: zodResolver(createRecordSchema),
defaultValues: {
- zone_name: initData?.zone_name || "wr.do",
+ zone_name: initData?.zone_name,
type: initData?.type || "CNAME",
ttl: initData?.ttl || 1,
proxied: initData?.proxied || false,
@@ -121,6 +119,7 @@ export function RecordForm({
useEffect(() => {
if (validDefaultDomain) {
+ setValue("zone_name", validDefaultDomain);
setCurrentZoneName(validDefaultDomain);
}
}, [validDefaultDomain]);
@@ -563,7 +562,13 @@ export function RecordForm({
{isPending ? (
) : (
- {type === "edit" ? t("Update") : t("Save")}
+
+ {type === "edit"
+ ? initData?.active === 2 && isAdmin
+ ? t("Agree")
+ : t("Update")
+ : t("Save")}
+
)}
)}
diff --git a/components/forms/url-form.tsx b/components/forms/url-form.tsx
index 9c4fc0b..a3e0231 100644
--- a/components/forms/url-form.tsx
+++ b/components/forms/url-form.tsx
@@ -1,6 +1,12 @@
"use client";
-import { Dispatch, SetStateAction, useMemo, useTransition } from "react";
+import {
+ Dispatch,
+ SetStateAction,
+ useEffect,
+ useMemo,
+ useTransition,
+} from "react";
import { zodResolver } from "@hookform/resolvers/zod";
import { User } from "@prisma/client";
import { Sparkles } from "lucide-react";
@@ -58,7 +64,6 @@ export function UrlForm({
handleSubmit,
register,
formState: { errors },
- getValues,
setValue,
} = useForm({
resolver: zodResolver(createUrlSchema),
@@ -67,7 +72,7 @@ export function UrlForm({
target: initData?.target || "",
url: initData?.url || "",
active: initData?.active || 1,
- prefix: initData?.prefix || "wr.do",
+ prefix: initData?.prefix || "",
visible: initData?.visible || 0,
expiration: initData?.expiration || "-1",
password: initData?.password || "",
@@ -96,6 +101,12 @@ export function UrlForm({
return shortDomains[0].domain_name;
}, [shortDomains, initData?.prefix]);
+ useEffect(() => {
+ if (validDefaultDomain) {
+ setValue("prefix", validDefaultDomain);
+ }
+ }, [validDefaultDomain]);
+
const onSubmit = handleSubmit((data) => {
if (type === "add") {
handleCreateUrl(data);
diff --git a/components/forms/user-api-key-form.tsx b/components/forms/user-api-key-form.tsx
index 9c2d27e..aa7cf75 100644
--- a/components/forms/user-api-key-form.tsx
+++ b/components/forms/user-api-key-form.tsx
@@ -68,6 +68,7 @@ export function UserApiKeyForm({ user }: UserNameFormProps) {
{
type?: string;
}
type FormData = z.infer;
+type FormData2 = z.infer;
export function UserAuthForm({ className, type, ...props }: UserAuthFormProps) {
const {
@@ -34,34 +35,63 @@ export function UserAuthForm({ className, type, ...props }: UserAuthFormProps) {
} = useForm({
resolver: zodResolver(userAuthSchema),
});
- const [isLoading, setIsLoading] = React.useState(false);
+ const {
+ register: register2,
+ handleSubmit: handleSubmit2,
+ formState: { errors: errors2 },
+ } = useForm({
+ resolver: zodResolver(userPasswordAuthSchema),
+ });
+ // const [isLoading, setIsLoading] = React.useState(false);
+ const [isLoading, startTransition] = React.useTransition();
const [isGoogleLoading, setIsGoogleLoading] = React.useState(false);
const [isGithubLoading, setIsGithubLoading] = React.useState(false);
const [isLinuxDoLoading, setIsLinuxDoLoading] =
React.useState(false);
const searchParams = useSearchParams();
+ const router = useRouter();
const t = useTranslations("Auth");
async function onSubmit(data: FormData) {
- setIsLoading(true);
-
- const signInResult = await signIn("resend", {
- email: data.email.toLowerCase(),
- redirect: false,
- callbackUrl: searchParams?.get("from") || "/dashboard",
- });
-
- setIsLoading(false);
-
- if (!signInResult?.ok) {
- return toast.error("Something went wrong.", {
- description: "Your sign in request failed. Please try again.",
+ startTransition(async () => {
+ const signInResult = await signIn("resend", {
+ email: data.email.toLowerCase(),
+ redirect: false,
+ callbackUrl: searchParams?.get("from") || "/dashboard",
});
- }
- return toast.success("Check your email", {
- description: "We sent you a login link. Be sure to check your spam too.",
+ if (!signInResult?.ok) {
+ toast.error(t("Something went wrong"), {
+ description: "Your sign in request failed. Please try again.",
+ });
+ }
+
+ toast.success(t("Check your email"), {
+ description: `${t("We sent you a login link")}. ${t("Be sure to check your spam too")}.`,
+ });
+ });
+ }
+ async function onSubmitPwd(data: FormData2) {
+ startTransition(async () => {
+ const signInResult = await signIn("credentials", {
+ name: data.name,
+ email: data.email,
+ password: data.password,
+ redirect: false,
+ callbackUrl: searchParams?.get("from") || "/dashboard",
+ });
+
+ // console.log("[signInResult]", signInResult);
+
+ if (signInResult?.error) {
+ toast.error(t("Something went wrong"), {
+ description: `[${signInResult?.error}] ${t("Incorrect email or password")}.`,
+ });
+ } else {
+ toast.success(t("Welcome back!"));
+ router.push(searchParams?.get("from") || "/dashboard");
+ }
});
}
@@ -99,12 +129,127 @@ export function UserAuthForm({ className, type, ...props }: UserAuthFormProps) {
);
}
+ const rendeResend = () =>
+ loginMethod["resend"] && (
+
+ );
+
+ const rendeCredentials = () =>
+ loginMethod["credentials"] && (
+
+ );
+
return (
+ {!loginMethod.registration && (
+
+ 📢 {t("Administrator has disabled new user registration")}.
+
+ )}
+
{loginMethod["google"] && (
-
+
)}
{loginMethod["github"] && (
-
+
)}
{loginMethod["linuxdo"] && (
-
+
)}
{(loginMethod["google"] ||
loginMethod["github"] ||
loginMethod["linuxdo"]) &&
- loginMethod["resend"] &&
+ (loginMethod["resend"] || loginMethod["credentials"]) &&
rendeSeparator()}
- {loginMethod["resend"] && (
-
+ {loginMethod["resend"] && loginMethod["credentials"] ? (
+
+
+ {t("Email Code")}
+ {t("Password")}
+
+ {rendeResend()}
+ {rendeCredentials()}
+
+ ) : (
+ <>
+ {rendeResend()}
+ {rendeCredentials()}
+
)}
+ LinuxDo OAuth
+