diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9f6b008..fbfd8b8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: required: true browser_extension_ref: description: 'Browser Extension ref (defaults to `master`):' - default: master + default: rc jobs: setup: @@ -420,6 +420,8 @@ jobs: env: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk/ + SDK_DIR: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk/ - name: Upload Apple Store release asset uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2 diff --git a/jslib b/jslib index 5ba14166..f568c872 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 5ba1416679f112e42e4b5dbd5c47949dcd8d0b56 +Subproject commit f568c872898c86b3cf8b5a99f8b5b377cb5b49e7 diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 922e522c..eee3ec67 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -209,22 +209,6 @@ registerLocaleData(localeZhTw, 'zh-TW'); VaultComponent, ViewComponent, ], - entryComponents: [ - AttachmentsComponent, - CollectionsComponent, - EnvironmentComponent, - ExportComponent, - FolderAddEditComponent, - ModalComponent, - PasswordGeneratorComponent, - PasswordGeneratorHistoryComponent, - PasswordHistoryComponent, - PremiumComponent, - SettingsComponent, - ShareComponent, - SendAddEditComponent, - TwoFactorOptionsComponent, - ], providers: [DatePipe], bootstrap: [AppComponent], }) diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html index 3eb7d781..8c14ea75 100644 --- a/src/app/send/send.component.html +++ b/src/app/send/send.component.html @@ -45,7 +45,7 @@ title="{{'viewItem' | i18n}}" (contextmenu)="viewSendMenu(s)" [ngClass]="{'active': s.id === sendId}" class="flex-list-item">
diff --git a/src/app/services.module.ts b/src/app/services.module.ts index 0aa8d0de..bda73795 100644 --- a/src/app/services.module.ts +++ b/src/app/services.module.ts @@ -29,7 +29,6 @@ import { CipherService } from 'jslib-common/services/cipher.service'; import { CollectionService } from 'jslib-common/services/collection.service'; import { ConstantsService } from 'jslib-common/services/constants.service'; import { ContainerService } from 'jslib-common/services/container.service'; -import { CryptoService } from 'jslib-common/services/crypto.service'; import { EnvironmentService } from 'jslib-common/services/environment.service'; import { EventService } from 'jslib-common/services/event.service'; import { ExportService } from 'jslib-common/services/export.service'; @@ -51,6 +50,8 @@ import { UserService } from 'jslib-common/services/user.service'; import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service'; import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service'; +import { ElectronCryptoService } from 'jslib-electron/services/electronCrypto.service'; + import { ApiService as ApiServiceAbstraction } from 'jslib-common/abstractions/api.service'; import { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.service'; import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service'; @@ -96,7 +97,7 @@ const platformUtilsService = new ElectronPlatformUtilsService(i18nService, messa const secureStorageService: StorageServiceAbstraction = new ElectronRendererSecureStorageService(); const cryptoFunctionService: CryptoFunctionServiceAbstraction = new WebCryptoFunctionService(window, platformUtilsService); -const cryptoService = new CryptoService(storageService, secureStorageService, cryptoFunctionService, +const cryptoService = new ElectronCryptoService(storageService, secureStorageService, cryptoFunctionService, platformUtilsService, logService); const tokenService = new TokenService(storageService); const appIdService = new AppIdService(storageService); diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html index 97fbee6e..cd026986 100644 --- a/src/app/vault/add-edit.component.html +++ b/src/app/vault/add-edit.component.html @@ -250,7 +250,11 @@
- +
@@ -370,9 +374,9 @@ {{'cancel' | i18n}}
-