Upstream
/
bitwarden-desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #815 from bitwarden/azure-upload-blobs 

Use file upload service for file uploads
This commit is contained in:
Matt Gibson 2021-03-29 09:47:29 -05:00 committed by GitHub
parent 0fabda65e7 5701275c22
commit 7e7f66416d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 07355694792999042e6373ebd1b3571329a969cc
Subproject commit 5c961ce847dd9ba13784ff9ba268753aae3a8c2e

5
src/app/services.module.ts
View File

@ -105,12 +105,12 @@ const tokenService = new TokenService(storageService);
const appIdService = new AppIdService(storageService);
const apiService = new ApiService(tokenService, platformUtilsService,
async (expired: boolean) => messagingService.send('logout', { expired: expired }));
const fileUploadService: FileUploadServiceAbstraction = new FileUploadService(logService, apiService);
const userService = new UserService(tokenService, storageService);
const settingsService = new SettingsService(userService, storageService);
export let searchService: SearchService = null;
const fileUploadService = new FileUploadService(logService, apiService);
const cipherService = new CipherService(cryptoService, userService, settingsService,
apiService, storageService, i18nService, () => searchService);
apiService, fileUploadService, storageService, i18nService, () => searchService);
const folderService = new FolderService(cryptoService, userService, apiService, storageService,
i18nService, cipherService);
const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
@ -224,6 +224,7 @@ export function initFactory(): Function {
{ provide: SendServiceAbstraction, useValue: sendService },
{ provide: CryptoFunctionServiceAbstraction, useValue: cryptoFunctionService },
{ provide: NativeMessagingService, useValue: nativeMessagingService },
{ provide: FileUploadServiceAbstraction, useValue: fileUploadService },
{
provide: APP_INITIALIZER,
useFactory: initFactory,

5
src/app/vault/attachments.component.ts
View File

@ -1,5 +1,6 @@
import { Component } from '@angular/core';
import { ApiService } from 'jslib/abstractions/api.service';
import { CipherService } from 'jslib/abstractions/cipher.service';
import { CryptoService } from 'jslib/abstractions/crypto.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
@ -15,7 +16,7 @@ import { AttachmentsComponent as BaseAttachmentsComponent } from 'jslib/angular/
export class AttachmentsComponent extends BaseAttachmentsComponent {
constructor(cipherService: CipherService, i18nService: I18nService,
cryptoService: CryptoService, userService: UserService,
platformUtilsService: PlatformUtilsService) {
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, window);
platformUtilsService: PlatformUtilsService, apiService: ApiService) {
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService, window);
}
}

2
src/locales/en/messages.json
View File

@ -431,7 +431,7 @@
"message": "Select a file."
},
"maxFileSize": {
"message": "Maximum file size is 100 MB."
"message": "Maximum file size is 500 MB."
},
"updateKey": {
"message": "You cannot use this feature until you update your encryption key."