Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

implement launchUri function (#177)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-09-23 11:49:16 -04:00 committed by GitHub
parent 2ea1f8484f
commit 5cb3e9c965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cli/commands/login.command.ts
View File

@ -13,6 +13,7 @@ import { CryptoFunctionService } from '../../abstractions/cryptoFunction.service
import { EnvironmentService } from '../../abstractions/environment.service';
import { I18nService } from '../../abstractions/i18n.service';
import { PasswordGenerationService } from '../../abstractions/passwordGeneration.service';
import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
import { Response } from '../models/response';
@ -35,7 +36,8 @@ export class LoginCommand {
constructor(protected authService: AuthService, protected apiService: ApiService,
protected i18nService: I18nService, protected environmentService: EnvironmentService,
protected passwordGenerationService: PasswordGenerationService,
protected cryptoFunctionService: CryptoFunctionService, clientId: string) {
protected cryptoFunctionService: CryptoFunctionService, protected platformUtilsService: PlatformUtilsService,
clientId: string) {
this.clientId = clientId;
}
@ -249,8 +251,8 @@ export class LoginCommand {
for (let port = 8065; port <= 8070; port++) {
try {
this.ssoRedirectUri = 'http://localhost:' + port;
callbackServer.listen(port, async () => {
await open(webUrl + '/#/sso?clientId=' + this.clientId +
callbackServer.listen(port, () => {
this.platformUtilsService.launchUri(webUrl + '/#/sso?clientId=' + this.clientId +
'&redirectUri=' + encodeURIComponent(this.ssoRedirectUri) +
'&state=' + state + '&codeChallenge=' + codeChallenge);
});

10
src/cli/services/cliPlatformUtils.service.ts
View File

@ -1,8 +1,12 @@
import * as child_process from 'child_process';
import { DeviceType } from '../../enums/deviceType';
import { PlatformUtilsService } from '../../abstractions/platformUtils.service';
// tslint:disable-next-line
const open = require('open');
export class CliPlatformUtilsService implements PlatformUtilsService {
identityClientId: string;
@ -81,7 +85,11 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
}
launchUri(uri: string, options?: any): void {
throw new Error('Not implemented.');
if (process.platform === 'linux') {
child_process.spawnSync('xdg-open', [uri]);
} else {
open(uri);
}
}
saveFile(win: Window, blobData: any, blobOptions: any, fileName: string): void {