diff --git a/src/devstar-api.ts b/src/devstar-api.ts index 76053f2..0848127 100644 --- a/src/devstar-api.ts +++ b/src/devstar-api.ts @@ -19,40 +19,40 @@ export default class DevstarAPIHandler { public async verifyToken(token: string, username: string): Promise { try { - const response = await fetch(this.devstarDomain + `/api/devcontainer/user`, { - method: 'GET', - headers: { - 'Content-Type': 'application/json', - 'Authorization': 'token ' + token - } - }); - - // 处理非200响应状态码 - if (!response.ok) { - const text = await response.text(); // 先读取文本防止json解析失败 - if (response.status == 401) { - throw new Error('Token错误') - } else { - throw new Error(`HTTP Error: ${response.status} - ${text}`); - } + const response = await fetch(this.devstarDomain + `/api/devcontainer/user`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + 'Authorization': 'token ' + token } + }); - const responseData = await response.json(); - const data = responseData.data - if (data.username == undefined || data.username == "") { - throw new Error('Token对应用户不存在') + // 处理非200响应状态码 + if (!response.ok) { + const text = await response.text(); // 先读取文本防止json解析失败 + if (response.status == 401) { + throw new Error('Token错误') } else { - // 验证用户名匹配 - if (data.username !== username) { - throw new Error('Token与用户名不符'); - } + throw new Error(`HTTP Error: ${response.status} - ${text}`); } - - return true; - } catch (error) { - console.error(error) - return false } + + const responseData = await response.json(); + const data = responseData.data + if (data.username == undefined || data.username == "") { + throw new Error('Token对应用户不存在') + } else { + // 验证用户名匹配 + if (data.username !== username) { + throw new Error('Token与用户名不符'); + } + } + + return true; + } catch (error) { + console.error(error) + return false + } } // 上传公钥 diff --git a/src/home.ts b/src/home.ts index 38cc942..e3c84c5 100644 --- a/src/home.ts +++ b/src/home.ts @@ -49,7 +49,7 @@ export default class DSHome { const config = { language: vscode.env.language } - panel.webview.postMessage({command: 'getHomeConfig', data: {homeConfig: config}}) + panel.webview.postMessage({ command: 'getHomeConfig', data: { homeConfig: config } }) break; case 'getUserToken': const userToken = this.user.getUserTokenFromLocal() diff --git a/src/user.ts b/src/user.ts index 530fbca..715c549 100644 --- a/src/user.ts +++ b/src/user.ts @@ -58,7 +58,7 @@ export default class User { throw new Error('Upload user public key failed') } } - + vscode.window.showInformationMessage(vscode.l10n.t('User login successfully!')) return 'ok' } catch (error) { @@ -196,7 +196,7 @@ export default class User { if (!fs.existsSync(publicKeyDir)) { console.log(`Directory ${publicKeyDir} does not exist, creating it...`); // 公钥与私钥的目录一样,所以只用创建一次 - fs.mkdirSync(publicKeyDir, {recursive: true}) + fs.mkdirSync(publicKeyDir, { recursive: true }) } fs.writeFileSync(this.getUserPublicKeyPath(), publicKeyStr);