perf: auth token

ea100d84 · archer · 78762498 · ea100d84 · ea100d84 · ea100d84
Commit ea100d84 authored Apr 29, 2023 by archer
35 changed files
--- a/src/pages/api/chat/delChatRecordByIndex.ts
+++ b/src/pages/api/chat/delChatRecordByIndex.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, Chat } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  try {

--- a/src/pages/api/chat/getHistory.ts
+++ b/src/pages/api/chat/getHistory.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, Chat } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 /* 获取历史记录 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/chat/init.ts
+++ b/src/pages/api/chat/init.ts
@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, Chat } from '@/service/mongo';
 import type { InitChatResponse } from '@/api/response/chat';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { ChatItemType } from '@/types/chat';
 import { authModel } from '@/service/utils/auth';
 import mongoose from 'mongoose';

--- a/src/pages/api/chat/removeHistory.ts
+++ b/src/pages/api/chat/removeHistory.ts
@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { ChatItemType } from '@/types/chat';
 import { connectToDatabase, Chat } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 /* 获取历史记录 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/chat/saveChat.ts
+++ b/src/pages/api/chat/saveChat.ts
@@ -3,7 +3,7 @@ import { jsonRes } from '@/service/response';
 import { ChatItemType } from '@/types/chat';
 import { connectToDatabase, Chat } from '@/service/mongo';
 import { authModel } from '@/service/utils/auth';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 /* 聊天内容存存储 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/model/create.ts
+++ b/src/pages/api/model/create.ts
@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { ModelStatusEnum } from '@/constants/model';
 import { Model } from '@/service/models/model';

--- a/src/pages/api/model/data/delModelDataById.ts
+++ b/src/pages/api/model/data/delModelDataById.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {

--- a/src/pages/api/model/data/exportModelData.ts
+++ b/src/pages/api/model/data/exportModelData.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {

--- a/src/pages/api/model/data/fetchingUrlData.ts
+++ b/src/pages/api/model/data/fetchingUrlData.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import axios from 'axios';
 import { axiosConfig } from '@/service/utils/tools';

--- a/src/pages/api/model/data/getModelData.ts
+++ b/src/pages/api/model/data/getModelData.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import type { PgModelDataItemType } from '@/types/pg';
 import { authModel } from '@/service/utils/auth';

--- a/src/pages/api/model/data/getSplitData.ts
+++ b/src/pages/api/model/data/getSplitData.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, SplitData, Model } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 /* 拆分数据成QA */
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/model/data/pushModelDataCsv.ts
+++ b/src/pages/api/model/data/pushModelDataCsv.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { generateVector } from '@/service/events/generateVector';
 import { ModelDataStatusEnum } from '@/constants/model';
 import { PgClient } from '@/service/pg';

--- a/src/pages/api/model/data/pushModelDataInput.ts
+++ b/src/pages/api/model/data/pushModelDataInput.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { ModelDataSchema } from '@/types/mongoSchema';
 import { generateVector } from '@/service/events/generateVector';
 import { PgClient } from '@/service/pg';

--- a/src/pages/api/model/data/putModelData.ts
+++ b/src/pages/api/model/data/putModelData.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { ModelDataStatusEnum } from '@/constants/model';
 import { generateVector } from '@/service/events/generateVector';
 import { PgClient } from '@/service/pg';

--- a/src/pages/api/model/data/splitData.ts
+++ b/src/pages/api/model/data/splitData.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, SplitData, Model } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { generateVector } from '@/service/events/generateVector';
 import { generateQA } from '@/service/events/generateQA';
 import { PgClient } from '@/service/pg';

--- a/src/pages/api/model/del.ts
+++ b/src/pages/api/model/del.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { Chat, Model, connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { PgClient } from '@/service/pg';
 import { authModel } from '@/service/utils/auth';

--- a/src/pages/api/model/detail.tsx
+++ b/src/pages/api/model/detail.tsx
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { authModel } from '@/service/utils/auth';
 /* 获取我的模型 */

--- a/src/pages/api/model/list.ts
+++ b/src/pages/api/model/list.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { Model } from '@/service/models/model';
 /* 获取模型列表 */

--- a/src/pages/api/model/share/collection.ts
+++ b/src/pages/api/model/share/collection.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, Collection, Model } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 /* 模型收藏切换 */
 export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {

--- a/src/pages/api/model/share/getCollection.ts
+++ b/src/pages/api/model/share/getCollection.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, Collection } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import type { ShareModelItem } from '@/types/model';
 /* 获取模型列表 */

--- a/src/pages/api/model/share/getModels.ts
+++ b/src/pages/api/model/share/getModels.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, Collection, Model } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import type { PagingData } from '@/types';
 import type { ShareModelItem } from '@/types/model';

--- a/src/pages/api/model/update.ts
+++ b/src/pages/api/model/update.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { Model } from '@/service/models/model';
 import type { ModelUpdateParams } from '@/types/model';
 import { authModel } from '@/service/utils/auth';

--- a/src/pages/api/openapi/delKey.ts
+++ b/src/pages/api/openapi/delKey.ts
@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, OpenApi } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  try {

--- a/src/pages/api/openapi/getKeys.ts
+++ b/src/pages/api/openapi/getKeys.ts
@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, OpenApi } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { UserOpenApiKey } from '@/types/openapi';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/openapi/postKey.ts
+++ b/src/pages/api/openapi/postKey.ts
@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, OpenApi } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { customAlphabet } from 'nanoid';
 const nanoid = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890');

--- a/src/pages/api/user/checkPayResult.ts
+++ b/src/pages/api/user/checkPayResult.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, User, Pay } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { PaySchema, UserModelSchema } from '@/types/mongoSchema';
 import dayjs from 'dayjs';
 import { getPayResult } from '@/service/utils/wxpay';

--- a/src/pages/api/user/getBill.ts
+++ b/src/pages/api/user/getBill.ts
@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, Bill } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import type { BillSchema } from '@/types/mongoSchema';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/user/getPayCode.ts
+++ b/src/pages/api/user/getPayCode.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { customAlphabet } from 'nanoid';
 import { connectToDatabase, Pay } from '@/service/mongo';
 import { PRICE_SCALE } from '@/constants/common';

--- a/src/pages/api/user/getPayOrders.ts
+++ b/src/pages/api/user/getPayOrders.ts
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { connectToDatabase, Pay } from '@/service/mongo';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/user/promotion/getPromotionData.ts
+++ b/src/pages/api/user/promotion/getPromotionData.ts
@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, User, promotionRecord } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import mongoose from 'mongoose';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {

--- a/src/pages/api/user/promotion/getPromotions.ts
+++ b/src/pages/api/user/promotion/getPromotions.ts
@@ -2,7 +2,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase, promotionRecord } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  try {

--- a/src/pages/api/user/tokenLogin.ts
+++ b/src/pages/api/user/tokenLogin.ts
@@ -3,7 +3,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { connectToDatabase } from '@/service/mongo';
 import { User } from '@/service/models/user';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  try {

--- a/src/pages/api/user/update.ts
+++ b/src/pages/api/user/update.ts
@@ -3,7 +3,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { jsonRes } from '@/service/response';
 import { User } from '@/service/models/user';
 import { connectToDatabase } from '@/service/mongo';
-import { authToken } from '@/service/utils/tools';
+import { authToken } from '@/service/utils/auth';
 import { UserUpdateParams } from '@/types/user';
 /* 更新一些基本信息 */

--- a/src/pages/login/components/RegisterForm.tsx
+++ b/src/pages/login/components/RegisterForm.tsx
@@ -8,6 +8,7 @@ import type { ResLogin } from '@/api/response/user';
 import { useScreen } from '@/hooks/useScreen';
 import { useToast } from '@/hooks/useToast';
 import { useRouter } from 'next/router';
+import { postCreateModel } from '@/api/model';
 interface Props {
  loginSuccess: (e: ResLogin) => void;
@@ -64,6 +65,10 @@ const RegisterForm = ({ setPageType, loginSuccess }: Props) => {
          title: `注册成功`,
          status: 'success'
        });
+        // aut register a model
+        postCreateModel({
+          name: '模型1'
+        });
      } catch (error: any) {
        toast({
          title: error.message || '注册异常',

--- a/src/service/utils/tools.ts
+++ b/src/service/utils/tools.ts
@@ -23,25 +23,6 @@ export const generateToken = (userId: string) => {
  return token;
 };
-/* 校验 token */
-export const authToken = (token?: string): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    if (!token) {
-      reject('缺少登录凭证');
-      return;
-    }
-    const key = process.env.TOKEN_KEY as string;
-    jwt.verify(token, key, function (err, decoded: any) {
-      if (err || !decoded?.userId) {
-        reject('凭证无效');
-        return;
-      }
-      resolve(decoded.userId);
-    });
-  });
-};
 /* openai axios config */
 export const axiosConfig = () => ({
  httpsAgent: global.httpsAgent,