Resolve review feedback

bitwarden · Dec 10, 2022 · 3eec7ba · 3eec7ba
1 parent bb46b75
commit 3eec7ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libs/common/src/interfaces/crypto.interface.ts b/libs/common/src/interfaces/crypto.interface.ts
@@ -1,15 +1,15 @@
 import { EncryptService } from "../abstractions/encrypt.service";
 import { SymmetricCryptoKey } from "../models/domain/symmetric-crypto-key";
 
-export function nullableFactory<T extends new (...args: any) => any>(
+export function nullableFactory<T extends new (...args: any[]) => any>(
   c: T,
   ...args: ConstructorParameters<T>
 ): InstanceType<T> | undefined {
   if (args[0] == null) {
     return null;
   }
 
-  return new c(...(args as any[]));
+  return new c(...args);
 }
 
 /**

diff --git a/libs/common/src/services/crypto.service.ts b/libs/common/src/services/crypto.service.ts
@@ -690,15 +690,15 @@ export class CryptoService implements CryptoServiceAbstraction {
   ): Promise<V> {
     const key = await this.getKeyFromIdentifier(domain.keyIdentifier());
 
-    return this.encryptService.decryptDomain(view, domain as DecryptableDomain, key);
+    return await this.encryptService.decryptDomain(view, domain, key);
   }
 
   async encryptView<V extends Encryptable<EncryptableDomain<V>>>(
     view: V
   ): Promise<EncryptableDomain<V>> {
     const key = await this.getKeyFromIdentifier(view.keyIdentifier());
 
-    return this.encryptService.encryptView(view as Encryptable<EncryptableDomain<V>>, key);
+    return this.encryptService.encryptView(view, key);
   }
 
   private async getKeyFromIdentifier(keyIdentifier: string | null): Promise<SymmetricCryptoKey> {