Merge pull request #69 from sijinhui/dev

Dev

app/api/admin/users/[[...path]]/route.ts

@@ -64,6 +64,7 @@ async function handle(
             emailVerified: item.emailVerified,
             createdAt: item.createdAt,
             updatedAt: item.updatedAt,
+            allowToLogin: item.allowToLogin,
           };
         }),
       });

app/app/(admin)/components/users-table.tsx

@@ -10,6 +10,7 @@ import {
   Button,
   notification,
   Popconfirm,
+  Checkbox,
 } from "antd";
 import type { GetRef, TableColumnsType } from "antd";
 // import { headers } from 'next/headers'
@@ -187,6 +188,18 @@ function UsersTable({ users, setUsers, loading }: UserInterface) {
       dataIndex: "updatedAt",
       render: (value) => getCurrentTime(new Date(value)),
     },
+    {
+      title: "allowToLogin",
+      dataIndex: "allowToLogin",
+      width: 120,
+      render: (value) => {
+        return (
+          <div>
+            <Checkbox defaultChecked={value} disabled></Checkbox>
+          </div>
+        );
+      },
+    },
     {
       title: "Action",
       dataIndex: "",
@@ -195,7 +208,8 @@ function UsersTable({ users, setUsers, loading }: UserInterface) {
         <Space size="middle">
           {contextHolder}
           <Popconfirm
-            title="输入新密码"
+            id="user-admin-table-pop_confirm"
+            title="设置密码"
             description={
               <>
                 <Input.Password

app/app/login.scss

@@ -95,3 +95,7 @@ input {
 #login-form input:-webkit-autofill {
   transition: background-color 5000s ease-in-out 0s;
 }
+
+#user-admin-table-pop_confirm input:-webkit-autofill {
+  transition: background-color 5000s ease-in-out 0s;
+}

app/client/platforms/anthropic.ts

@@ -348,7 +348,11 @@ export class ClaudeApi implements LLMApi {
   path(path: string): string {
     const accessStore = useAccessStore.getState();
 
-    let baseUrl: string = accessStore.anthropicUrl;
+    let baseUrl: string = "";
+
+    if (accessStore.useCustomConfig) {
+      baseUrl = accessStore.anthropicUrl;
+    }
 
     // if endpoint is empty, use default endpoint
     if (baseUrl.trim().length === 0) {

app/client/platforms/google.ts

@@ -104,7 +104,13 @@ export class GeminiProApi implements LLMApi {
     };
 
     const accessStore = useAccessStore.getState();
-    let baseUrl = accessStore.googleUrl;
+
+    let baseUrl = "";
+
+    if (accessStore.useCustomConfig) {
+      baseUrl = accessStore.googleUrl;
+    }
+
     const isApp = !!getClientConfig()?.isApp;
 
     let shouldStream = !!options.config.stream;

app/client/platforms/openai.ts

@@ -61,16 +61,24 @@ export class ChatGPTApi implements LLMApi {
   path(path: string, isAzure?: boolean, azureModel?: string): string {
     const accessStore = useAccessStore.getState();
 
-    // const isAzure = accessStore.provider === ServiceProvider.Azure;
+    let baseUrl = "";
 
-    if (isAzure && !accessStore.isValidAzure()) {
+    if (accessStore.useCustomConfig) {
-      throw Error(
+      // const isAzure = accessStore.provider === ServiceProvider.Azure;
-        "incomplete azure config, please check it in your settings page",
+
-      );
+      if (isAzure && !accessStore.isValidAzure()) {
+        throw Error(
+          "incomplete azure config, please check it in your settings page",
+        );
+      }
+
+      if (isAzure) {
+        path = makeAzurePath(path, accessStore.azureApiVersion);
+      }
+
+      baseUrl = isAzure ? accessStore.azureUrl : accessStore.openaiUrl;
     }
 
-    let baseUrl = isAzure ? accessStore.azureUrl : accessStore.openaiUrl;
-
     if (baseUrl.length === 0) {
       const isApp = !!getClientConfig()?.isApp;
       baseUrl = isApp

app/utils/cloud/webdav.ts

@@ -63,26 +63,26 @@ export function createWebDavClient(store: SyncStore) {
       };
     },
     path(path: string, proxyUrl: string = "") {
-      // if (!path.endsWith("/")) {
-      //   path += "/";
-      // }
       if (path.startsWith("/")) {
         path = path.slice(1);
       }
 
-      if (proxyUrl.length > 0 && !proxyUrl.endsWith("/")) {
+      if (proxyUrl.endsWith("/")) {
-        proxyUrl += "/";
+        proxyUrl = proxyUrl.slice(0, -1);
       }
 
       let url;
-      if (proxyUrl.length > 0 || proxyUrl === "/") {
+      const pathPrefix = "/api/webdav/";
-        let u = new URL(proxyUrl + "api/webdav/" + path);
+
+      try {
+        let u = new URL(proxyUrl + pathPrefix + path);
         // add query params
         u.searchParams.append("endpoint", config.endpoint);
         url = u.toString();
-      } else {
+      } catch (e) {
-        url = "/api/upstash/" + path + "?endpoint=" + config.endpoint;
+        url = pathPrefix + path + "?endpoint=" + config.endpoint;
       }
+
       return url;
     },
   };

lib/auth.ts

@@ -29,6 +29,9 @@ export const authOptions: NextAuthOptions = {
                     image: profile.avatar_url,
                 };
             },
+            httpOptions: {
+                timeout: 50000,
+            }
         }),
         EmailProvider({
           server: {
@@ -152,11 +155,12 @@ export const authOptions: NextAuthOptions = {
             // console.log('555555555,', session, token)
             return session;
         },
-        // 过滤不存在的用户，目前没用
+        // 过滤不存在的用户
         async signIn({ user, account, profile, email, credentials }) {
             const existingUser = await existUser(user as User);
             console.log('---', user, 'account', account, 'email', email, 'exist', existingUser)
-            return !!existingUser;
+            // 顺便过滤掉不允许登录的用户
+            return !!existingUser && existingUser.allowToLogin;
         }
     },
 };

prisma/schema.prisma

@@ -24,6 +24,7 @@ model User {
   password      String?
   createdAt     DateTime   @default(now())
   updatedAt     DateTime   @updatedAt
+  allowToLogin  Boolean    @default(true)
   accounts      Account[]
   sessions      Session[]
   // sites         Site[]