fix: kb delete and google auth

This commit is contained in:
archer
2023-05-26 23:37:21 +08:00
parent dc1c1d1355
commit 85e94966ac
3 changed files with 25 additions and 12 deletions

View File

@@ -54,7 +54,7 @@ export const useSendCode = () => {
} }
setCodeSending(false); setCodeSending(false);
}, },
[toast] [googleVerKey, toast]
); );
return { return {

View File

@@ -1,8 +1,9 @@
import type { NextApiRequest, NextApiResponse } from 'next'; import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@/service/response'; import { jsonRes } from '@/service/response';
import { connectToDatabase, KB } from '@/service/mongo'; import { connectToDatabase, KB, Model, TrainingData } from '@/service/mongo';
import { authUser } from '@/service/utils/auth'; import { authUser } from '@/service/utils/auth';
import { PgClient } from '@/service/pg'; import { PgClient } from '@/service/pg';
import { Types } from 'mongoose';
export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) { export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
try { try {
@@ -19,19 +20,30 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
await connectToDatabase(); await connectToDatabase();
// delete mongo data
await KB.findOneAndDelete({
_id: id,
userId
});
// delete all pg data // delete all pg data
// 删除 pg 中所有该模型的数据
await PgClient.delete('modelData', { await PgClient.delete('modelData', {
where: [['user_id', userId], 'AND', ['kb_id', id]] where: [['user_id', userId], 'AND', ['kb_id', id]]
}); });
// delete training data
await TrainingData.deleteMany({
userId,
kbId: id
});
// delete related model // delete related model
await Model.updateMany(
{
userId
},
{ $pull: { 'chat.relatedKbs': new Types.ObjectId(id) } }
);
// delete kb data
await KB.findOneAndDelete({
_id: id,
userId
});
jsonRes(res); jsonRes(res);
} catch (err) { } catch (err) {

View File

@@ -2,7 +2,7 @@ import axios from 'axios';
import { Obj2Query } from '../tools'; import { Obj2Query } from '../tools';
export const getClientToken = (googleVerKey: string) => { export const getClientToken = (googleVerKey: string) => {
if (!grecaptcha?.ready) return ''; if (typeof grecaptcha === 'undefined' || !grecaptcha?.ready) return '';
return new Promise<string>((resolve, reject) => { return new Promise<string>((resolve, reject) => {
grecaptcha.ready(async () => { grecaptcha.ready(async () => {
try { try {
@@ -23,10 +23,11 @@ export const authGoogleToken = async (data: {
response: string; response: string;
remoteip?: string; remoteip?: string;
}) => { }) => {
const res = await axios.post<{ score?: number }>( const res = await axios.post<{ score?: number; success: boolean }>(
`https://www.recaptcha.net/recaptcha/api/siteverify?${Obj2Query(data)}` `https://www.recaptcha.net/recaptcha/api/siteverify?${Obj2Query(data)}`
); );
if (res.data.score && res.data.score >= 0.5) {
if (res.data.success && res.data.score && res.data.score >= 0.7) {
return Promise.resolve(''); return Promise.resolve('');
} }
return Promise.reject('非法环境'); return Promise.reject('非法环境');