+
+
+
+ {t("account.accountSettings.title").toUpperCase()}
-
+
{
+
+
+
+ {t("account.restapi.sectionTitle")}
+
+
+
+
+
+ {t("account.restapi.description")}
+
+
+ https://ztnet.network/Rest%20Api/ztnet-web-api
+
+
+
+
- {t("account.zerotierCentral.title").toUpperCase()}{" "}
+ {t("account.zerotierCentral.title").toUpperCase()}
- BETA
+
-
{t.rich("account.zerotierCentral.description", {
br: () =>
,
@@ -222,7 +249,9 @@ const Account = () => {
/>
+
+
+
+
+ {t("account.accountPreferences.title")}
@@ -244,8 +273,13 @@ const Account = () => { ))}
-
{t("account.application.title")}
++ {t("account.application.title")} +
{t("account.application.version")}
diff --git a/src/pages/user-settings/network/index.tsx b/src/pages/user-settings/network/index.tsx index 29dfe8a4..0333acc9 100644 --- a/src/pages/user-settings/network/index.tsx +++ b/src/pages/user-settings/network/index.tsx @@ -5,9 +5,9 @@ import { useTranslations } from "use-intl"; import { User, UserOptions } from "@prisma/client"; interface UserExtended extends User { - options: UserOptions & { - deAuthorizeWarning: boolean; - }; + options: UserOptions & { + deAuthorizeWarning: boolean; + }; } const UserNetworkSetting = () => { @@ -20,14 +20,14 @@ const UserNetworkSetting = () => {- {t("account.networkSetting.memberAnotations")} + {t("network.annotations.memberAnotations")}
-
{
if (ctx.session.user.id === input.id) {
throwError("You can't delete your own account");
}
- if (input.id === 1) {
- throwError("You can't delete the user who created the first account");
+
+ // check if user is admin user
+ const user = await ctx.prisma.user.findUnique({
+ where: {
+ id: input.id,
+ },
+ });
+
+ if (user.role === "ADMIN") {
+ throwError("You can't delete admin users");
}
+
// get user networks
const userNetworks = await ctx.prisma.network.findMany({
where: {
@@ -102,7 +106,7 @@ export const adminRouter = createTRPCRouter({
getUser: adminRoleProtectedRoute
.input(
z.object({
- userId: z.number(),
+ userId: z.string(),
}),
)
.query(async ({ ctx, input }) => {
@@ -269,7 +273,7 @@ export const adminRouter = createTRPCRouter({
message: "Role is not valid",
path: ["role"],
}),
- id: z.number(),
+ id: z.string(),
}),
)
.mutation(async ({ ctx, input }) => {
@@ -636,7 +640,7 @@ export const adminRouter = createTRPCRouter({
// Use upsert to either update or create a new userGroup
return await ctx.prisma.userGroup.upsert({
where: {
- id: input.id || -1, // If no ID is provided, it assumes -1 which likely doesn't exist (assuming positive autoincrementing IDs)
+ id: input.id || -1,
},
create: {
name: input.groupName,
@@ -718,7 +722,7 @@ export const adminRouter = createTRPCRouter({
assignUserGroup: adminRoleProtectedRoute
.input(
z.object({
- userid: z.number(),
+ userid: z.string(),
userGroupId: z.string().nullable(), // Allow null value for userGroupId
}),
)
@@ -1041,48 +1045,4 @@ export const adminRouter = createTRPCRouter({
}
}
}),
- getApiToken: adminRoleProtectedRoute.query(async ({ ctx }) => {
- return await ctx.prisma.aPIToken.findMany({
- where: {
- userId: ctx.session.user.id,
- },
- });
- }),
- addApiToken: adminRoleProtectedRoute
- .input(
- z.object({
- name: z.string().min(5).max(50),
- }),
- )
- .mutation(async ({ ctx, input }) => {
- const token_conent: string = JSON.stringify({
- name: input.name,
- userId: ctx.session.user.id,
- });
-
- const token_hash = encrypt(token_conent, generateInstanceSecret(API_TOKEN_SECRET));
- const token = await ctx.prisma.aPIToken.create({
- data: {
- token: token_hash,
- name: input.name,
- userId: ctx.session.user.id,
- },
- });
- return token;
- }),
-
- deleteApiToken: adminRoleProtectedRoute
- .input(
- z.object({
- id: z.number(),
- }),
- )
- .mutation(async ({ ctx, input }) => {
- return await ctx.prisma.aPIToken.delete({
- where: {
- id: input.id,
- userId: ctx.session.user.id,
- },
- });
- }),
});
diff --git a/src/server/api/routers/authRouter.ts b/src/server/api/routers/authRouter.ts
index 768e30ac..851dad97 100644
--- a/src/server/api/routers/authRouter.ts
+++ b/src/server/api/routers/authRouter.ts
@@ -17,6 +17,7 @@ import {
} from "~/utils/mail";
import ejs from "ejs";
import * as ztController from "~/utils/ztApi";
+import { API_TOKEN_SECRET, encrypt, generateInstanceSecret } from "~/utils/encryption";
// This regular expression (regex) is used to validate a password based on the following criteria:
// - The password must be at least 6 characters long.
@@ -428,7 +429,7 @@ export const authRouter = createTRPCRouter({
try {
interface IJwt {
- id: number;
+ id: string;
token: string;
}
const { id } = jwt.decode(token) as IJwt;
@@ -575,4 +576,48 @@ export const authRouter = createTRPCRouter({
return updated;
}),
+ getApiToken: protectedProcedure.query(async ({ ctx }) => {
+ return await ctx.prisma.aPIToken.findMany({
+ where: {
+ userId: ctx.session.user.id,
+ },
+ });
+ }),
+ addApiToken: protectedProcedure
+ .input(
+ z.object({
+ name: z.string().min(5).max(50),
+ }),
+ )
+ .mutation(async ({ ctx, input }) => {
+ const token_content: string = JSON.stringify({
+ name: input.name,
+ userId: ctx.session.user.id,
+ });
+
+ const token_hash = encrypt(token_content, generateInstanceSecret(API_TOKEN_SECRET));
+ const token = await ctx.prisma.aPIToken.create({
+ data: {
+ token: token_hash,
+ name: input.name,
+ userId: ctx.session.user.id,
+ },
+ });
+ return token;
+ }),
+
+ deleteApiToken: protectedProcedure
+ .input(
+ z.object({
+ id: z.number(),
+ }),
+ )
+ .mutation(async ({ ctx, input }) => {
+ return await ctx.prisma.aPIToken.delete({
+ where: {
+ id: input.id,
+ userId: ctx.session.user.id,
+ },
+ });
+ }),
});
diff --git a/src/server/api/routers/networkRouter.ts b/src/server/api/routers/networkRouter.ts
index f8659ea4..b51a9bf0 100644
--- a/src/server/api/routers/networkRouter.ts
+++ b/src/server/api/routers/networkRouter.ts
@@ -1,12 +1,7 @@
import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "~/server/api/trpc";
import { IPv4gen } from "~/utils/IPv4gen";
-import {
- type Config,
- adjectives,
- animals,
- uniqueNamesGenerator,
-} from "unique-names-generator";
+import { type Config, adjectives, animals } from "unique-names-generator";
import * as ztController from "~/utils/ztApi";
import {
enrichMembers,
@@ -17,18 +12,15 @@ import {
import { Address4, Address6 } from "ip-address";
import RuleCompiler from "~/utils/rule-compiler";
-import {
- throwError,
- type APIError,
- CustomLimitError,
-} from "~/server/helpers/errorHandler";
+import { throwError, type APIError } from "~/server/helpers/errorHandler";
import { createTransporter, inviteUserTemplate, sendEmail } from "~/utils/mail";
import ejs from "ejs";
import { type TagsByName, type NetworkEntity } from "~/types/local/network";
import { type CapabilitiesByName } from "~/types/local/member";
import { type CentralNetwork } from "~/types/central/network";
+import { createNetworkService } from "../services/networkService";
-const customConfig: Config = {
+export const customConfig: Config = {
dictionaries: [adjectives, animals],
separator: "-",
length: 2,
@@ -587,75 +579,9 @@ export const networkRouter = createTRPCRouter({
central: z.boolean().optional().default(false),
}),
)
- .mutation(async ({ ctx, input }) => {
- try {
- // 1. Fetch the user with its related UserGroup
- const userWithGroup = await ctx.prisma.user.findUnique({
- where: { id: ctx.session.user.id },
- select: {
- userGroup: true,
- },
- });
-
- if (userWithGroup?.userGroup) {
- // 2. Fetch the current number of networks linked to the user
- const currentNetworksCount = await ctx.prisma.network.count({
- where: { authorId: ctx.session.user.id },
- });
-
- // Check against the defined limit
- const networkLimit = userWithGroup.userGroup.maxNetworks;
- if (currentNetworksCount >= networkLimit) {
- throw new CustomLimitError(
- "You have reached the maximum number of networks allowed for your user group.",
- );
- }
- }
-
- // Generate ipv4 address, cidr, start & end
- const ipAssignmentPools = IPv4gen(null);
-
- // Generate adjective and noun word
- const networkName: string = uniqueNamesGenerator(customConfig);
-
- // Create ZT network
- const newNw = await ztController.network_create(
- ctx,
- networkName,
- ipAssignmentPools,
- input.central,
- );
-
- if (input.central) return newNw;
-
- // Store the created network in the database
- const updatedUser = await ctx.prisma.user.update({
- where: {
- id: ctx.session.user.id,
- },
- data: {
- network: {
- create: {
- name: newNw.name,
- nwid: newNw.nwid,
- },
- },
- },
- select: {
- network: true,
- },
- });
- return updatedUser;
- } catch (err: unknown) {
- if (err instanceof CustomLimitError) {
- throwError(err.message);
- } else if (err instanceof Error) {
- console.error(err);
- throwError("Could not create network! Please try again");
- } else {
- throwError("An unknown error occurred");
- }
- }
+ .mutation(async (props) => {
+ // abstracted due to pages/api/v1/network/index.ts
+ await createNetworkService(props);
}),
setFlowRule: protectedProcedure
.input(
diff --git a/src/server/api/services/authService.ts b/src/server/api/services/authService.ts
index 300e0f22..8d82b170 100644
--- a/src/server/api/services/authService.ts
+++ b/src/server/api/services/authService.ts
@@ -32,7 +32,7 @@ interface Ivalidate {
token: string;
}
interface IJwt {
- id: number;
+ id: string;
token: string;
}
/**
diff --git a/src/server/api/services/networkService.ts b/src/server/api/services/networkService.ts
new file mode 100644
index 00000000..14bd0480
--- /dev/null
+++ b/src/server/api/services/networkService.ts
@@ -0,0 +1,78 @@
+import { uniqueNamesGenerator } from "unique-names-generator";
+import { CustomLimitError, throwError } from "~/server/helpers/errorHandler";
+import { IPv4gen } from "~/utils/IPv4gen";
+import { customConfig } from "../routers/networkRouter";
+import * as ztController from "~/utils/ztApi";
+
+export const createNetworkService = async ({ ctx, input }) => {
+ try {
+ // 1. Fetch the user with its related UserGroup
+ const userWithGroup = await ctx.prisma.user.findUnique({
+ where: { id: ctx.session.user.id },
+ select: {
+ userGroup: true,
+ },
+ });
+
+ if (userWithGroup?.userGroup) {
+ // 2. Fetch the current number of networks linked to the user
+ const currentNetworksCount = await ctx.prisma.network.count({
+ where: { authorId: ctx.session.user.id },
+ });
+
+ // Check against the defined limit
+ const networkLimit = userWithGroup.userGroup.maxNetworks;
+ if (currentNetworksCount >= networkLimit) {
+ throw new CustomLimitError(
+ "You have reached the maximum number of networks allowed for your user group.",
+ );
+ }
+ }
+
+ // Generate ipv4 address, cidr, start & end
+ const ipAssignmentPools = IPv4gen(null);
+
+ if (!input?.name) {
+ // Generate adjective and noun word
+ input.name = uniqueNamesGenerator(customConfig);
+ }
+
+ // Create ZT network
+ const newNw = await ztController.network_create(
+ ctx,
+ input.name,
+ ipAssignmentPools,
+ input.central,
+ );
+
+ if (input.central) return newNw;
+
+ // Store the created network in the database
+ await ctx.prisma.user.update({
+ where: {
+ id: ctx.session.user.id,
+ },
+ data: {
+ network: {
+ create: {
+ name: newNw.name,
+ nwid: newNw.nwid,
+ },
+ },
+ },
+ select: {
+ network: true,
+ },
+ });
+ return newNw;
+ } catch (err: unknown) {
+ if (err instanceof CustomLimitError) {
+ throwError(err.message);
+ } else if (err instanceof Error) {
+ console.error(err);
+ throwError("Could not create network! Please try again");
+ } else {
+ throwError("An unknown error occurred");
+ }
+ }
+};
diff --git a/src/server/auth.ts b/src/server/auth.ts
index a1f5fba5..ccd5eca3 100644
--- a/src/server/auth.ts
+++ b/src/server/auth.ts
@@ -26,7 +26,7 @@ declare module "next-auth" {
}
interface User {
- id?: number;
+ id?: string;
name: string;
role: string;
// ...other properties
@@ -124,6 +124,12 @@ export const authOptions: NextAuthOptions = {
lastseen: true,
},
});
+
+ // Number(user.id.trim()) checks if the user session has the old int as the User id
+ if (Number.isInteger(Number(token.id))) {
+ return undefined;
+ }
+
// session update => https://github.com/nextauthjs/next-auth/discussions/3941
// verify that name has at least one character
if (typeof session.update.name === "string") {
@@ -137,16 +143,14 @@ export const authOptions: NextAuthOptions = {
// verify that email is valid
if (typeof session.update.email === "string") {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
- // if (!session.update.email.includes("@")) {
- // throw new Error("Email must be a valid email address.");
- // }
+
token.email = session.update.email;
}
// update user with new values
await prisma.user.update({
where: {
- id: token.id as number,
+ id: token.id as string,
},
data: {
email: session.update.email || user.email,
@@ -177,7 +181,8 @@ export const authOptions: NextAuthOptions = {
where: { id: token.id },
});
- if (!user || !user.isActive) {
+ // Number(user.id.trim()) checks if the user session has the old int as the User id
+ if (!user || !user.isActive || Number.isInteger(Number(token.id))) {
// If the user does not exist, set user to null
return { ...session, user: null };
}
diff --git a/src/utils/encryption.ts b/src/utils/encryption.ts
index db82f495..adbb8d34 100644
--- a/src/utils/encryption.ts
+++ b/src/utils/encryption.ts
@@ -56,11 +56,19 @@ export const decrypt = (text: string, secret: Buffer) => {
};
type DecryptedTokenData = {
- userId: number;
+ userId: string;
name: string;
};
-export async function decryptAndVerifyToken(apiKey: string): Promise {
+type VerifyToken = {
+ apiKey: string;
+ requireAdmin?: boolean;
+};
+
+export async function decryptAndVerifyToken({
+ apiKey,
+ requireAdmin = false,
+}: VerifyToken): Promise {
// Check if API key is provided
if (!apiKey) {
throw new Error("API key missing");
@@ -73,11 +81,11 @@ export async function decryptAndVerifyToken(apiKey: string): Promise
{t("account.networkSetting.showMarkerInTable")}
+{t("network.annotations.showMarkerInTable")}
- {t.rich("account.networkSetting.showMarkerInTableDescription", {
+ {t.rich("network.annotations.showMarkerInTableDescription", {
br: () =>
,
})}
- {t("account.networkSetting.addBackgroundColorInTable")} + {t("network.annotations.addBackgroundColorInTable")}
- {t.rich("account.networkSetting.addBackgroundColorInTableDescription", {
+ {t.rich("network.annotations.addBackgroundColorInTableDescription", {
br: () =>
,
})}
- {t("account.networkSetting.memberTableTitle")} + {t("network.annotations.memberTableTitle")}
- {t("account.networkSetting.deAuthorizationWarningTitle")} + {t("network.annotations.deAuthorizationWarningTitle")}
- {t("account.networkSetting.deAuthorizationWarningLabel")} + {t("network.annotations.deAuthorizationWarningLabel")}