@lifeready/core 1.0.21 → 1.0.22

package/lib/_common/types.d.ts

@@ -1,4 +1,6 @@
-import { HasKeyGraph } from '../cryptography/cryptography.types';
+import { HasKeyGraph } from '../key/key.types';
+export declare type SomePartial<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
+export declare type SomeRequired<T, K extends keyof T> = Pick<Required<T>, K> & Omit<T, K>;
 export interface Edge<T> {
     node: T;
 }

package/lib/api/lr-apollo.service.d.ts

@@ -1,6 +1,6 @@
 import { Apollo } from 'apollo-angular';
 import { QueryOptions, MutationOptions } from '@apollo/client/core';
-import { KeyGraphService } from '../cryptography/key-graph.service';
+import { KeyGraphService } from '../key/key-graph.service';
 export declare class LrApolloService {
     private apollo;
     private keyGraph;

package/lib/api/lr-graphql/lr-graphql.service.d.ts

@@ -2,7 +2,7 @@ import { NgZone } from '@angular/core';
 import { Apollo } from 'apollo-angular';
 import { QueryOptions, MutationOptions, OperationVariables, FetchPolicy } from '@apollo/client/core';
 import { MutationBaseOptions } from '@apollo/client/core/watchQueryOptions';
-import { KeyGraphService } from '../../cryptography/key-graph.service';
+import { KeyGraphService } from '../../key/key-graph.service';
 import { TypedDocumentNode } from '../../_common/ast';
 import { ProcessorOptions, QueryProcessorService } from '../query-processor';
 import { LrMutationBase } from './lr-mutation-base';

package/lib/api/query-processor/common-processors.service.d.ts

@@ -1,5 +1,5 @@
 import { NgZone } from '@angular/core';
-import { KeyGraphService } from '../../cryptography/key-graph.service';
+import { KeyGraphService } from '../../key/key-graph.service';
 import { Connection } from '../types';
 export interface ProcessorOptions {
     hasKeys: boolean;

package/lib/api/query-processor/query-processor.service.d.ts

@@ -1,5 +1,5 @@
 import { NgZone } from '@angular/core';
-import { KeyService } from '../../cryptography/key.service';
+import { KeyService } from '../../key/key.service';
 import { CommonProcessorsService, ProcessorOptions } from './common-processors.service';
 import { TpPasswordResetProcessorService } from './tp-password-reset-processor.service';
 export declare class QueryProcessorService {

package/lib/api/query-processor/tp-password-reset-processor.service.d.ts

@@ -1,5 +1,5 @@
 import { NgZone } from '@angular/core';
-import { KeyGraphService } from '../../cryptography/key-graph.service';
+import { KeyGraphService } from '../../key/key-graph.service';
 import { ProcessorCallbackParams } from './common-processors.service';
 import { TpPasswordResetUserNode, TpPasswordResetNode } from '../types';
 export declare class TpPasswordResetProcessorService {

package/lib/api/types/lr-graphql.types.d.ts

@@ -458,6 +458,7 @@ export declare enum ScenarioLastClaimState {
 export interface ScenarioLatestClaim {
     state?: ScenarioLastClaimState;
     created?: DateTime;
+    claimAgainAfter?: DateTime;
 }
 export interface ScenarioNode extends Node, TimeStamped {
     subject?: UserNode;
@@ -569,3 +570,13 @@ export declare enum LinkTypeField {
     HARD = "HARD",
     SOFT = "SOFT"
 }
+export interface MessageNode extends Node, TimeStamped {
+    sender?: UserNode;
+    receiver?: UserNode;
+    sharedKey?: KeyNode;
+    senderSigPbk?: KeyNode;
+    plainMessage?: string;
+    plainMessageJson?: string;
+    signedCipherMessage?: string;
+    signedCipherMessageClearJson?: string;
+}

package/lib/auth/auth.gql.d.ts

@@ -1,6 +1,3 @@
-export declare const PasswordChangeRequestMutation: import("graphql").DocumentNode;
-export declare const PasswordChangeMutation: import("graphql").DocumentNode;
-export declare const PasswordChangeConfigQuery: import("graphql").DocumentNode;
 export interface SetSessionEncryptionKeyMutation {
     setSessionEncryptionKey: {
         sessionEncryptionKey: string;

package/lib/auth/auth.types.d.ts

@@ -1,9 +1,9 @@
 import { CognitoUser } from '@aws-amplify/auth';
 import { JWK } from 'node-jose';
 import { TpPasswordResetUserNode, UserDeleteNode } from '../api/types';
-import { PassIdpParams, PassKeyParams } from '../cryptography/cryptography.types';
+import { PassIdpParams, PassKeyParams } from '../key/key.types';
 import { UserPlan } from '../plan/plan.types';
-import { CurrentUserKey, MainContactCard } from '../users/profile.types';
+import { CurrentUserKey, MainContactCard } from '../profile/profile.types';
 export interface PassKeyBundle {
     passKeyParams: PassKeyParams;
     passKey: JWK.Key;

package/lib/auth/life-ready-auth.service.d.ts

@@ -1,19 +1,19 @@
-import { Observable } from 'rxjs';
-import { KeyGraphService } from '../cryptography/key-graph.service';
-import { KeyService } from '../cryptography/key.service';
-import { ProfileService } from '../users/profile.service';
-import { CognitoChallengeUser, CurrentUser, TpPasswordResetUser, LoginResult } from './auth.types';
-import { PasswordService } from './password.service';
 import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
-import { IdleService } from './idle.service';
-import { KeyFactoryService } from '../cryptography/key-factory.service';
+import { Observable } from 'rxjs';
 import { LrGraphQLService } from '../api/lr-graphql';
 import { TpPasswordResetProcessorService } from '../api/query-processor/tp-password-reset-processor.service';
-import { PersistService } from '../api/persist.service';
+import { EncryptionService } from '../encryption/encryption.service';
+import { IdleService } from '../idle/idle.service';
+import { KeyFactoryService } from '../key/key-factory.service';
+import { KeyGraphService } from '../key/key-graph.service';
+import { KeyService } from '../key/key.service';
 import { LifeReadyConfig } from '../life-ready.config';
-import { EncryptionService } from '../cryptography/encryption.service';
-import { Slip39Service } from '../cryptography/slip39.service';
-import { TpPasswordResetAssemblyController } from '../trusted-parties/tp-password-reset.controller';
+import { PasswordService } from '../password/password.service';
+import { PersistService } from '../persist/persist.service';
+import { ProfileService } from '../profile/profile.service';
+import { Slip39Service } from '../slip39/slip39.service';
+import { TpPasswordResetAssemblyController } from '../tp-password-reset/tp-password-reset.controller';
+import { CognitoChallengeUser, CurrentUser, LoginResult, TpPasswordResetUser } from './auth.types';
 export declare const initialiseAuth: (authService: LifeReadyAuthService) => () => Promise<void>;
 export interface LoginOptions {
     tpPasswordResetAutoComplete?: boolean;

package/lib/category/category.gql.d.ts

@@ -1,4 +1,4 @@
-import { HasKeyGraph } from './../cryptography/cryptography.types';
+import { HasKeyGraph } from '../key/key.types';
 import { HasEdges } from '../_common/types';
 export declare const DEFAULT_BREADCRUMB_DEPTH = 5;
 export declare const DEFAULT_DESCENDANTS_DEPTH = 5;

package/lib/category/category.service.d.ts

@@ -1,7 +1,7 @@
 import { LrApolloService } from '../api/lr-apollo.service';
-import { KeyMetaService } from '../cryptography/key-meta.service';
+import { KeyMetaService } from '../key/key-meta.service';
 import { Category, NewCategory, UpdatedCategory, VaultCategory, VaultRecord, Vault } from './category.types';
-import { KeyGraphService } from '../cryptography/key-graph.service';
+import { KeyGraphService } from '../key/key-graph.service';
 export declare class CategoryService {
     private lrApollo;
     private keyMetaService;

package/lib/{api → contact-card}/contact-card.service.d.ts

@@ -1,13 +1,13 @@
-import { Key } from '../cryptography/cryptography.types';
-import { EncryptionService } from '../cryptography/encryption.service';
-import { KeyGraphService } from '../cryptography/key-graph.service';
-import { KeyService } from '../cryptography/key.service';
+import { LrApolloService } from '../api/lr-apollo.service';
+import { JSONObject } from '../api/types';
+import { EncryptionService } from '../encryption/encryption.service';
+import { KeyFactoryService } from '../key/key-factory.service';
+import { KeyGraphService } from '../key/key-graph.service';
+import { KeyMetaService } from '../key/key-meta.service';
+import { KeyService } from '../key/key.service';
+import { Key } from '../key/key.types';
+import { MainContactCardPlainFields } from '../profile/profile.types';
 import { HasEdges } from '../_common/types';
-import { LrApolloService } from './lr-apollo.service';
-import { KeyFactoryService } from '../cryptography/key-factory.service';
-import { MainContactCardPlainFields } from '../users/profile.types';
-import { KeyMetaService } from '../cryptography/key-meta.service';
-import { JSONObject } from './types';
 export declare class ContactCard {
     id: string;
     key: Key;

package/lib/contact-card/contact-card2.gql.d.ts

@@ -0,0 +1,25 @@
+import { ID } from '../api/types';
+export interface CreateContactCardMutationResult {
+    createContactCard: {
+        contactCard: {
+            id: ID;
+        };
+    };
+}
+export declare const CreateContactCardMutation: import("../_common/ast").TypedDocumentNode<CreateContactCardMutationResult>;
+export interface UpdateContactCardMutationResult {
+    updateContactCard: {
+        contactCard: {
+            id: ID;
+        };
+    };
+}
+export declare const UpdateContactCardMutation: import("../_common/ast").TypedDocumentNode<UpdateContactCardMutationResult>;
+export interface DeleteContactCardMutationResult {
+    deleteContactCard: {
+        deleteContactCard: {
+            id: ID;
+        };
+    };
+}
+export declare const DeleteContactCardMutation: import("../_common/ast").TypedDocumentNode<DeleteContactCardMutationResult>;

package/lib/{api → contact-card}/contact-card2.service.d.ts

@@ -1,13 +1,12 @@
 import { NgZone } from '@angular/core';
-import { EncryptionService } from '../cryptography/encryption.service';
-import { KeyFactoryService } from '../cryptography/key-factory.service';
-import { KeyGraphService } from '../cryptography/key-graph.service';
-import { KeyMetaService } from '../cryptography/key-meta.service';
-import { KeyService } from '../cryptography/key.service';
-import { MainContactCardPlainFields } from '../users/profile.types';
-import { CreateContactCardMutation, DeleteContactCardMutation, UpdateContactCardMutation } from './contact-card2.gql';
-import { LrMutation } from './lr-graphql';
-import { JSONObject } from './types';
+import { LrMutation } from '../api/lr-graphql';
+import { JSONObject } from '../api/types';
+import { EncryptionService } from '../encryption/encryption.service';
+import { KeyFactoryService } from '../key/key-factory.service';
+import { KeyGraphService } from '../key/key-graph.service';
+import { KeyMetaService } from '../key/key-meta.service';
+import { KeyService } from '../key/key.service';
+import { MainContactCardPlainFields } from '../profile/profile.types';
 export interface CreateContactCardInput2 {
     publicDataJson: JSONObject;
     publicSearchableJson: JSONObject;
@@ -35,13 +34,13 @@ export declare class ContactCard2Service {
     private keyMetaService;
     private ngZone;
     constructor(keyFactory: KeyFactoryService, keyService: KeyService, encryptionService: EncryptionService, keyGraph: KeyGraphService, keyMetaService: KeyMetaService, ngZone: NgZone);
-    createContactCard(input: CreateContactCardInput2): Promise<LrMutation<CreateContactCardMutation, {
+    createContactCard(input: CreateContactCardInput2): Promise<LrMutation<import("./contact-card2.gql").CreateContactCardMutationResult, {
         input: any;
     }>>;
-    updateContactCard(input: UpdateContactCardInput2): Promise<LrMutation<UpdateContactCardMutation, {
+    updateContactCard(input: UpdateContactCardInput2): Promise<LrMutation<import("./contact-card2.gql").UpdateContactCardMutationResult, {
         input: any;
     }>>;
-    deleteContactCard(id: string): LrMutation<DeleteContactCardMutation, {
+    deleteContactCard(id: string): LrMutation<import("./contact-card2.gql").DeleteContactCardMutationResult, {
         input: {
             id: string;
         };

package/lib/{cryptography → encryption}/encryption.service.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { JWE, JWK } from 'node-jose';
-import { Key, PayloadType } from './cryptography.types';
-import { TimeService } from '../api/time.service';
+import { Key, PayloadType } from '../key/key.types';
+import { TimeService } from '../time/time.service';
 export declare enum JoseSerialization {
     JSON = "JSON",
     COMPACT = "COMPACT"

package/lib/{api/file.service.d.ts → file-upload/file-upload.service.d.ts}

@@ -1,12 +1,8 @@
 import { HttpClient } from '@angular/common/http';
-import { LifeReadyConfig } from '../life-ready.config';
 import { LifeReadyAuthService } from '../auth/life-ready-auth.service';
-export declare type FileContentContext = 'FILE_STATE';
-export interface UploadEncryptedFileOptions {
-    encryptedContent: string;
-    fileName?: string;
-}
-export declare class FileService {
+import { LifeReadyConfig } from '../life-ready.config';
+import { UploadEncryptedFileOptions } from './file-upload.types';
+export declare class FileUploadService {
     private config;
     private http;
     private lrAuth;

package/lib/file-upload/file-upload.types.d.ts

@@ -0,0 +1,5 @@
+export declare type FileContentContext = 'FILE_STATE';
+export interface UploadEncryptedFileOptions {
+    encryptedContent: string;
+    fileName?: string;
+}

package/lib/{auth → idle}/idle.service.d.ts

@@ -1,11 +1,11 @@
+import { HttpClient } from '@angular/common/http';
+import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
 import { Idle } from '@ng-idle/core';
 import { Keepalive } from '@ng-idle/keepalive';
-import { KeyService } from '../cryptography/key.service';
+import { KeyService } from '../key/key.service';
+import { Key } from '../key/key.types';
 import { LifeReadyConfig } from '../life-ready.config';
-import { HttpClient } from '@angular/common/http';
 import { KeepaliveResult } from './idle.types';
-import { Key } from '../cryptography/cryptography.types';
-import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
 export interface IdleServiceInit {
     onTimeout?: (() => any) | (() => Promise<any>) | null;
     onKeepalive?: (() => any) | (() => Promise<any>) | null;

package/lib/items2/item2.service.d.ts

@@ -1,22 +1,22 @@
 import { Injector, NgZone } from '@angular/core';
-import { KeyFactoryService } from '../cryptography/key-factory.service';
-import { KeyGraphService } from '../cryptography/key-graph.service';
-import { KeyService } from '../cryptography/key.service';
-import { FileService } from '../api/file.service';
-import { CreateDirectoryMutation, DeleteDirectoryMutation, CreateFileMutation, DeleteFileMutation, UpdateFileMutation, UpdateDirectoryMutation, ArchiveDirectoryMutation, UnarchiveDirectoryMutation } from './item2.gql';
-import { ChangeFileParentsOptions, ChangeDirectoryParentsOptions, CreateDirectoryOptions, CreateFileOptions, DownloadFileContentOptions, FileParentDirectoryInput, ParentDirectoryInput, ParentRootDirectoryInput, UpdateDirectoryOptions, UpdateFileOptions, BeginDeleteChildItemLinksWindowOptions, CreateDirectoryTreeOptions, RevertFileOptions } from './item2.types';
 import { LrMutation, LrService } from '../api/lr-graphql';
 import { DirectoryNode, ID, LrRelayIdInput } from '../api/types';
-import { LockService } from '../api/lock.service';
+import { FileUploadService } from '../file-upload/file-upload.service';
+import { KeyFactoryService } from '../key/key-factory.service';
+import { KeyGraphService } from '../key/key-graph.service';
+import { KeyService } from '../key/key.service';
+import { LockService } from '../lock/lock.service';
+import { ArchiveDirectoryMutation, CreateDirectoryMutation, CreateFileMutation, DeleteDirectoryMutation, DeleteFileMutation, UnarchiveDirectoryMutation, UpdateDirectoryMutation, UpdateFileMutation } from './item2.gql';
+import { BeginDeleteChildItemLinksWindowOptions, ChangeDirectoryParentsOptions, ChangeFileParentsOptions, CreateDirectoryOptions, CreateDirectoryTreeOptions, CreateFileOptions, DownloadFileContentOptions, FileParentDirectoryInput, ParentDirectoryInput, ParentRootDirectoryInput, RevertFileOptions, UpdateDirectoryOptions, UpdateFileOptions } from './item2.types';
 export declare class Item2Service extends LrService {
     private ngZone;
     private injector;
-    private fileService;
+    private fileUploadService;
     private keyService;
     private keyFactory;
     private keyGraph;
     private lockService;
-    constructor(ngZone: NgZone, injector: Injector, fileService: FileService, keyService: KeyService, keyFactory: KeyFactoryService, keyGraph: KeyGraphService, lockService: LockService);
+    constructor(ngZone: NgZone, injector: Injector, fileUploadService: FileUploadService, keyService: KeyService, keyFactory: KeyFactoryService, keyGraph: KeyGraphService, lockService: LockService);
     static TEMP_DIRECTORY_PLAIN_META: {
         kcType: string;
     };
@@ -24,8 +24,8 @@ export declare class Item2Service extends LrService {
     downloadFileContent(options: DownloadFileContentOptions): Promise<ArrayBuffer>;
     getDirectoryKeyId(directoryId: LrRelayIdInput): Promise<string>;
     getFileKeyId(fileId: LrRelayIdInput): Promise<string>;
-    getDirectoryKey(directoryId: LrRelayIdInput, directoryKeyId?: LrRelayIdInput): Promise<import("../cryptography/cryptography.types").Key>;
-    getFileKey(fileId: LrRelayIdInput, fileKeyId?: LrRelayIdInput): Promise<import("../cryptography/cryptography.types").Key>;
+    getDirectoryKey(directoryId: LrRelayIdInput, directoryKeyId?: LrRelayIdInput): Promise<import("../key/key.types").Key>;
+    getFileKey(fileId: LrRelayIdInput, fileKeyId?: LrRelayIdInput): Promise<import("../key/key.types").Key>;
     createDirectoryExec(options: CreateDirectoryOptions): Promise<CreateDirectoryMutation>;
     createDirectory(options: CreateDirectoryOptions): Promise<LrMutation<CreateDirectoryMutation, {
         input: {

package/lib/{cryptography → key}/key-factory.service.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { JWK } from 'node-jose';
-import { LbopKeyParams, PassIdpParams, PassKeyParams, DeriveKeyResult, DerivePassIdpParams, DerivePassKeyParams, DeriveLbopKeyParams } from './cryptography.types';
-import { WebCryptoService } from './web-crypto.service';
+import { WebCryptoService } from '../web-crypto/web-crypto.service';
+import { DeriveKeyResult, DeriveLbopKeyParams, DerivePassIdpParams, DerivePassKeyParams, LbopKeyParams, PassIdpParams, PassKeyParams } from './key.types';
 export declare function sha256(message: any): Promise<string>;
 export declare class KeyFactoryService {
     private webCryptoService;

package/lib/{cryptography → key}/key-graph.service.d.ts

@@ -1,10 +1,10 @@
 import { JWK } from 'node-jose';
 import { JSONObject } from '../api/types';
-import { CurrentUserKey } from '../users/profile.types';
-import { Edge, Key, KeyGraphResponse, PassKey } from './cryptography.types';
-import { DecryptOptions, EncryptionService } from './encryption.service';
+import { DecryptOptions, EncryptionService } from '../encryption/encryption.service';
+import { CurrentUserKey } from '../profile/profile.types';
 import { KeyFactoryService } from './key-factory.service';
 import { KeyService } from './key.service';
+import { Key, KeyGraphEdge, KeyGraphResponse, PassKey } from './key.types';
 export interface GraphKey extends Key {
     task?: Promise<any>;
 }
@@ -21,8 +21,8 @@ export declare class KeyGraphService {
     key(id: any): GraphKey;
     passKey(id: any): PassKey;
     addKeys(src: KeyGraphResponse): void;
-    tracePath(distances: any, keyId: string): Edge[];
-    getPath(knownKeyId: string, keyId: string): Edge[];
+    tracePath(distances: any, keyId: string): KeyGraphEdge[];
+    getPath(knownKeyId: string, keyId: string): KeyGraphEdge[];
     getJwkKey(keyOrId: string | Key, getKeyIdCallback?: () => Promise<string> | string): Promise<JWK.Key>;
     getKey(keyOrId: string | Key, getKeyIdCallback?: () => Promise<string> | string): Promise<Key>;
     private _unwrapLink;

package/lib/{cryptography → key}/key-meta.service.d.ts

@@ -1,6 +1,6 @@
 import { JWK } from 'node-jose';
 import { LrApolloService } from '../api/lr-apollo.service';
-import { EncryptionService } from './encryption.service';
+import { EncryptionService } from '../encryption/encryption.service';
 import { KeyFactoryService } from './key-factory.service';
 import { KeyGraphService } from './key-graph.service';
 import { KeyService } from './key.service';

package/lib/{cryptography → key}/key.service.d.ts

@@ -1,6 +1,6 @@
-import { Key, PassKey } from './cryptography.types';
-import { PersistService } from '../api/persist.service';
 import { LifeReadyConfig } from '../life-ready.config';
+import { PersistService } from '../persist/persist.service';
+import { Key, PassKey } from './key.types';
 export declare class UserKeys {
     passKey: PassKey;
     masterKey: Key;

package/lib/{cryptography/cryptography.types.d.ts → key/key.types.d.ts}

@@ -1,4 +1,6 @@
 import { JWK } from 'node-jose';
+import { PassKeyNode } from '../api/types';
+import { SomeRequired } from '../_common/types';
 export interface Key {
     id: string;
     pbk?: string;
@@ -26,13 +28,7 @@ export interface LbopKeyVerifier {
     wrappedKey: object;
     key: object;
 }
-export interface PassKey {
-    id: string;
-    passKeyParams?: PassKeyParams;
-    passIdpParams?: PassIdpParams;
-    wrappedPassIdpVerifierPrk?: object;
-    created?: string;
-}
+export declare type PassKey = SomeRequired<PassKeyNode, 'id'>;
 export interface KeyLink {
     keyId: string;
     wrappingKeyId: string;
@@ -43,20 +39,20 @@ export interface PassKeyLink {
     passKeyId: string;
     wrappedKey: string;
 }
-export declare enum NodeType {
+export declare enum KeyGraphNodeType {
     Key = "key",
     PassKey = "passKey"
 }
-export interface Node {
-    type: NodeType;
+export interface KeyGraphNode {
+    type: KeyGraphNodeType;
     data: Key | PassKey;
 }
-export declare enum EdgeType {
+export declare enum KeyGraphEdgeType {
     KeyLink = "keyLink",
     PassKeyLink = "passKeyLink"
 }
-export interface Edge {
-    type: EdgeType;
+export interface KeyGraphEdge {
+    type: KeyGraphEdgeType;
     data: KeyLink | PassKeyLink;
 }
 export interface KeyGraphResponse {

package/lib/{api → key-exchange}/key-exchange.service.d.ts

@@ -1,10 +1,10 @@
+import { LrApolloService } from '../api/lr-apollo.service';
 import { LifeReadyAuthService } from '../auth/life-ready-auth.service';
-import { EncryptionService } from '../cryptography/encryption.service';
-import { KeyService } from '../cryptography/key.service';
-import { UserService } from './../users/user.service';
+import { EncryptionService } from '../encryption/encryption.service';
+import { KeyFactoryService as KFS } from '../key/key-factory.service';
+import { KeyService } from '../key/key.service';
+import { UserService } from '../user/user.service';
 import { CompleteOtk, DecryptedKeyExchange, GetKeyExchangeListOptions, GetKeyExchangeOptions, InitiateOtkInput, KeyExchange, RespondOtk, RespondOtkInput, UserSharedKey } from './key-exchange.types';
-import { LrApolloService } from './lr-apollo.service';
-import { KeyFactoryService as KFS } from '../cryptography/key-factory.service';
 export declare class KeyExchangeService {
     private keyFactory;
     private keyService;

package/lib/{api → key-exchange}/key-exchange.types.d.ts

@@ -1,8 +1,8 @@
-import { Key } from '../cryptography/cryptography.types';
-import { AccessLevel } from '../category/category.types';
 import { JWK } from 'node-jose';
-import { ContactCardName, TrustedPartyDetails } from '../users/profile.types';
-import { JSONObject, KeyExchangeMode, KeyExchangeState } from './types';
+import { JSONObject, KeyExchangeMode, KeyExchangeState } from '../api/types';
+import { AccessLevel } from '../category/category.types';
+import { Key } from '../key/key.types';
+import { ContactCardName, TrustedPartyDetails } from '../profile/profile.types';
 export interface PlainInitiatorRootKeyCipher {
     nonce: string;
     oneTimePrk: object;

package/lib/{api → key-exchange}/key-exchange2.gql.d.ts

@@ -1,5 +1,5 @@
 import { JWK } from 'node-jose';
-import { Connection, DateTime, ID, JSONObject, LrEmail, OtKeyCipherClearJson2 } from './types';
+import { Connection, DateTime, ID, JSONObject, LrEmail, OtKeyCipherClearJson2 } from '../api/types';
 export declare type KeyExchangeState2 = 'IN_PROGRESS' | 'COMPLETED' | 'DECLINED' | 'CANCELLED' | 'DELETED';
 export interface KeyExchangeFragment {
     id: ID;

package/lib/{api → key-exchange}/key-exchange2.service.d.ts

@@ -1,14 +1,13 @@
-import { NgZone } from '@angular/core';
+import { Injector, NgZone } from '@angular/core';
 import { JWK } from 'node-jose';
-import { EncryptionService } from '../cryptography/encryption.service';
-import { KeyFactoryService } from '../cryptography/key-factory.service';
-import { KeyGraphService } from '../cryptography/key-graph.service';
-import { KeyService } from '../cryptography/key.service';
-import { UserService } from './../users/user.service';
-import { OwnerPlainDataJson } from './contact-card2.service';
+import { LrMutation, LrService } from '../api/lr-graphql';
+import { ContactCardSharedCipherData, JSONObject, OtKeyCipherClearJson2 } from '../api/types';
+import { OwnerPlainDataJson } from '../contact-card/contact-card2.service';
+import { EncryptionService } from '../encryption/encryption.service';
+import { KeyFactoryService } from '../key/key-factory.service';
+import { KeyGraphService } from '../key/key-graph.service';
+import { KeyService } from '../key/key.service';
 import { CancelKeyExchangeMutation, CompleteKeyExchangeOtkMutation, CurrentUserSharedKeyQuery2, DeclineKeyExchangeMutation, InitiateKeyExchangeOtkMutation, KeyExchangeFragment, KeyExchangeState2, RespondKeyExchangeOtkMutation } from './key-exchange2.gql';
-import { LrGraphQLService, LrMutation } from './lr-graphql';
-import { ContactCardSharedCipherData, JSONObject, OtKeyCipherClearJson2 } from './types';
 /**
  * The decrypted content of the one-time key cipher;
  * When user supplies this information the lib doesn't need to do another API call
@@ -81,16 +80,15 @@ export interface GetKeyExchangeOptions2 {
     otKeyK?: string;
     token?: string;
 }
-export declare class KeyExchange2Service {
+export declare class KeyExchange2Service extends LrService {
     private ngZone;
+    private injector;
     private keyFactory;
     private keyService;
     private encryptionService;
-    private userService;
     private keyGraph;
-    private lrGraphQL;
     private readonly CLIENT_NONCE_LENGTH;
-    constructor(ngZone: NgZone, keyFactory: KeyFactoryService, keyService: KeyService, encryptionService: EncryptionService, userService: UserService, keyGraph: KeyGraphService, lrGraphQL: LrGraphQLService);
+    constructor(ngZone: NgZone, injector: Injector, keyFactory: KeyFactoryService, keyService: KeyService, encryptionService: EncryptionService, keyGraph: KeyGraphService);
     private getOtKey;
     private decryptOtk;
     private decryptResponseCipher;
@@ -121,19 +119,21 @@ export declare class KeyExchange2Service {
             id: string;
         };
     }>;
-    declineKeyExchange(id: string, token: string): Promise<LrMutation<DeclineKeyExchangeMutation, {
+    declineKeyExchangeExec(id: string, token: string): Promise<DeclineKeyExchangeMutation>;
+    declineKeyExchange(id: string, token: string): LrMutation<DeclineKeyExchangeMutation, {
         input: {
             id: string;
             token: string;
         };
-    }>>;
+    }>;
     declineKeyExchangeMutation(id: string, token: string): LrMutation<DeclineKeyExchangeMutation, {
         input: {
             id: string;
             token: string;
         };
     }>;
-    initiateOtk({ message, email, contactCard, upgrade, }?: InitiateOtkInput2): Promise<{
+    initiateOtkExec(input?: InitiateOtkInput2): Promise<InitiateKeyExchangeOtkMutation>;
+    initiateOtk(input?: InitiateOtkInput2): Promise<{
         lrMutation: LrMutation<InitiateKeyExchangeOtkMutation, {
             input: {
                 initiatorRootKeyCipher: string;
@@ -152,7 +152,44 @@ export declare class KeyExchange2Service {
         }>;
         otKeyK: string;
     }>;
-    respondOtk({ keyExchangeId, token, decryptedOtk, message, initiatorContactCard, responderContactCard, }: RespondOtkInput2): Promise<LrMutation<RespondKeyExchangeOtkMutation, {
+    initiateOtkMutation({ message, email, contactCard, upgrade, }?: InitiateOtkInput2): Promise<{
+        lrMutation: LrMutation<InitiateKeyExchangeOtkMutation, {
+            input: {
+                initiatorRootKeyCipher: string;
+                initiatorPxkId: string;
+                initiatorSigPxkId: string;
+                otKeyParams: string;
+                otKeyCipher: string;
+                sendEmail: {
+                    email: string;
+                    rawOtKey: string;
+                };
+                createTp: boolean;
+                initiatorPlainDataSig: string;
+                upgrade: boolean;
+            };
+        }>;
+        otKeyK: string;
+    }>;
+    respondOtkExec(input: RespondOtkInput2): Promise<RespondKeyExchangeOtkMutation>;
+    respondOtk(input: RespondOtkInput2): Promise<LrMutation<RespondKeyExchangeOtkMutation, {
+        input: {
+            keyExchangeId: string;
+            keyExchangeToken: string;
+            rootKeyId: string;
+            masterKeyId: string;
+            responderPxkId: string;
+            responderSigPxkId: string;
+            signedInitiatorPbk: string;
+            signedInitiatorSigPbk: string;
+            rkWrappedSharedKey: string;
+            mkWrappedMkSharedKey: string;
+            initiatorOneTimePbkCipher: string;
+            initiatorContactCard: any;
+            responderContactCard: any;
+        };
+    }>>;
+    respondOtkMutation({ keyExchangeId, token, decryptedOtk, message, initiatorContactCard, responderContactCard, }: RespondOtkInput2): Promise<LrMutation<RespondKeyExchangeOtkMutation, {
         input: {
             keyExchangeId: string;
             keyExchangeToken: string;
@@ -169,7 +206,23 @@ export declare class KeyExchange2Service {
             responderContactCard: any;
         };
     }>>;
-    completeOtk({ keyExchangeId, initiatorRootKeyCipher, initiatorOneTimePbkCipher, responderContactCard, initiatorContactCard, }: CompleteOtkInput2): Promise<LrMutation<CompleteKeyExchangeOtkMutation, {
+    completeOtkExec(input: CompleteOtkInput2): Promise<CompleteKeyExchangeOtkMutation>;
+    completeOtk(input: CompleteOtkInput2): Promise<LrMutation<CompleteKeyExchangeOtkMutation, {
+        input: {
+            keyExchangeId: string;
+            rootKeyId: string;
+            masterKeyId: string;
+            initiatorSigPxkId: string;
+            signedResponderPbk: string;
+            signedResponderSigPbk: string;
+            rkWrappedSharedKey: string;
+            mkWrappedMkSharedKey: string;
+            responderContactCardCipher: any;
+            initiatorContactCardCipher: any;
+            initiatorContactCardSharedCipher: any;
+        };
+    }>>;
+    completeOtkMutation({ keyExchangeId, initiatorRootKeyCipher, initiatorOneTimePbkCipher, responderContactCard, initiatorContactCard, }: CompleteOtkInput2): Promise<LrMutation<CompleteKeyExchangeOtkMutation, {
         input: {
             keyExchangeId: string;
             rootKeyId: string;