mit var.User.json in der gitignore kopiert git die auch nicht...
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
letsencrypt
|
letsencrypt
|
||||||
|
|
||||||
# User migration
|
|
||||||
var.User.json
|
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
node_modules
|
node_modules
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import { prisma } from "@repo/db";
|
import { prisma } from "@repo/db";
|
||||||
import { sendMailByTemplate } from "../../../helper/mail";
|
import { sendMailByTemplate } from "../../../helper/mail";
|
||||||
import OLD_USER from "../../api/auth/[...nextauth]/var.User.json";
|
import v1User from "../../api/auth/[...nextauth]/var.User.json";
|
||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import { createNewUserFromOld, OldUser } from "../../../types/oldUser";
|
import { createNewUserFromOld, OldUser } from "../../../types/oldUser";
|
||||||
|
|
||||||
@@ -13,7 +13,7 @@ export const resetPassword = async (email: string) => {
|
|||||||
email,
|
email,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
const oldUser = (OLD_USER as OldUser[]).find((u) => u.email.toLowerCase() === email);
|
const oldUser = (v1User as OldUser[]).find((u) => u.email.toLowerCase() === email);
|
||||||
if (!user) {
|
if (!user) {
|
||||||
if (oldUser) {
|
if (oldUser) {
|
||||||
user = await createNewUserFromOld(oldUser);
|
user = await createNewUserFromOld(oldUser);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"use server";
|
"use server";
|
||||||
import { prisma, Prisma } from "@repo/db";
|
import { prisma, Prisma } from "@repo/db";
|
||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import OLD_USER from "../../api/auth/[...nextauth]/var.User.json";
|
import v1User from "../../api/auth/[...nextauth]/var.User.json";
|
||||||
import { OldUser } from "../../../types/oldUser";
|
import { OldUser } from "../../../types/oldUser";
|
||||||
|
|
||||||
export const register = async ({ password, ...user }: Omit<Prisma.UserCreateInput, "publicId">) => {
|
export const register = async ({ password, ...user }: Omit<Prisma.UserCreateInput, "publicId">) => {
|
||||||
@@ -29,7 +29,7 @@ export const register = async ({ password, ...user }: Omit<Prisma.UserCreateInpu
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const existingOldUser = (OLD_USER as OldUser[]).find(
|
const existingOldUser = (v1User as OldUser[]).find(
|
||||||
(u) => u.email.toLocaleLowerCase() === user.email,
|
(u) => u.email.toLocaleLowerCase() === user.email,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
784083
apps/hub/app/api/auth/[...nextauth]/var.User.json
Normal file
784083
apps/hub/app/api/auth/[...nextauth]/var.User.json
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user