@lifeready/core 6.1.2 → 6.1.4

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

@@ -11,8 +11,8 @@ import { KcConfig } from '../life-ready.config';
 import { PasswordService } from '../password/password.service';
 import { PersistService } from '../persist/persist.service';
 import { TpPasswordResetAssemblyController } from '../tp-password-reset/tp-password-reset.controller';
-import { AuthUser, LoginChallenge, LoginOptions, LoginResult, LogoutListener, LrCognitoUserAttribute } from './auth2.types';
-export declare class Auth2Service extends LrService {
+import { AuthUser, LoginChallenge, LoginOptions, LoginResult, LogoutListener, LrCognitoUserAttribute } from './auth.types';
+export declare class AuthService extends LrService {
     private ngZone;
     private injector;
     private http;

package/lib/{item2/item2.service.d.ts → item/item.service.d.ts}

@@ -1,14 +1,14 @@
 import { Injector, NgZone } from '@angular/core';
 import { LrMutation, LrService } from '../api/lr-graphql';
 import { ID, LrRelayIdInput } from '../api/types';
-import { Auth2Service } from '../auth2/auth2.service';
+import { AuthService } from '../auth/auth.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 { ArchiveDirectoryOptions, BeginDeleteChildItemLinksWindowOptions, ChangeDirectoryParentsOptions, ChangeFileParentsOptions, CreateDirectoryOptions, CreateDirectoryTreeOptions, CreateFileOptions, DownloadFileContentOptions, FileParentDirectoryInput, IdKeyPair, ParentDirectoryInput, ParentRootDirectoryInput, RevertFileOptions, SetDirectoryConfidentialOptions, SetFileConfidentialOptions, UnarchiveDirectoryOptions, UpdateDirectoryOptions, UpdateFileOptions } from './item2.types';
-export declare class Item2Service extends LrService {
+import { ArchiveDirectoryOptions, BeginDeleteChildItemLinksWindowOptions, ChangeDirectoryParentsOptions, ChangeFileParentsOptions, CreateDirectoryOptions, CreateDirectoryTreeOptions, CreateFileOptions, DownloadFileContentOptions, FileParentDirectoryInput, IdKeyPair, ParentDirectoryInput, ParentRootDirectoryInput, RevertFileOptions, SetDirectoryConfidentialOptions, SetFileConfidentialOptions, UnarchiveDirectoryOptions, UpdateDirectoryOptions, UpdateFileOptions } from './item.types';
+export declare class ItemService extends LrService {
     private ngZone;
     private injector;
     private fileUploadService;
@@ -16,9 +16,9 @@ export declare class Item2Service extends LrService {
     private keyFactory;
     private keyGraph;
     private lockService;
-    private auth2Service;
+    private authService;
     private tempDirectory;
-    constructor(ngZone: NgZone, injector: Injector, fileUploadService: FileUploadService, keyService: KeyService, keyFactory: KeyFactoryService, keyGraph: KeyGraphService, lockService: LockService, auth2Service: Auth2Service);
+    constructor(ngZone: NgZone, injector: Injector, fileUploadService: FileUploadService, keyService: KeyService, keyFactory: KeyFactoryService, keyGraph: KeyGraphService, lockService: LockService, authService: AuthService);
     static TEMP_DIRECTORY_PLAIN_META: {
         kcType: string;
     };
@@ -28,8 +28,8 @@ export declare class Item2Service extends LrService {
     getFileKeyId(fileId: LrRelayIdInput): Promise<string>;
     getDirectoryKey(directoryId: LrRelayIdInput, directoryKeyId?: LrRelayIdInput): Promise<import("../key/key.types").Key>;
     getFileKey(fileId: LrRelayIdInput, fileKeyId?: LrRelayIdInput): Promise<import("../key/key.types").Key>;
-    createDirectory(options: CreateDirectoryOptions): Promise<import("./item2.gql").CreateDirectoryMutationResult>;
-    createDirectoryMutation(options: CreateDirectoryOptions): Promise<LrMutation<import("./item2.gql").CreateDirectoryMutationResult, {
+    createDirectory(options: CreateDirectoryOptions): Promise<import("./item.gql").CreateDirectoryMutationResult>;
+    createDirectoryMutation(options: CreateDirectoryOptions): Promise<LrMutation<import("./item.gql").CreateDirectoryMutationResult, {
         input: {
             parentDirectories: ParentDirectoryInput[];
             parentRootDirectory: ParentRootDirectoryInput;
@@ -37,22 +37,22 @@ export declare class Item2Service extends LrService {
             cipherMeta: string;
         };
     }>>;
-    updateDirectory(options: UpdateDirectoryOptions): Promise<import("./item2.gql").UpdateDirectoryMutationResult>;
-    updateDirectoryMutation(options: UpdateDirectoryOptions): Promise<LrMutation<import("./item2.gql").UpdateDirectoryMutationResult, {
+    updateDirectory(options: UpdateDirectoryOptions): Promise<import("./item.gql").UpdateDirectoryMutationResult>;
+    updateDirectoryMutation(options: UpdateDirectoryOptions): Promise<LrMutation<import("./item.gql").UpdateDirectoryMutationResult, {
         input: {
             directoryId: string;
             plainMeta: string;
             cipherMeta: string;
         };
     }>>;
-    deleteDirectory(id: ID): Promise<import("./item2.gql").DeleteDirectoryMutationResult>;
-    deleteDirectoryMutation(id: ID): LrMutation<import("./item2.gql").DeleteDirectoryMutationResult, {
+    deleteDirectory(id: ID): Promise<import("./item.gql").DeleteDirectoryMutationResult>;
+    deleteDirectoryMutation(id: ID): LrMutation<import("./item.gql").DeleteDirectoryMutationResult, {
         input: {
             directoryId: string;
         };
     }>;
-    createFile(options: CreateFileOptions): Promise<import("./item2.gql").CreateFileMutationResult>;
-    createFileMutation(options: CreateFileOptions): Promise<LrMutation<import("./item2.gql").CreateFileMutationResult, {
+    createFile(options: CreateFileOptions): Promise<import("./item.gql").CreateFileMutationResult>;
+    createFileMutation(options: CreateFileOptions): Promise<LrMutation<import("./item.gql").CreateFileMutationResult, {
         input: {
             parentDirectories: FileParentDirectoryInput[];
             wrappedStateKey: string;
@@ -61,8 +61,8 @@ export declare class Item2Service extends LrService {
             cipherMeta: string;
         };
     }>>;
-    updateFile(options: UpdateFileOptions): Promise<import("./item2.gql").UpdateFileMutationResult>;
-    updateFileMutation(options: UpdateFileOptions): Promise<LrMutation<import("./item2.gql").UpdateFileMutationResult, {
+    updateFile(options: UpdateFileOptions): Promise<import("./item.gql").UpdateFileMutationResult>;
+    updateFileMutation(options: UpdateFileOptions): Promise<LrMutation<import("./item.gql").UpdateFileMutationResult, {
         input: {
             fileId: string;
             wrappedStateKey: string;
@@ -71,59 +71,59 @@ export declare class Item2Service extends LrService {
             cipherMeta: string;
         };
     }>>;
-    revertFile(options: RevertFileOptions): Promise<import("./item2.gql").RevertFileMutationResult>;
-    revertFileMutation(options: RevertFileOptions): Promise<LrMutation<import("./item2.gql").RevertFileMutationResult, {
+    revertFile(options: RevertFileOptions): Promise<import("./item.gql").RevertFileMutationResult>;
+    revertFileMutation(options: RevertFileOptions): Promise<LrMutation<import("./item.gql").RevertFileMutationResult, {
         input: RevertFileOptions;
     }>>;
-    deleteFile(id: ID): Promise<import("./item2.gql").DeleteFileMutationResult>;
-    deleteFileMutation(id: ID): LrMutation<import("./item2.gql").DeleteFileMutationResult, {
+    deleteFile(id: ID): Promise<import("./item.gql").DeleteFileMutationResult>;
+    deleteFileMutation(id: ID): LrMutation<import("./item.gql").DeleteFileMutationResult, {
         input: {
             fileId: string;
         };
     }>;
-    archiveDirectory(directoryId: string, options: ArchiveDirectoryOptions): Promise<import("./item2.gql").ArchiveDirectoryMutationResult>;
-    archiveDirectoryMutation(directoryId: string, options: ArchiveDirectoryOptions): LrMutation<import("./item2.gql").ArchiveDirectoryMutationResult, {
+    archiveDirectory(directoryId: string, options: ArchiveDirectoryOptions): Promise<import("./item.gql").ArchiveDirectoryMutationResult>;
+    archiveDirectoryMutation(directoryId: string, options: ArchiveDirectoryOptions): LrMutation<import("./item.gql").ArchiveDirectoryMutationResult, {
         input: {
             directoryId: string;
             recursive: boolean;
         };
     }>;
-    archiveFile(fileId: string): Promise<import("./item2.gql").ArchiveFileMutationResult>;
-    archiveFileMutation(fileId: string): LrMutation<import("./item2.gql").ArchiveFileMutationResult, {
+    archiveFile(fileId: string): Promise<import("./item.gql").ArchiveFileMutationResult>;
+    archiveFileMutation(fileId: string): LrMutation<import("./item.gql").ArchiveFileMutationResult, {
         input: {
             fileId: string;
         };
     }>;
-    unarchiveDirectory(directoryId: string, options: UnarchiveDirectoryOptions): Promise<import("./item2.gql").UnarchiveDirectoryMutationResult>;
-    unarchiveDirectoryMutation(directoryId: string, options: UnarchiveDirectoryOptions): LrMutation<import("./item2.gql").UnarchiveDirectoryMutationResult, {
+    unarchiveDirectory(directoryId: string, options: UnarchiveDirectoryOptions): Promise<import("./item.gql").UnarchiveDirectoryMutationResult>;
+    unarchiveDirectoryMutation(directoryId: string, options: UnarchiveDirectoryOptions): LrMutation<import("./item.gql").UnarchiveDirectoryMutationResult, {
         input: {
             directoryId: string;
             recursive: boolean;
         };
     }>;
-    unarchiveFile(fileId: string): Promise<import("./item2.gql").UnarchiveFileMutationResult>;
-    unarchiveFileMutation(fileId: string): LrMutation<import("./item2.gql").UnarchiveFileMutationResult, {
+    unarchiveFile(fileId: string): Promise<import("./item.gql").UnarchiveFileMutationResult>;
+    unarchiveFileMutation(fileId: string): LrMutation<import("./item.gql").UnarchiveFileMutationResult, {
         input: {
             fileId: string;
         };
     }>;
-    changeDirectoryParents(options: ChangeDirectoryParentsOptions): Promise<import("./item2.gql").ChangeDirectoryParentsMutationResult>;
-    changeDirectoryParentsMutation(options: ChangeDirectoryParentsOptions): Promise<LrMutation<import("./item2.gql").ChangeDirectoryParentsMutationResult, {
+    changeDirectoryParents(options: ChangeDirectoryParentsOptions): Promise<import("./item.gql").ChangeDirectoryParentsMutationResult>;
+    changeDirectoryParentsMutation(options: ChangeDirectoryParentsOptions): Promise<LrMutation<import("./item.gql").ChangeDirectoryParentsMutationResult, {
         input: {
             directoryId: string;
             directoriesToRemove: string[];
             directoriesToAdd: ParentDirectoryInput[];
         };
     }>>;
-    changeFileParents(options: ChangeFileParentsOptions): Promise<import("./item2.gql").ChangeFileParentsMutationResult>;
-    changeFileParentsMutation(options: ChangeFileParentsOptions): Promise<LrMutation<import("./item2.gql").ChangeFileParentsMutationResult, {
+    changeFileParents(options: ChangeFileParentsOptions): Promise<import("./item.gql").ChangeFileParentsMutationResult>;
+    changeFileParentsMutation(options: ChangeFileParentsOptions): Promise<LrMutation<import("./item.gql").ChangeFileParentsMutationResult, {
         input: {
             fileId: string;
             directoriesToRemove: string[];
             directoriesToAdd: ParentDirectoryInput[];
         };
     }>>;
-    beginDeleteChildItemLinksWindow(options: BeginDeleteChildItemLinksWindowOptions): Promise<import("./item2.gql").BeginDeleteChildItemLinksWindowMutationResult>;
+    beginDeleteChildItemLinksWindow(options: BeginDeleteChildItemLinksWindowOptions): Promise<import("./item.gql").BeginDeleteChildItemLinksWindowMutationResult>;
     /**
      * Schedule cleanup of the hard links in a directory.
      * The server will delete all hard link within the directory within a time window: starting from now and
@@ -134,7 +134,7 @@ export declare class Item2Service extends LrService {
      * The server has a setting that allows for a maximum value on requestWindowMs. If the requested value
      * is larger than this maximum, the call will fail.
      */
-    beginDeleteChildItemLinksWindowMutation(options: BeginDeleteChildItemLinksWindowOptions): Promise<LrMutation<import("./item2.gql").BeginDeleteChildItemLinksWindowMutationResult, {
+    beginDeleteChildItemLinksWindowMutation(options: BeginDeleteChildItemLinksWindowOptions): Promise<LrMutation<import("./item.gql").BeginDeleteChildItemLinksWindowMutationResult, {
         input: BeginDeleteChildItemLinksWindowOptions;
     }>>;
     /**
@@ -149,28 +149,28 @@ export declare class Item2Service extends LrService {
      *
      */
     ensureTempDirectory(): Promise<IdKeyPair>;
-    createDirectoryTree(options: CreateDirectoryTreeOptions): Promise<import("./item2.gql").ChangeDirectoryParentsMutationResult>;
+    createDirectoryTree(options: CreateDirectoryTreeOptions): Promise<import("./item.gql").ChangeDirectoryParentsMutationResult>;
     /**
      * You must run this mutation within the temp directory cleanup window on the
      * server, otherwise the temp directory will get cleaned up.
      *
      */
-    createDirectoryTreeMutation(options: CreateDirectoryTreeOptions): Promise<LrMutation<import("./item2.gql").ChangeDirectoryParentsMutationResult, {
+    createDirectoryTreeMutation(options: CreateDirectoryTreeOptions): Promise<LrMutation<import("./item.gql").ChangeDirectoryParentsMutationResult, {
         input: {
             directoryId: string;
             directoriesToRemove: string[];
             directoriesToAdd: ParentDirectoryInput[];
         };
     }>>;
-    setFileConfidential(options: SetFileConfidentialOptions): Promise<import("./item2.gql").SetFileConfidentialMutationResult>;
-    setFileConfidentialMutation(options: SetFileConfidentialOptions): Promise<LrMutation<import("./item2.gql").SetFileConfidentialMutationResult, {
+    setFileConfidential(options: SetFileConfidentialOptions): Promise<import("./item.gql").SetFileConfidentialMutationResult>;
+    setFileConfidentialMutation(options: SetFileConfidentialOptions): Promise<LrMutation<import("./item.gql").SetFileConfidentialMutationResult, {
         input: {
             fileId: string;
             confidential: boolean;
         };
     }>>;
-    setDirectoryConfidential(options: SetDirectoryConfidentialOptions): Promise<import("./item2.gql").SetDirectoryConfidentialMutationResult>;
-    setDirectoryConfidentialMutation(options: SetDirectoryConfidentialOptions): Promise<LrMutation<import("./item2.gql").SetDirectoryConfidentialMutationResult, {
+    setDirectoryConfidential(options: SetDirectoryConfidentialOptions): Promise<import("./item.gql").SetDirectoryConfidentialMutationResult>;
+    setDirectoryConfidentialMutation(options: SetDirectoryConfidentialOptions): Promise<LrMutation<import("./item.gql").SetDirectoryConfidentialMutationResult, {
         input: {
             directoryId: string;
             confidential: boolean;

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

@@ -1,7 +1,7 @@
 import { JWK } from 'node-jose';
 import { Connection, DateTime, ID, JSONObject, JSONString, LrEmail, OtKeyCipherClearJson2 } from '../api/types';
 export declare type KeyExchangeState2 = 'IN_PROGRESS' | 'COMPLETED' | 'DECLINED' | 'CANCELLED' | 'DELETED';
-export interface KeyExchangeFragment {
+export interface KeyExchangeFieldsResult {
     id: ID;
     token: string;
     state: KeyExchangeState2;
@@ -49,8 +49,8 @@ export interface KeyExchangeFragment {
         responderPbkCipher: string;
     };
 }
-export declare const KeyExchangeFragment: import("../_common/ast").TypedDocumentNode<KeyExchangeFragment>;
-export interface UserSharedKeyFragment {
+export declare const KeyExchangeFields = "\n  id\n  token\n  state\n  mode\n  isInitiator\n  initiator {\n    id\n    username\n    config\n  }\n  responder {\n    id\n    username\n  }\n  created\n  modified\n  tokenExpiryTime\n  isExpired\n  initiatorRootKeyCipher\n  initiatorActionRequired\n  responderActionRequired\n  responderEmailAddress\n  otk {\n    state\n    otKeyParams\n    otKeyCipher\n    sharedKey {\n      id\n    }\n    mkSharedKey {\n      id\n    }\n    initiatorSigPxk {\n      id\n    }\n    responderSigPxk {\n      id\n    }\n    initiatorOneTimePbkCipher\n    responderPbkCipher\n  }\n";
+export interface UserSharedKeyFieldsResult {
     userSigPrk: {
         id: ID;
     };
@@ -63,18 +63,26 @@ export interface UserSharedKeyFragment {
     mkSharedKey: {
         id: ID;
     };
+    mkPxk: {
+        id: ID;
+        pbk: JSONObject;
+    };
+    mkReshareRequestCipher: string;
+    mkReshareResponseCipher: string;
+    mkReshareRequestSent: boolean;
+    mkReshareResponseSent: boolean;
 }
-export declare const UserSharedKeyFragment: import("../_common/ast").TypedDocumentNode<UserSharedKeyFragment>;
+export declare const UserSharedKeyFields = "\n  userSigPrk {\n    id\n  }\n  otherSigPbk {\n    id\n  }\n  sharedKey {\n    id\n  }\n  mkSharedKey {\n    id\n  }\n  mkPxk {\n    id\n    pbk\n  }\n  mkReshareRequestCipher\n  mkReshareResponseCipher\n  mkReshareRequestSent\n  mkReshareResponseSent\n";
 export interface KeyExchangesQuery2 {
-    keyExchanges: Connection<KeyExchangeFragment>;
+    keyExchanges: Connection<KeyExchangeFieldsResult>;
 }
 export declare const KeyExchangesQuery2: import("../_common/ast").TypedDocumentNode<KeyExchangesQuery2>;
 export interface KeyExchangeQuery2 {
-    keyExchange: KeyExchangeFragment;
+    keyExchange: KeyExchangeFieldsResult;
 }
 export declare const KeyExchangeQuery2: import("../_common/ast").TypedDocumentNode<KeyExchangeQuery2>;
 export interface KeyExchangeTokenQuery2 {
-    keyExchange: KeyExchangeFragment;
+    keyExchange: KeyExchangeFieldsResult;
 }
 export declare const KeyExchangeTokenQuery2: import("../_common/ast").TypedDocumentNode<KeyExchangeTokenQuery2>;
 export interface CancelKeyExchangeMutation {
@@ -95,33 +103,39 @@ export interface DeclineKeyExchangeMutation {
 export declare const DeclineKeyExchangeMutation: import("../_common/ast").TypedDocumentNode<DeclineKeyExchangeMutation>;
 export interface InitiateKeyExchangeOtkMutation {
     initiateKeyExchangeOtk: {
-        keyExchange: KeyExchangeFragment;
+        keyExchange: KeyExchangeFieldsResult;
     };
 }
 export declare const InitiateKeyExchangeOtkMutation: import("../_common/ast").TypedDocumentNode<InitiateKeyExchangeOtkMutation>;
 export interface RespondKeyExchangeOtkMutation {
     respondKeyExchangeOtk: {
-        keyExchange: KeyExchangeFragment;
-        userSharedKey: UserSharedKeyFragment;
+        keyExchange: KeyExchangeFieldsResult;
+        userSharedKey: UserSharedKeyFieldsResult;
         tp: {
             id: ID;
+            user: {
+                config: unknown;
+            };
         };
     };
 }
 export declare const RespondKeyExchangeOtkMutation: import("../_common/ast").TypedDocumentNode<RespondKeyExchangeOtkMutation>;
 export interface CompleteKeyExchangeOtkMutation {
     completeKeyExchangeOtk: {
-        keyExchange: KeyExchangeFragment;
-        userSharedKey: UserSharedKeyFragment;
+        keyExchange: KeyExchangeFieldsResult;
+        userSharedKey: UserSharedKeyFieldsResult;
         tp: {
             id: ID;
+            user: {
+                config: unknown;
+            };
         };
     };
 }
 export declare const CompleteKeyExchangeOtkMutation: import("../_common/ast").TypedDocumentNode<CompleteKeyExchangeOtkMutation>;
 export interface CurrentUserSharedKeyQuery2 {
     currentUserSharedKey: {
-        userSharedKey: UserSharedKeyFragment;
+        userSharedKey: UserSharedKeyFieldsResult;
     };
 }
 export declare const CurrentUserSharedKeyQuery2: import("../_common/ast").TypedDocumentNode<CurrentUserSharedKeyQuery2>;

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

@@ -7,7 +7,7 @@ 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 { CancelKeyExchangeMutation, CompleteKeyExchangeOtkMutation, CurrentUserSharedKeyQuery2, DeclineKeyExchangeMutation, InitiateKeyExchangeOtkMutation, KeyExchangeFieldsResult, KeyExchangeState2, RespondKeyExchangeOtkMutation } from './key-exchange.gql';
 /**
  * The decrypted content of the one-time key cipher;
  * When user supplies this information the lib doesn't need to do another API call
@@ -80,7 +80,7 @@ export interface GetKeyExchangeOptions2 {
     otKeyK?: string;
     token?: string;
 }
-export declare class KeyExchange2Service extends LrService {
+export declare class KeyExchangeService extends LrService {
     private ngZone;
     private injector;
     private keyFactory;
@@ -94,17 +94,17 @@ export declare class KeyExchange2Service extends LrService {
     private decryptResponseCipher;
     private decryptKeyExchangeAsInitiator;
     private decryptKeyExchangeAsResponder;
-    decryptKeyExchange(keyExchange: KeyExchangeFragment, otKeyK?: string): Promise<KeyExchangeFragment>;
+    decryptKeyExchange(keyExchange: KeyExchangeFieldsResult, otKeyK?: string): Promise<KeyExchangeFieldsResult>;
     getKeyExchanges({ state }?: {
         state?: KeyExchangeState2;
-    }): Promise<KeyExchangeFragment[]>;
+    }): Promise<KeyExchangeFieldsResult[]>;
     /**
      * @param id If the current user can responder the key exchange if they are either the initiator or the receiver.
      * @param token If not signed in, or not the initiator or responder, 'token' must be given.
      * @param otKeyK Is the raw one-time key (string). If the responder is explicitly specified at time of initiation, then
      *   it's possible to have the otKey wrapped by the public key of the responder. In which case, the otKeyK is not needed.
      */
-    getKeyExchange(id: string, { otKeyK, token }?: GetKeyExchangeOptions2): Promise<KeyExchangeFragment>;
+    getKeyExchange(id: string, { otKeyK, token }?: GetKeyExchangeOptions2): Promise<KeyExchangeFieldsResult>;
     getCurrentUserSharedKey(input: {
         username?: string;
         userId?: string;

package/lib/lbop/lbop.service.d.ts

@@ -2,10 +2,8 @@ import { HttpClient } from '@angular/common/http';
 import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
 import { JWK } from 'node-jose';
 import { LrApolloService } from '../api/lr-apollo.service';
-import { Auth2Service } from '../auth2/auth2.service';
 import { EncryptionService } from '../encryption/encryption.service';
 import { KeyFactoryService as KFS } from '../key/key-factory.service';
-import { KeyGraphService } from '../key/key-graph.service';
 import { KeyService } from '../key/key.service';
 import { PassKeyParams } from '../key/key.types';
 import { KcConfig } from '../life-ready.config';
@@ -80,15 +78,13 @@ export declare class LbopService {
     private http;
     private lrApollo;
     private auth;
-    private auth2Service;
     private keyFactory;
     private keyService;
     private encryptionService;
-    private keyGraph;
     private passwordService;
     private readonly CLIENT_NONCE_LENGTH;
     private readonly LBOP_WORDS;
-    constructor(config: KcConfig, http: HttpClient, lrApollo: LrApolloService, auth: AuthClass, auth2Service: Auth2Service, keyFactory: KFS, keyService: KeyService, encryptionService: EncryptionService, keyGraph: KeyGraphService, passwordService: PasswordService);
+    constructor(config: KcConfig, http: HttpClient, lrApollo: LrApolloService, auth: AuthClass, keyFactory: KFS, keyService: KeyService, encryptionService: EncryptionService, passwordService: PasswordService);
     private getPartial;
     remove(id: string): Promise<string>;
     update({ id, name }: UpdateLbopParams): Promise<Lbop>;

package/lib/password/password.service.d.ts

@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { AuthClass } from '@aws-amplify/auth/lib-esm/Auth';
 import { Duration } from 'moment';
 import { JWK } from 'node-jose';
-import { PassKeyBundle } from '../auth2/auth2.types';
+import { PassKeyBundle } from '../auth/auth.types';
 import { EncryptionService } from '../encryption/encryption.service';
 import { KeyFactoryService as KFS } from '../key/key-factory.service';
 import { KeyGraphService } from '../key/key-graph.service';

package/lib/{plan2/plan2.service.d.ts → plan/plan.service.d.ts}

@@ -1,20 +1,20 @@
 import { Injector, NgZone } from '@angular/core';
 import { LrMutation, LrService } from '../api/lr-graphql';
 import { LrRelayIdInput } from '../api/types';
-import { CancelPlanOptions, ChangePriceOptionOptions, IssuePlanOptions } from './plan2.types';
-export declare class Plan2Service extends LrService {
+import { CancelPlanOptions, ChangePriceOptionOptions, IssuePlanOptions } from './plan.types';
+export declare class PlanService extends LrService {
     private ngZone;
     private injector;
     constructor(ngZone: NgZone, injector: Injector);
-    initiateStripePaymentMethodCapture(): Promise<import("./plan2.gql").InitiateStripePaymentMethodCaptureMutationResult>;
+    initiateStripePaymentMethodCapture(): Promise<import("./plan.gql").InitiateStripePaymentMethodCaptureMutationResult>;
     /**
      * Starts a stripe payment capture intent. On intent can only add one card.
      * @returns Promise that resolves to a mutation
      */
-    initiateStripePaymentMethodCaptureMutation(): LrMutation<import("./plan2.gql").InitiateStripePaymentMethodCaptureMutationResult, {
+    initiateStripePaymentMethodCaptureMutation(): LrMutation<import("./plan.gql").InitiateStripePaymentMethodCaptureMutationResult, {
         input: {};
     }>;
-    completeStripePaymentMethodCapture(stripeIntentId: string): Promise<import("./plan2.gql").CompleteStripePaymentMethodCaptureMutationResult>;
+    completeStripePaymentMethodCapture(stripeIntentId: string): Promise<import("./plan.gql").CompleteStripePaymentMethodCaptureMutationResult>;
     /**
      * Completes the payment capture intent. Call this after calling stripe.confirmCardSetup.
      *
@@ -23,33 +23,33 @@ export declare class Plan2Service extends LrService {
      *
      * @returns Promise that resolves to a mutation with the just created PaymentMethodNode
      */
-    completeStripePaymentMethodCaptureMutation(stripeIntentId: string): LrMutation<import("./plan2.gql").CompleteStripePaymentMethodCaptureMutationResult, {
+    completeStripePaymentMethodCaptureMutation(stripeIntentId: string): LrMutation<import("./plan.gql").CompleteStripePaymentMethodCaptureMutationResult, {
         input: {
             stripeIntentId: string;
         };
     }>;
-    setDefaultPaymentMethod(paymentMethodId: LrRelayIdInput): Promise<import("./plan2.gql").SetDefaultPaymentMethodMutationResult>;
+    setDefaultPaymentMethod(paymentMethodId: LrRelayIdInput): Promise<import("./plan.gql").SetDefaultPaymentMethodMutationResult>;
     /**
      * Mutation that sets the default payment method for the current user.
      *
      * @param paymentMethodId The id from PaymentMethodNode
      * @returns Promise that resolves to a mutation
      */
-    setDefaultPaymentMethodMutation(paymentMethodId: LrRelayIdInput): LrMutation<import("./plan2.gql").SetDefaultPaymentMethodMutationResult, {
+    setDefaultPaymentMethodMutation(paymentMethodId: LrRelayIdInput): LrMutation<import("./plan.gql").SetDefaultPaymentMethodMutationResult, {
         input: {
             paymentMethodId: string;
         };
     }>;
-    removeDefaultPaymentMethod(): Promise<import("./plan2.gql").RemoveDefaultPaymentMethodMutationResult>;
+    removeDefaultPaymentMethod(): Promise<import("./plan.gql").RemoveDefaultPaymentMethodMutationResult>;
     /**
      * Mutation that removes a the default payment method
      *
      * @returns Promise that resolves to a mutation
      */
-    removeDefaultPaymentMethodMutation(): LrMutation<import("./plan2.gql").RemoveDefaultPaymentMethodMutationResult, {
+    removeDefaultPaymentMethodMutation(): LrMutation<import("./plan.gql").RemoveDefaultPaymentMethodMutationResult, {
         input: {};
     }>;
-    issuePlan(options: IssuePlanOptions): Promise<import("./plan2.gql").IssuePlanMutationResult>;
+    issuePlan(options: IssuePlanOptions): Promise<import("./plan.gql").IssuePlanMutationResult>;
     /**
      * Mutation that issues a new plan for the current user.
      *
@@ -59,22 +59,22 @@ export declare class Plan2Service extends LrService {
      * @param options.promotionalCode promotion code where applicable
      * @returns Promise that resolves to a mutation
      */
-    issuePlanMutation(options: IssuePlanOptions): LrMutation<import("./plan2.gql").IssuePlanMutationResult, {
+    issuePlanMutation(options: IssuePlanOptions): LrMutation<import("./plan.gql").IssuePlanMutationResult, {
         input: IssuePlanOptions;
     }>;
-    removePaymentMethod(paymentMethodId: string): Promise<import("./plan2.gql").RemovePaymentMethodMutationResult>;
+    removePaymentMethod(paymentMethodId: string): Promise<import("./plan.gql").RemovePaymentMethodMutationResult>;
     /**
      * Mutation that removes a payment method for the current user
      *
      * @param paymentMethodId The id from PaymentMethodNode
      * @returns Promise that resolves to a mutation
      */
-    removePaymentMethodMutation(paymentMethodId: LrRelayIdInput): LrMutation<import("./plan2.gql").RemovePaymentMethodMutationResult, {
+    removePaymentMethodMutation(paymentMethodId: LrRelayIdInput): LrMutation<import("./plan.gql").RemovePaymentMethodMutationResult, {
         input: {
             paymentMethodId: string;
         };
     }>;
-    cancelPlan(options: CancelPlanOptions): Promise<import("./plan2.gql").CancelPlanMutationResult>;
+    cancelPlan(options: CancelPlanOptions): Promise<import("./plan.gql").CancelPlanMutationResult>;
     /**
      * Mutation that removes a payment method for the current user
      *
@@ -82,10 +82,10 @@ export declare class Plan2Service extends LrService {
      * @param options.immediate If true, cancel plan effective immediately. Default false.
      * @returns Promise that resolves to a mutation
      */
-    cancelPlanMutation(options: CancelPlanOptions): LrMutation<import("./plan2.gql").CancelPlanMutationResult, {
+    cancelPlanMutation(options: CancelPlanOptions): LrMutation<import("./plan.gql").CancelPlanMutationResult, {
         input: CancelPlanOptions;
     }>;
-    changePriceOption(options: ChangePriceOptionOptions): Promise<import("./plan2.gql").ChangePriceOptionMutationResult>;
+    changePriceOption(options: ChangePriceOptionOptions): Promise<import("./plan.gql").ChangePriceOptionMutationResult>;
     /**
      * Change the price option for a plan.
      *
@@ -93,17 +93,17 @@ export declare class Plan2Service extends LrService {
      * @param options.priceId The priceId from PriceOptionField (eg. inside AvailablePlanField)
      * @returns Promise that resolves to a mutation
      */
-    changePriceOptionMutation(options: ChangePriceOptionOptions): LrMutation<import("./plan2.gql").ChangePriceOptionMutationResult, {
+    changePriceOptionMutation(options: ChangePriceOptionOptions): LrMutation<import("./plan.gql").ChangePriceOptionMutationResult, {
         input: ChangePriceOptionOptions;
     }>;
-    reactivatePlan(planId: LrRelayIdInput): Promise<import("./plan2.gql").ReactivatePlanMutationResult>;
+    reactivatePlan(planId: LrRelayIdInput): Promise<import("./plan.gql").ReactivatePlanMutationResult>;
     /**
      * Reactivate a cancelled plan with a specified price option.
      *
      * @param options.planId The id from IssuedPlanNode
      * @returns Promise that resolves to a mutation
      */
-    reactivatePlanMutation(planId: LrRelayIdInput): LrMutation<import("./plan2.gql").ReactivatePlanMutationResult, {
+    reactivatePlanMutation(planId: LrRelayIdInput): LrMutation<import("./plan.gql").ReactivatePlanMutationResult, {
         input: {
             planId: string;
         };

package/lib/profile/profile.gql.d.ts

@@ -2,8 +2,6 @@ import { Connection, ContactCardNode, TpNode } from '../api/types';
 import { HasKeyGraph } from '../key/key.types';
 import { HasEdges } from './../_common/types';
 import { ApiContactCard, ApiCurrentUser } from './profile.types';
-export declare const UserSharedKeyFields = "\n  userSigPrk {\n    id\n  }\n  otherSigPbk {\n    id\n  }\n  sharedKey {\n    id\n  }\n  mkSharedKey {\n    id\n  }\n  mkPxk {\n    id\n    pbk\n  }\n  mkReshareRequestCipher\n  mkReshareResponseCipher\n  mkReshareRequestSent\n  mkReshareResponseSent\n";
-export declare const KeyExchangeFields = "\n  id\n  token\n  state\n  mode\n  isInitiator\n  initiator {\n    id\n    username\n  }\n  responder {\n    id\n    username\n  }\n  created\n  modified\n  tokenExpiryTime\n  isExpired\n  initiatorRootKeyCipher\n  initiatorActionRequired\n  responderActionRequired\n  responderEmailAddress\n  otk {\n    state\n    otKeyParams\n    otKeyCipher\n    sharedKey {\n      id\n    }\n    mkSharedKey {\n      id\n    }\n    initiatorSigPxk {\n      id\n    }\n    responderSigPxk {\n      id\n    }\n    initiatorOneTimePbkCipher\n    responderPbkCipher\n}";
 export declare const TrustedPartyProperties: string;
 export interface CurrentUserQueryType extends HasKeyGraph {
     currentUser: ApiCurrentUser;

package/lib/profile/profile.service.d.ts

@@ -6,7 +6,7 @@ import { KeyGraphService } from '../key/key-graph.service';
 import { KeyMetaService } from '../key/key-meta.service';
 import { KeyService } from '../key/key.service';
 import { KcConfig } from '../life-ready.config';
-import { ApiContactCard, ApiCurrentUser, MainContactCard, MainContactCardFields, PassIdpApiResult } from './profile.types';
+import { ApiContactCard, ApiCurrentUser, MainContactCard, MainContactCardFields } from './profile.types';
 export declare class ProfileService {
     private config;
     private http;
@@ -16,7 +16,6 @@ export declare class ProfileService {
     private keyGraph;
     private encryptionService;
     constructor(config: KcConfig, http: HttpClient, lrApollo: LrApolloService, keyService: KeyService, keyMetaService: KeyMetaService, keyGraph: KeyGraphService, encryptionService: EncryptionService);
-    getPassIdpParams(emailOrPhone: string): Promise<PassIdpApiResult>;
     getCurrentUser(): Promise<{
         currentUser: ApiCurrentUser;
         contactCard: ApiContactCard;

package/lib/profile/profile.types.d.ts

@@ -1,6 +1,6 @@
 import { DateTime, UserDeleteNode, UserSharedKeyNode } from '../api/types';
-import { IdKeyPair } from '../item2/item2.types';
-import { PassIdpParams, PassKey } from '../key/key.types';
+import { IdKeyPair } from '../item/item.types';
+import { PassKey } from '../key/key.types';
 export declare enum FeatureAction {
     ACCESS = "access"
 }
@@ -79,19 +79,6 @@ export interface MainContactCard extends IdKeyPair {
 export declare class MainContactCardPlainFields {
     name: ContactCardName;
 }
-export declare enum PasswordChangeStatus {
-    InProgress = "IN_PROGRESS",
-    Recovery = "RECOVERY"
-}
-export declare class PassIdpApiResult {
-    passwordChangeStatus?: PasswordChangeStatus;
-    currentPassIdpParams: PassIdpParams;
-    newPassIdpParams: PassIdpParams;
-    tpPasswordReset: {
-        passIdpParams: PassIdpParams;
-        resetUsername: string;
-    };
-}
 export declare class TrustedPartyDetails {
     name: ContactCardName;
     email?: string;

package/lib/scenario/scenario.service.d.ts

@@ -1,7 +1,7 @@
 import { Injector, NgZone } from '@angular/core';
 import { LrMergedMutation, LrMutation, LrService } from '../api/lr-graphql';
 import { EncryptionService } from '../encryption/encryption.service';
-import { Item2Service } from '../item2/item2.service';
+import { ItemService } from '../item/item.service';
 import { KeyGraphService } from '../key/key-graph.service';
 import { ScenarioAssemblyController } from './scenario.controller';
 import { CreateScenarioOptions, ResetScenarioOptions, UpdateScenarioOptions } from './scenario.types';
@@ -11,10 +11,10 @@ export declare class ScenarioService extends LrService {
     private ngZone;
     private injector;
     private keyGraph;
-    private item2Service;
+    private itemService;
     private assemblyController;
     private encryptionService;
-    constructor(ngZone: NgZone, injector: Injector, keyGraph: KeyGraphService, item2Service: Item2Service, assemblyController: ScenarioAssemblyController, encryptionService: EncryptionService);
+    constructor(ngZone: NgZone, injector: Injector, keyGraph: KeyGraphService, itemService: ItemService, assemblyController: ScenarioAssemblyController, encryptionService: EncryptionService);
     static SLIP39_PASSPHRASE: string;
     private prepareAddReceiverDirectory;
     private prepareUpdateReceiverDirectory;

package/lib/shared-contact-card/shared-contact-card2.service.d.ts

@@ -2,7 +2,7 @@ import { NgZone } from '@angular/core';
 import { LrGraphQLService, LrMutation } from '../api/lr-graphql';
 import { LrRelayIdInput } from '../api/types';
 import { EncryptionService } from '../encryption/encryption.service';
-import { ContactCardReceiverCipherData, SendContactCardInput } from '../key-exchange/key-exchange2.service';
+import { ContactCardReceiverCipherData, SendContactCardInput } from '../key-exchange/key-exchange.service';
 import { KeyGraphService } from '../key/key-graph.service';
 import { KeyService } from '../key/key.service';
 import { UpdateOwnedContactCardMutation, UpdateReceivedContactCardMutation } from './shared-contact-card2.gql';