1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 01:33:33 +00:00

move shared CLI items to jslib

This commit is contained in:
Kyle Spearrin
2019-03-15 22:34:59 -04:00
parent b7a07bb483
commit a3ba833f0d
32 changed files with 58 additions and 352 deletions

View File

@@ -2,8 +2,8 @@ import * as program from 'commander';
import { EnvironmentService } from 'jslib/abstractions/environment.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
export class ConfigCommand {
constructor(private environmentService: EnvironmentService) { }

View File

@@ -10,7 +10,8 @@ import { UserService } from 'jslib/abstractions/user.service';
import { Cipher } from 'jslib/models/export/cipher';
import { Folder } from 'jslib/models/export/folder';
import { Response } from '../models/response';
import { Response } from 'jslib/cli/models/response';
import { CipherResponse } from '../models/response/cipherResponse';
import { FolderResponse } from '../models/response/folderResponse';

View File

@@ -4,7 +4,7 @@ import { CipherService } from 'jslib/abstractions/cipher.service';
import { FolderService } from 'jslib/abstractions/folder.service';
import { UserService } from 'jslib/abstractions/user.service';
import { Response } from '../models/response';
import { Response } from 'jslib/cli/models/response';
export class DeleteCommand {
constructor(private cipherService: CipherService, private folderService: FolderService,

View File

@@ -6,7 +6,8 @@ import { FolderService } from 'jslib/services/folder.service';
import { Cipher } from 'jslib/models/export/cipher';
import { Folder } from 'jslib/models/export/folder';
import { Response } from '../models/response';
import { Response } from 'jslib/cli/models/response';
import { CipherResponse } from '../models/response/cipherResponse';
import { FolderResponse } from '../models/response/folderResponse';

View File

@@ -1,7 +1,7 @@
import * as program from 'commander';
import { Response } from '../models/response';
import { StringResponse } from '../models/response/stringResponse';
import { Response } from 'jslib/cli/models/response';
import { StringResponse } from 'jslib/cli/models/response/stringResponse';
import { CliUtils } from '../utils';

View File

@@ -4,8 +4,8 @@ import * as inquirer from 'inquirer';
import { CryptoService } from 'jslib/abstractions/crypto.service';
import { ExportService } from 'jslib/abstractions/export.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { CliUtils } from '../utils';

View File

@@ -2,8 +2,8 @@ import * as program from 'commander';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service';
import { Response } from '../models/response';
import { StringResponse } from '../models/response/stringResponse';
import { Response } from 'jslib/cli/models/response';
import { StringResponse } from 'jslib/cli/models/response/stringResponse';
export class GenerateCommand {
constructor(private passwordGenerationService: PasswordGenerationService) { }

View File

@@ -29,13 +29,14 @@ import { CipherView } from 'jslib/models/view/cipherView';
import { CollectionView } from 'jslib/models/view/collectionView';
import { FolderView } from 'jslib/models/view/folderView';
import { Response } from '../models/response';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { StringResponse } from 'jslib/cli/models/response/stringResponse';
import { CipherResponse } from '../models/response/cipherResponse';
import { CollectionResponse } from '../models/response/collectionResponse';
import { FolderResponse } from '../models/response/folderResponse';
import { MessageResponse } from '../models/response/messageResponse';
import { OrganizationResponse } from '../models/response/organizationResponse';
import { StringResponse } from '../models/response/stringResponse';
import { TemplateResponse } from '../models/response/templateResponse';
import { CliUtils } from '../utils';

View File

@@ -1,8 +1,8 @@
import * as program from 'commander';
import { ImportService } from 'jslib/abstractions/import.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { CliUtils } from '../utils';

View File

@@ -8,11 +8,12 @@ import { FolderService } from 'jslib/abstractions/folder.service';
import { SearchService } from 'jslib/abstractions/search.service';
import { UserService } from 'jslib/abstractions/user.service';
import { Response } from '../models/response';
import { Response } from 'jslib/cli/models/response';
import { ListResponse } from 'jslib/cli/models/response/listResponse';
import { CipherResponse } from '../models/response/cipherResponse';
import { CollectionResponse } from '../models/response/collectionResponse';
import { FolderResponse } from '../models/response/folderResponse';
import { ListResponse } from '../models/response/listResponse';
import { OrganizationResponse } from '../models/response/organizationResponse';
import { CliUtils } from '../utils';

View File

@@ -2,8 +2,8 @@ import * as program from 'commander';
import { LockService } from 'jslib/abstractions/lock.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
export class LockCommand {
constructor(private lockService: LockService) { }

View File

@@ -11,8 +11,8 @@ import { AuthService } from 'jslib/abstractions/auth.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service';
import { SyncService } from 'jslib/abstractions/sync.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { Utils } from 'jslib/misc/utils';

View File

@@ -2,8 +2,8 @@ import * as program from 'commander';
import { AuthService } from 'jslib/abstractions/auth.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
export class LogoutCommand {
constructor(private authService: AuthService, private logoutCallback: () => Promise<void>) { }

View File

@@ -2,7 +2,8 @@ import * as program from 'commander';
import { CipherService } from 'jslib/abstractions/cipher.service';
import { Response } from '../models/response';
import { Response } from 'jslib/cli/models/response';
import { CipherResponse } from '../models/response/cipherResponse';
import { CliUtils } from '../utils';

View File

@@ -2,9 +2,9 @@ import * as program from 'commander';
import { SyncService } from 'jslib/abstractions/sync.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { StringResponse } from '../models/response/stringResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { StringResponse } from 'jslib/cli/models/response/stringResponse';
export class SyncCommand {
constructor(private syncService: SyncService) { }

View File

@@ -5,8 +5,8 @@ import { CryptoService } from 'jslib/abstractions/crypto.service';
import { CryptoFunctionService } from 'jslib/abstractions/cryptoFunction.service';
import { UserService } from 'jslib/abstractions/user.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { Utils } from 'jslib/misc/utils';

View File

@@ -1,81 +0,0 @@
import * as program from 'commander';
import * as fetch from 'node-fetch';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { Response } from '../models/response';
import { MessageResponse } from '../models/response/messageResponse';
export class UpdateCommand {
inPkg: boolean = false;
constructor(private platformUtilsService: PlatformUtilsService) {
this.inPkg = !!(process as any).pkg;
}
async run(cmd: program.Command): Promise<Response> {
const currentVersion = this.platformUtilsService.getApplicationVersion();
const response = await fetch.default('https://api.github.com/repos/bitwarden/cli/releases/latest');
if (response.status === 200) {
const responseJson = await response.json();
const res = new MessageResponse(null, null);
const tagName: string = responseJson.tag_name;
if (tagName === ('v' + currentVersion)) {
res.title = 'No update available.';
res.noColor = true;
return Response.success(res);
}
let downloadUrl: string = null;
if (responseJson.assets != null) {
for (const a of responseJson.assets) {
const download: string = a.browser_download_url;
if (download == null) {
continue;
}
if (download.indexOf('.zip') === -1) {
continue;
}
if (process.platform === 'win32' && download.indexOf('bw-windows') > -1) {
downloadUrl = download;
break;
} else if (process.platform === 'darwin' && download.indexOf('bw-macos') > -1) {
downloadUrl = download;
break;
} else if (process.platform === 'linux' && download.indexOf('bw-linux') > -1) {
downloadUrl = download;
break;
}
}
}
res.title = 'A new version is available: ' + tagName;
if (downloadUrl == null) {
downloadUrl = 'https://github.com/bitwarden/cli/releases';
} else {
res.raw = downloadUrl;
}
res.message = '';
if (responseJson.body != null && responseJson.body !== '') {
res.message = responseJson.body + '\n\n';
}
res.message += 'You can download this update at ' + downloadUrl;
if (this.inPkg) {
res.message += '\n\nIf you installed this CLI through a package manager ' +
'you should probably update using its update command instead.';
} else {
res.message += '\n\nIf you installed this CLI through NPM ' +
'you should update using `npm install -g @bitwarden/cli`';
}
return Response.success(res);
} else {
return Response.error('Error contacting update API: ' + response.status);
}
}
}