From 5813fe2c20bbec36940c87b42c2db19e00ac4aa3 Mon Sep 17 00:00:00 2001
From: Levi Yan <leviyanx@gmail.com>
Date: Sun, 23 Mar 2025 16:34:03 +0800
Subject: [PATCH] refactor(devstar-api): not need user as member

---
 src/devstar-api.ts | 13 +++++--------
 src/main.ts        |  8 ++++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/devstar-api.ts b/src/devstar-api.ts
index 5923ce8..036552b 100644
--- a/src/devstar-api.ts
+++ b/src/devstar-api.ts
@@ -5,12 +5,9 @@ import * as utils from './utils';
 
 export default class DevstarAPIHandler {
 
-  private user: User;
   private devstarDomain: string;
 
-  constructor(user: User) {
-    this.user = user
-
+  constructor() {
     // 获取domain
     const devstarDomainFromUserConfig = utils.getDevstarDomain()
     if (undefined == devstarDomainFromUserConfig || "" == devstarDomainFromUserConfig) {
@@ -21,15 +18,15 @@ export default class DevstarAPIHandler {
   }
 
   // 上传公钥
-  public async uploadUserPublicKey(): Promise<string> {
+  public async uploadUserPublicKey(user: User): Promise<string> {
     return new Promise(async (resolve) => {
       // 获取机器名称
       const machineName = os.hostname();
       // 组成公钥名称
       const timestamp = Date.now();
-      const keyTitle = `${this.user.getUsernameFromLocal()}-${machineName}-${timestamp}`
+      const keyTitle = `${user.getUsernameFromLocal()}-${machineName}-${timestamp}`
       const postData = {
-        "key": this.user.getUserPublicKey(),
+        "key": user.getUserPublicKey(),
         "title": keyTitle
       }
 
@@ -40,7 +37,7 @@ export default class DevstarAPIHandler {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
-          'Authorization': 'token ' + this.user.getUserTokenFromLocal()
+          'Authorization': 'token ' + user.getUserTokenFromLocal()
         },
         body: JSON.stringify(postData)
       })
diff --git a/src/main.ts b/src/main.ts
index 8a23123..bbec9b1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -43,8 +43,8 @@ export class DevStarExtension {
                   await this.user.createUserSSHKey()
                     .then(async () => {
                       // 上传公钥
-                      const devstarAPIHandler = new DevstarAPIHandler(this.user)
-                      await devstarAPIHandler.uploadUserPublicKey()
+                      const devstarAPIHandler = new DevstarAPIHandler()
+                      await devstarAPIHandler.uploadUserPublicKey(this.user)
                       .then(async (res) => {
                         if (res === "ok") {
                           // 打开项目
@@ -73,8 +73,8 @@ export class DevStarExtension {
                     await this.user.createUserSSHKey()
                       .then(async () => {
                         // 上传公钥
-                        const devstarAPIHandler = new DevstarAPIHandler(this.user)
-                        await devstarAPIHandler.uploadUserPublicKey()
+                        const devstarAPIHandler = new DevstarAPIHandler()
+                        await devstarAPIHandler.uploadUserPublicKey(this.user)
                         .then(async (res) => {
                           if (res === "ok") {
                             // 打开项目