Merge branch 'master' of https://github.com/Paw-SQL/pawsql-vscode-plguin

Author: Tomas-PawSQL

src/PawSQLSidebarProvider.ts

@@ -835,17 +835,19 @@ export class PawSQLTreeProvider
     email: string;
     password: string;
     backendUrl: string;
-    frontendUrl: string;
   }) {
-    const apiKey = await ApiService.getUserKey(config.email, config.password);
-    console.log(apiKey);
-    if (!apiKey) {
+    const result = await ApiService.getUserKey(config.email, config.password);
+    if (!result) {
       throw Error("error.login.invalidCredentials");
     }
+    const { apikey, frontendUrl } = result;
+
     await vscode.workspace
       .getConfiguration("pawsql")
-      .update("apiKey", apiKey, true);
+      .update("frontendUrl", frontendUrl, true);
 
-    return apiKey;
+    await vscode.workspace
+      .getConfiguration("pawsql")
+      .update("apiKey", apikey, true);
   }
 }

src/apiService.ts

@@ -312,7 +312,7 @@ export const validateUserKey = async (userKey: string): Promise<boolean> => {
 export const getUserKey = async (
   email: string,
   password: string
-): Promise<string | null> => {
+): Promise<{ apikey: string; frontendUrl: string } | null> => {
   const { DOMAIN } = getUrls();
   const url = `${DOMAIN.Backend}/api/v1/getUserKey`;
 

src/webview/components/ConfigForm.tsx

@@ -19,7 +19,6 @@ interface Config {
   email: string;
   password: string;
   backendUrl: string;
-  frontendUrl: string;
 }
 
 interface ConfigFormProps {
@@ -59,24 +58,6 @@ const ConfigForm: React.FC<ConfigFormProps> = ({
   const handleSubmit = (event: React.FormEvent) => {
     event.preventDefault();
 
-    if (!formState.email || !formState.password) {
-      setSnackbarMessage(
-        formatMessage({ id: "form.config.validation.credentials.required" })
-      );
-      setSnackbarSeverity("error");
-      setSnackbarOpen(true);
-      return;
-    }
-
-    if (!formState.backendUrl || !formState.frontendUrl) {
-      setSnackbarMessage(
-        formatMessage({ id: "form.config.validation.urls.required" })
-      );
-      setSnackbarSeverity("error");
-      setSnackbarOpen(true);
-      return;
-    }
-
     onSubmit(formState);
     setSnackbarMessage(
       formatMessage({ id: "webview.settings.save.config.success" })
@@ -141,23 +122,6 @@ const ConfigForm: React.FC<ConfigFormProps> = ({
       </div>
 
       <form onSubmit={handleSubmit}>
-      <TextField
-          fullWidth
-          name="backendUrl"
-          label={formatMessage({ id: "form.config.backendUrl.label" })}
-          variant="outlined"
-          margin="normal"
-          value={formState.backendUrl}
-          onChange={handleInputChange}
-          InputProps={{
-            startAdornment: (
-              <InputAdornment position="start">
-                <PublicIcon sx={{ color: "#666" }} />
-              </InputAdornment>
-            ),
-          }}
-          sx={{ mb: 2 }}
-        />
         <TextField
           fullWidth
           name="email"
@@ -195,20 +159,20 @@ const ConfigForm: React.FC<ConfigFormProps> = ({
         />
         <TextField
           fullWidth
-          name="frontendUrl"
-          label={formatMessage({ id: "form.config.frontendUrl.label" })}
+          name="backendUrl"
+          label={formatMessage({ id: "form.config.backendUrl.label" })}
           variant="outlined"
           margin="normal"
-          value={formState.frontendUrl}
+          value={formState.backendUrl}
           onChange={handleInputChange}
           InputProps={{
             startAdornment: (
               <InputAdornment position="start">
-                <LinkIcon sx={{ color: "#666" }} />
+                <PublicIcon sx={{ color: "#666" }} />
               </InputAdornment>
             ),
           }}
-          sx={{ mb: 3 }}
+          sx={{ mb: 2 }}
         />
         <Button
           type="submit"

src/webview/index.tsx

@@ -19,15 +19,13 @@ interface Config {
   email: string;
   password: string;
   backendUrl: string;
-  frontendUrl: string;
 }
 
 const App: React.FC = () => {
   const [config, setConfig] = React.useState<Config>({
     email: "",
     password: "",
     backendUrl: "",
-    frontendUrl: "",
   });
 
   const [locale, setLocale] = React.useState<"en" | "zh-cn">("en"); // 使用字面量类型
@@ -56,7 +54,6 @@ const App: React.FC = () => {
           email: message.email || "",
           password: message.password || "",
           backendUrl: message.backendUrl || "",
-          frontendUrl: message.frontendUrl || "",
         };
         console.log("Updating config:", newConfig);
         setConfig(newConfig);

src/webviewProvider.ts

@@ -114,8 +114,6 @@ export class WebviewProvider {
       password: await this.passwordManager.getPassword(),
       backendUrl:
         vscode.workspace.getConfiguration("pawsql").get("backendUrl") || "",
-      frontendUrl:
-        vscode.workspace.getConfiguration("pawsql").get("frontendUrl") || "",
     };
 
     panel.webview.postMessage({ command: "configResponse", ...config });
@@ -126,7 +124,6 @@ export class WebviewProvider {
     email: string;
     password: string;
     backendUrl: string;
-    frontendUrl: string;
   }) {
     try {
       // 分别更新每个配置项
@@ -143,9 +140,7 @@ export class WebviewProvider {
       await vscode.workspace
         .getConfiguration("pawsql")
         .update("backendUrl", config.backendUrl, true);
-      await vscode.workspace
-        .getConfiguration("pawsql")
-        .update("frontendUrl", config.frontendUrl, true);
+
       await this.treeProvider.updateApikey(config);
       await this.treeProvider.refresh();
       // 配置保存成功反馈