mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-27 12:36:14 +01:00
Attachment azure upload blobs (#898)
* Upload and download attachments using direct urls * Include FileUploadService dependency * Update max file size message to current max * Update jslib * Update jslib
This commit is contained in:
parent
6067c1610c
commit
29d7a5e37e
2
jslib
2
jslib
@ -1 +1 @@
|
|||||||
Subproject commit cfc76878154c5b292b729e2909bec1848f5cc23c
|
Subproject commit 5c961ce847dd9ba13784ff9ba268753aae3a8c2e
|
@ -25,8 +25,8 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
|
|||||||
|
|
||||||
constructor(cipherService: CipherService, i18nService: I18nService,
|
constructor(cipherService: CipherService, i18nService: I18nService,
|
||||||
cryptoService: CryptoService, userService: UserService,
|
cryptoService: CryptoService, userService: UserService,
|
||||||
platformUtilsService: PlatformUtilsService, private apiService: ApiService) {
|
platformUtilsService: PlatformUtilsService, apiService: ApiService) {
|
||||||
super(cipherService, i18nService, cryptoService, userService, platformUtilsService);
|
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async reupload(attachment: AttachmentView) {
|
protected async reupload(attachment: AttachmentView) {
|
||||||
|
@ -108,14 +108,14 @@ const apiService = new ApiService(tokenService, platformUtilsService,
|
|||||||
const userService = new UserService(tokenService, storageService);
|
const userService = new UserService(tokenService, storageService);
|
||||||
const settingsService = new SettingsService(userService, storageService);
|
const settingsService = new SettingsService(userService, storageService);
|
||||||
export let searchService: SearchService = null;
|
export let searchService: SearchService = null;
|
||||||
|
const fileUploadService = new FileUploadService(consoleLogService, apiService);
|
||||||
const cipherService = new CipherService(cryptoService, userService, settingsService,
|
const cipherService = new CipherService(cryptoService, userService, settingsService,
|
||||||
apiService, storageService, i18nService, () => searchService);
|
apiService, fileUploadService, storageService, i18nService, () => searchService);
|
||||||
const folderService = new FolderService(cryptoService, userService, apiService, storageService,
|
const folderService = new FolderService(cryptoService, userService, apiService, storageService,
|
||||||
i18nService, cipherService);
|
i18nService, cipherService);
|
||||||
const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
|
const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
|
||||||
searchService = new SearchService(cipherService, consoleLogService);
|
searchService = new SearchService(cipherService, consoleLogService);
|
||||||
const policyService = new PolicyService(userService, storageService);
|
const policyService = new PolicyService(userService, storageService);
|
||||||
const fileUploadService = new FileUploadService(consoleLogService, apiService);
|
|
||||||
const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService,
|
const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService,
|
||||||
i18nService, cryptoFunctionService);
|
i18nService, cryptoFunctionService);
|
||||||
const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
|
const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
import { ApiService } from 'jslib/abstractions/api.service';
|
||||||
import { CipherService } from 'jslib/abstractions/cipher.service';
|
import { CipherService } from 'jslib/abstractions/cipher.service';
|
||||||
import { CryptoService } from 'jslib/abstractions/crypto.service';
|
import { CryptoService } from 'jslib/abstractions/crypto.service';
|
||||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
import { I18nService } from 'jslib/abstractions/i18n.service';
|
||||||
@ -20,8 +21,8 @@ export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponen
|
|||||||
|
|
||||||
constructor(cipherService: CipherService, i18nService: I18nService,
|
constructor(cipherService: CipherService, i18nService: I18nService,
|
||||||
cryptoService: CryptoService, userService: UserService,
|
cryptoService: CryptoService, userService: UserService,
|
||||||
platformUtilsService: PlatformUtilsService) {
|
platformUtilsService: PlatformUtilsService, apiService: ApiService) {
|
||||||
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, window);
|
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService, window);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async init() {
|
protected async init() {
|
||||||
|
@ -84,6 +84,7 @@ export class EmergencyAccessViewComponent implements OnInit {
|
|||||||
const childComponent = this.modal.show<EmergencyAccessAttachmentsComponent>(EmergencyAccessAttachmentsComponent, this.attachmentsModalRef);
|
const childComponent = this.modal.show<EmergencyAccessAttachmentsComponent>(EmergencyAccessAttachmentsComponent, this.attachmentsModalRef);
|
||||||
|
|
||||||
childComponent.cipher = cipher;
|
childComponent.cipher = cipher;
|
||||||
|
childComponent.emergencyAccessId = this.id;
|
||||||
|
|
||||||
this.modal.onClosed.subscribe(async () => {
|
this.modal.onClosed.subscribe(async () => {
|
||||||
this.modal = null;
|
this.modal = null;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
|
import { ApiService } from 'jslib/abstractions/api.service';
|
||||||
import { CipherService } from 'jslib/abstractions/cipher.service';
|
import { CipherService } from 'jslib/abstractions/cipher.service';
|
||||||
import { CryptoService } from 'jslib/abstractions/crypto.service';
|
import { CryptoService } from 'jslib/abstractions/crypto.service';
|
||||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
import { I18nService } from 'jslib/abstractions/i18n.service';
|
||||||
@ -19,8 +20,8 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
|
|||||||
|
|
||||||
constructor(cipherService: CipherService, i18nService: I18nService,
|
constructor(cipherService: CipherService, i18nService: I18nService,
|
||||||
cryptoService: CryptoService, userService: UserService,
|
cryptoService: CryptoService, userService: UserService,
|
||||||
platformUtilsService: PlatformUtilsService) {
|
platformUtilsService: PlatformUtilsService, apiService: ApiService) {
|
||||||
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, window);
|
super(cipherService, i18nService, cryptoService, userService, platformUtilsService, apiService, window);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected async reupload(attachment: AttachmentView) {
|
protected async reupload(attachment: AttachmentView) {
|
||||||
|
@ -437,7 +437,7 @@
|
|||||||
"message": "Select a file."
|
"message": "Select a file."
|
||||||
},
|
},
|
||||||
"maxFileSize": {
|
"maxFileSize": {
|
||||||
"message": "Maximum file size is 100 MB."
|
"message": "Maximum file size is 500 MB."
|
||||||
},
|
},
|
||||||
"updateKey": {
|
"updateKey": {
|
||||||
"message": "You cannot use this feature until you update your encryption key."
|
"message": "You cannot use this feature until you update your encryption key."
|
||||||
|
Loading…
Reference in New Issue
Block a user