refactor: use standard format for domain
This commit is contained in:
27
src/user.ts
27
src/user.ts
@@ -40,25 +40,30 @@ export default class User {
|
||||
// 提取devstar domain的主域名,用于本地ssh key的命名
|
||||
if (devstarDomain != undefined && devstarDomain != "") {
|
||||
// open with vscode链接提供域名
|
||||
this.devstarDomain = devstarDomain
|
||||
this.devstarDomain = devstarDomain.endsWith('/') ? devstarDomain.slice(0, -1) : devstarDomain
|
||||
let parsedUrl = new URL(devstarDomain);
|
||||
this.devstarHostname = parsedUrl.hostname.replace(/\./g, '_'); //提取hostname,并用下划线替换.
|
||||
} else {
|
||||
// 用户配置项提供域名
|
||||
let devstarDomainFromConfig: string | undefined;
|
||||
let devstarDomainURL: string;
|
||||
devstarDomainFromConfig = vscode.workspace.getConfiguration('devstar').get('devstarDomain')
|
||||
// 如果没有配置devstar domain,则默认domain为https://devstar.cn
|
||||
devstarDomainURL = (devstarDomainFromConfig === undefined || devstarDomainFromConfig === "") ? 'https://devstar.cn' : devstarDomainFromConfig;
|
||||
this.devstarDomain = devstarDomainURL
|
||||
let parsedUrl = new URL(devstarDomainURL);
|
||||
this.devstarHostname = parsedUrl.hostname.replace(/\./g, '_'); //提取hostname,并用下划线替换.
|
||||
const devstarDomainFromConfig: string | undefined = utils.devstarDomain();
|
||||
if (devstarDomainFromConfig != undefined && devstarDomainFromConfig != "") {
|
||||
// 用户配置项提供域名
|
||||
this.devstarDomain = devstarDomainFromConfig.endsWith('/') ? devstarDomainFromConfig.slice(0, -1) : devstarDomainFromConfig
|
||||
let parsedUrl = new URL(this.devstarDomain);
|
||||
this.devstarHostname = parsedUrl.hostname.replace(/\./g, '_'); //提取hostname,并用下划线替换.
|
||||
} else {
|
||||
// 如果没有配置devstar domain,则默认domain为https://devstar.cn
|
||||
this.devstarDomain = "https://devstar.cn"
|
||||
this.devstarHostname = "devstar_cn"
|
||||
}
|
||||
}
|
||||
|
||||
this.usernameKey = "devstarUsername_" + this.devstarDomain
|
||||
this.userTokenKey = "devstarUserToken_" + this.devstarDomain
|
||||
}
|
||||
|
||||
setDevstarDomainAndHostname(devstarDomain: string) {
|
||||
if (devstarDomain != "") {
|
||||
this.devstarDomain = devstarDomain
|
||||
this.devstarDomain = devstarDomain.endsWith('/') ? devstarDomain.slice(0, -1) : devstarDomain
|
||||
const parsedUrl = new URL(devstarDomain)
|
||||
this.devstarHostname = parsedUrl.hostname.replace(/\./g, '_');
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user