@lifeready/core 1.0.21 → 1.0.23

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/_common/utils.d.ts

@@ -1,6 +1,6 @@
 export declare function promiseAllMayAsync(values: any[]): Promise<any> | any;
-export declare function mapValuesMayAsync(obj: object, callback: (value: any, key: string, obj: object) => any | Promise<any>): Promise<any> | any;
-export declare function mapValuesAsync(obj: object, callback?: (value: any, key: string, obj: object) => any | Promise<any>): Promise<any>;
+export declare function mapValuesMayAsync(obj: Record<string, any>, callback: (value: any, key: string, obj: Record<string, any>) => any | Promise<any>): Promise<any> | any;
+export declare function mapValuesAsync(obj: Record<string, any>, callback?: (value: any, key: string, obj: Record<string, any>) => any | Promise<any>): Promise<any>;
 /**
  * Returns the defaultValue when value is undefined
  * @param value The value to check

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

@@ -1,6 +1,6 @@
+import { MutationOptions, QueryOptions } from '@apollo/client/core';
 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

@@ -1,12 +1,12 @@
 import { NgZone } from '@angular/core';
-import { Apollo } from 'apollo-angular';
-import { QueryOptions, MutationOptions, OperationVariables, FetchPolicy } from '@apollo/client/core';
+import { FetchPolicy, MutationOptions, OperationVariables, QueryOptions } from '@apollo/client/core';
 import { MutationBaseOptions } from '@apollo/client/core/watchQueryOptions';
-import { KeyGraphService } from '../../cryptography/key-graph.service';
+import { Apollo } from 'apollo-angular';
+import { KeyGraphService } from '../../key/key-graph.service';
 import { TypedDocumentNode } from '../../_common/ast';
 import { ProcessorOptions, QueryProcessorService } from '../query-processor';
-import { LrMutationBase } from './lr-mutation-base';
 import { LrMergedMutation } from './lr-merged-mutation';
+import { LrMutationBase } from './lr-mutation-base';
 export interface LrQueryOptions<T, TVariables> extends QueryOptions<TVariables> {
     query: TypedDocumentNode<T>;
     includeKeyGraph?: boolean;
@@ -45,10 +45,28 @@ export declare class LrGraphQLService {
     statsSnapshot(): LrGraphQLServiceStats;
     private addKeys;
     private isIncludeKeyGraph;
-    lrMutate<T1, TVariables1, T2, TVariables2>(lrMutations: [LrMutationMayAsync<T1, TVariables1>, LrMutationMayAsync<T2, TVariables2>], options?: LrMutationOptions): Promise<[T1, T2]>;
-    lrMutate<T1, TVariables1, T2, TVariables2, T3, TVariables3>(lrMutations: [LrMutationMayAsync<T1, TVariables1>, LrMutationMayAsync<T2, TVariables2>, LrMutationMayAsync<T3, TVariables3>], options?: LrMutationOptions): Promise<[T1, T2, T3]>;
-    lrMutate<T1, TVariables1, T2, TVariables2, T3, TVariables3, T4, TVariables4>(lrMutations: [LrMutationMayAsync<T1, TVariables1>, LrMutationMayAsync<T2, TVariables2>, LrMutationMayAsync<T3, TVariables3>, LrMutationMayAsync<T4, TVariables4>], options?: LrMutationOptions): Promise<[T1, T2, T3, T4]>;
-    lrMutate<T1, TVariables1, T2, TVariables2, T3, TVariables3, T4, TVariables4, T5, TVariables5>(lrMutations: [LrMutationMayAsync<T1, TVariables1>, LrMutationMayAsync<T2, TVariables2>, LrMutationMayAsync<T3, TVariables3>, LrMutationMayAsync<T4, TVariables4>, LrMutationMayAsync<T5, TVariables5>], options?: LrMutationOptions): Promise<[T1, T2, T3, T4, T5]>;
+    lrMutate<T1, TVariables1, T2, TVariables2>(lrMutations: [
+        LrMutationMayAsync<T1, TVariables1>,
+        LrMutationMayAsync<T2, TVariables2>
+    ], options?: LrMutationOptions): Promise<[T1, T2]>;
+    lrMutate<T1, TVariables1, T2, TVariables2, T3, TVariables3>(lrMutations: [
+        LrMutationMayAsync<T1, TVariables1>,
+        LrMutationMayAsync<T2, TVariables2>,
+        LrMutationMayAsync<T3, TVariables3>
+    ], options?: LrMutationOptions): Promise<[T1, T2, T3]>;
+    lrMutate<T1, TVariables1, T2, TVariables2, T3, TVariables3, T4, TVariables4>(lrMutations: [
+        LrMutationMayAsync<T1, TVariables1>,
+        LrMutationMayAsync<T2, TVariables2>,
+        LrMutationMayAsync<T3, TVariables3>,
+        LrMutationMayAsync<T4, TVariables4>
+    ], options?: LrMutationOptions): Promise<[T1, T2, T3, T4]>;
+    lrMutate<T1, TVariables1, T2, TVariables2, T3, TVariables3, T4, TVariables4, T5, TVariables5>(lrMutations: [
+        LrMutationMayAsync<T1, TVariables1>,
+        LrMutationMayAsync<T2, TVariables2>,
+        LrMutationMayAsync<T3, TVariables3>,
+        LrMutationMayAsync<T4, TVariables4>,
+        LrMutationMayAsync<T5, TVariables5>
+    ], options?: LrMutationOptions): Promise<[T1, T2, T3, T4, T5]>;
     lrMutate<T, TVariables = {
         [key: string]: any;
     }>(lrMutation: LrMutationMayAsync<T, TVariables>, options?: LrMutationOptions<T, TVariables>): Promise<T>;

package/lib/api/lr-graphql/lr-merged-mutation.d.ts

@@ -4,10 +4,28 @@ export declare class LrMergedMutation<T> extends LrMutationBase<T> {
     readonly descendants: Set<LrMutationBase<any>>;
     protected prefixes: string[];
     constructor(lrMutations: LrMutationBase<any>[]);
-    static create<T1, T2>(lrMutations: [LrMutationBase<T1> | LrMergedMutation<T1>, LrMutationBase<T2> | LrMergedMutation<T2>]): LrMergedMutation<[T1, T2]>;
-    static create<T1, T2, T3>(lrMutations: [LrMutationBase<T1> | LrMergedMutation<T1>, LrMutationBase<T2> | LrMergedMutation<T2>, LrMutationBase<T3> | LrMergedMutation<T3>]): LrMergedMutation<[T1, T2, T3]>;
-    static create<T1, T2, T3, T4>(lrMutations: [LrMutationBase<T1> | LrMergedMutation<T1>, LrMutationBase<T2> | LrMergedMutation<T2>, LrMutationBase<T3> | LrMergedMutation<T3>, LrMutationBase<T4> | LrMergedMutation<T4>]): LrMergedMutation<[T1, T2, T3, T4]>;
-    static create<T1, T2, T3, T4, T5>(lrMutations: [LrMutationBase<T1> | LrMergedMutation<T1>, LrMutationBase<T2> | LrMergedMutation<T2>, LrMutationBase<T3> | LrMergedMutation<T3>, LrMutationBase<T4> | LrMergedMutation<T4>, LrMutationBase<T5> | LrMergedMutation<T5>]): LrMergedMutation<[T1, T2, T3, T4, T5]>;
+    static create<T1, T2>(lrMutations: [
+        LrMutationBase<T1> | LrMergedMutation<T1>,
+        LrMutationBase<T2> | LrMergedMutation<T2>
+    ]): LrMergedMutation<[T1, T2]>;
+    static create<T1, T2, T3>(lrMutations: [
+        LrMutationBase<T1> | LrMergedMutation<T1>,
+        LrMutationBase<T2> | LrMergedMutation<T2>,
+        LrMutationBase<T3> | LrMergedMutation<T3>
+    ]): LrMergedMutation<[T1, T2, T3]>;
+    static create<T1, T2, T3, T4>(lrMutations: [
+        LrMutationBase<T1> | LrMergedMutation<T1>,
+        LrMutationBase<T2> | LrMergedMutation<T2>,
+        LrMutationBase<T3> | LrMergedMutation<T3>,
+        LrMutationBase<T4> | LrMergedMutation<T4>
+    ]): LrMergedMutation<[T1, T2, T3, T4]>;
+    static create<T1, T2, T3, T4, T5>(lrMutations: [
+        LrMutationBase<T1> | LrMergedMutation<T1>,
+        LrMutationBase<T2> | LrMergedMutation<T2>,
+        LrMutationBase<T3> | LrMergedMutation<T3>,
+        LrMutationBase<T4> | LrMergedMutation<T4>,
+        LrMutationBase<T5> | LrMergedMutation<T5>
+    ]): LrMergedMutation<[T1, T2, T3, T4, T5]>;
     static create<T>(lrMutations: LrMutationBase<T>[]): LrMergedMutation<T[]>;
     static create(lrMutations: LrMutationBase<any>[]): LrMergedMutation<any[]>;
     private getDescendants;

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

@@ -1,7 +1,6 @@
 import { OperationVariables } from '@apollo/client/core';
 import { TypedDocumentNode } from '../../_common/ast';
-import { LrMutationData } from './lr-mutation-base';
-import { LrMutationBase } from './lr-mutation-base';
+import { LrMutationBase, LrMutationData } from './lr-mutation-base';
 export declare class LrMutation<T extends any, TVariables = OperationVariables> extends LrMutationBase<T, TVariables> {
     constructor(options: LrMutationData<T, TVariables>);
     select<TResult>(fragments: TypedDocumentNode<TResult>): LrMutation<TResult, TVariables>;

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,7 +1,7 @@
 import { NgZone } from '@angular/core';
-import { KeyGraphService } from '../../cryptography/key-graph.service';
+import { KeyGraphService } from '../../key/key-graph.service';
+import { TpPasswordResetNode, TpPasswordResetUserNode } from '../types';
 import { ProcessorCallbackParams } from './common-processors.service';
-import { TpPasswordResetUserNode, TpPasswordResetNode } from '../types';
 export declare class TpPasswordResetProcessorService {
     private ngZone;
     private keyGraph;

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

@@ -187,9 +187,9 @@ export interface ContactCardSharedCipherData {
 export interface OtKeyCipherClearJson2 {
     nonce: string;
     initiator: {
-        oneTimePbk: object;
-        pbk: object;
-        sigPbk: object;
+        oneTimePbk: Record<string, JSONObject>;
+        pbk: Record<string, JSONObject>;
+        sigPbk: Record<string, JSONObject>;
         message?: JSONObject;
         contactCard?: ContactCardSharedCipherData;
     };
@@ -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,21 +1,21 @@
 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 { JSONObject, TpPasswordResetUserNode, UserDeleteNode } from '../api/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;
     passIdpParams: PassIdpParams;
     passIdp: JWK.Key;
     passIdpVerifier: JWK.Key;
-    wrappedPassIdpVerifierPrk: object;
+    wrappedPassIdpVerifierPrk: Record<string, JSONObject>;
 }
 export declare class CognitoChallengeUser extends CognitoUser {
     recoveryStatus: RecoveryStatus;
     challengeName: 'SMS_MFA' | 'SOFTWARE_TOKEN_MFA';
-    challengeParam: any;
+    challengeParam: JSONObject;
     isTpPasswordResetUser: boolean;
 }
 export declare enum FeatureAction {

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 { ReplaySubject } 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;
@@ -51,7 +51,7 @@ export declare class LifeReadyAuthService {
     getUser(reload?: boolean): Promise<CurrentUser>;
     private mapTPVaultAccess;
     private loadUser;
-    watchAuth(): Observable<any>;
+    watchAuth(): ReplaySubject<any>;
     logout(): Promise<void>;
     private getUserAttribute;
     loadResetUser(password?: string): Promise<TpPasswordResetUser>;

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 { Category, NewCategory, UpdatedCategory, VaultCategory, VaultRecord, Vault } from './category.types';
-import { KeyGraphService } from '../cryptography/key-graph.service';
+import { KeyGraphService } from '../key/key-graph.service';
+import { KeyMetaService } from '../key/key-meta.service';
+import { Category, NewCategory, UpdatedCategory, Vault, VaultCategory, VaultRecord } from './category.types';
 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/contact-card/contact-card2.service.d.ts

@@ -0,0 +1,64 @@
+import { NgZone } from '@angular/core';
+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;
+    plainCipherDataJson: JSONObject;
+    plainDataJson: MainContactCardPlainFields;
+}
+export interface ContactCardName2 {
+    name: string;
+    title?: string;
+    firstName?: string;
+    lastName?: string;
+}
+export declare class OwnerPlainDataJson {
+    name: ContactCardName2;
+}
+export interface UpdateContactCardInput2 extends CreateContactCardInput2 {
+    id: string;
+    keyId: string;
+}
+export declare class ContactCard2Service {
+    private keyFactory;
+    private keyService;
+    private encryptionService;
+    private keyGraph;
+    private keyMetaService;
+    private ngZone;
+    constructor(keyFactory: KeyFactoryService, keyService: KeyService, encryptionService: EncryptionService, keyGraph: KeyGraphService, keyMetaService: KeyMetaService, ngZone: NgZone);
+    createContactCard(input: CreateContactCardInput2): Promise<LrMutation<import("./contact-card2.gql").CreateContactCardMutationResult, {
+        input: {
+            wrappingKeyId: string;
+            wrappedKey: string;
+            cipherData: string;
+            sigPxkId: string;
+            publicDataSig: string;
+            publicSearchableSig: string;
+            plainDataSig: string;
+        };
+    }>>;
+    updateContactCard(input: UpdateContactCardInput2): Promise<LrMutation<import("./contact-card2.gql").UpdateContactCardMutationResult, {
+        input: {
+            id: string;
+            cipherData: string;
+            sigPxkId: string;
+            publicDataSig: string;
+            publicSearchableSig: string;
+            plainDataSig: string;
+        };
+    }>>;
+    deleteContactCard(id: string): LrMutation<import("./contact-card2.gql").DeleteContactCardMutationResult, {
+        input: {
+            id: string;
+        };
+    }>;
+    private prepareContactCardInput;
+}

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

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import { JWE, JWK } from 'node-jose';
-import { Key, PayloadType } from './cryptography.types';
-import { TimeService } from '../api/time.service';
+import { JSONObject } from '../api/types';
+import { Key, PayloadType } from '../key/key.types';
+import { TimeService } from '../time/time.service';
 export declare enum JoseSerialization {
     JSON = "JSON",
     COMPACT = "COMPACT"
@@ -23,17 +24,17 @@ export declare class EncryptionService {
     private timeService;
     constructor(timeService: TimeService);
     decrypt(key: JWK.Key | Key, // string is assumed to be key.id, will unwrap key.
-    jwe: object | string, // string will be JSON.parsed
+    jwe: Record<string, JSONObject> | string, // string will be JSON.parsed
     options?: DecryptOptions): Promise<JWE.DecryptResult | any>;
-    encryptToString(key: JWK.Key, content: ArrayBuffer | string | object): Promise<string>;
-    encrypt(key: JWK.Key, content: ArrayBuffer | string | object): Promise<any>;
-    sign(key: JWK.Key, content: Buffer | string | object): Promise<any>;
-    signToString(key: JWK.Key, content: Buffer | string | object): Promise<string>;
-    verify(key: JWK.Key, jws: object, options?: VerifyOptions): Promise<any>;
+    encryptToString(key: JWK.Key, content: ArrayBuffer | string | Record<string, JSONObject>): Promise<string>;
+    encrypt(key: JWK.Key, content: ArrayBuffer | string | Record<string, JSONObject>): Promise<any>;
+    sign(key: JWK.Key, content: Buffer | string | Record<string, JSONObject>): Promise<any>;
+    signToString(key: JWK.Key, content: Buffer | string | Record<string, JSONObject>): Promise<string>;
+    verify(key: JWK.Key, jws: Record<string, JSONObject>, options?: VerifyOptions): Promise<any>;
     encryptThenSign({ key, sigPrk, }: {
         key: JWK.Key;
         sigPrk: JWK.Key;
-    }, content: ArrayBuffer | string | object): Promise<{
+    }, content: ArrayBuffer | string | Record<string, JSONObject>): Promise<{
         cipher: string;
         sig: string;
     }>;

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

@@ -1,17 +1,14 @@
 import { HttpClient } from '@angular/common/http';
-import { LifeReadyConfig } from '../life-ready.config';
+import { JSONObject } from '../api/types';
 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;
     constructor(config: LifeReadyConfig, http: HttpClient, lrAuth: LifeReadyAuthService);
-    downloadEncryptedFile(fileStateNodeId: string): Promise<any>;
+    downloadEncryptedFile(fileStateNodeId: string): Promise<JSONObject>;
     downloadEncryptedFile2(fileStateNodeId: string): Promise<string>;
     loadFile(file: File): Promise<ArrayBuffer>;
     uploadEncryptedFile(options: UploadEncryptedFileOptions): Promise<string>;

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,14 +1,14 @@
+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;
+    onTimeout?: (() => void) | (() => Promise<void>) | null;
+    onKeepalive?: (() => void) | (() => Promise<void>) | null;
     idleSec?: number;
     timeoutSec?: number;
     keepAliveIntervalSec?: number;

package/lib/{items2 → item2}/item2.gql.d.ts

@@ -1,5 +1,5 @@
 import { DateTime, ID } from '../api/types';
-export interface CreateDirectoryMutation {
+export interface CreateDirectoryMutationResult {
     createDirectory: {
         directory: {
             id: ID;
@@ -7,8 +7,8 @@ export interface CreateDirectoryMutation {
         };
     };
 }
-export declare const CreateDirectoryMutation: import("../_common/ast").TypedDocumentNode<CreateDirectoryMutation>;
-export interface UpdateDirectoryMutation {
+export declare const CreateDirectoryMutation: import("../_common/ast").TypedDocumentNode<CreateDirectoryMutationResult>;
+export interface UpdateDirectoryMutationResult {
     updateDirectory: {
         directory: {
             id: ID;
@@ -16,29 +16,29 @@ export interface UpdateDirectoryMutation {
         };
     };
 }
-export declare const UpdateDirectoryMutation: import("../_common/ast").TypedDocumentNode<UpdateDirectoryMutation>;
-export interface DeleteDirectoryMutation {
+export declare const UpdateDirectoryMutation: import("../_common/ast").TypedDocumentNode<UpdateDirectoryMutationResult>;
+export interface DeleteDirectoryMutationResult {
     deleteDirectory: {
         id: ID;
     };
 }
-export declare const DeleteDirectoryMutation: import("../_common/ast").TypedDocumentNode<DeleteDirectoryMutation>;
-export interface CreateFileMutation {
+export declare const DeleteDirectoryMutation: import("../_common/ast").TypedDocumentNode<DeleteDirectoryMutationResult>;
+export interface CreateFileMutationResult {
     createFile: {
         file: {
             id: ID;
         };
     };
 }
-export declare const CreateFileMutation: import("../_common/ast").TypedDocumentNode<CreateFileMutation>;
-export interface UpdateFileMutation {
+export declare const CreateFileMutation: import("../_common/ast").TypedDocumentNode<CreateFileMutationResult>;
+export interface UpdateFileMutationResult {
     updateFile: {
         file: {
             id: ID;
         };
     };
 }
-export declare const UpdateFileMutation: import("../_common/ast").TypedDocumentNode<UpdateFileMutation>;
+export declare const UpdateFileMutation: import("../_common/ast").TypedDocumentNode<UpdateFileMutationResult>;
 export interface RevertFileMutationResult {
     revertFile: {
         file: {
@@ -47,28 +47,28 @@ export interface RevertFileMutationResult {
     };
 }
 export declare const RevertFileMutation: import("../_common/ast").TypedDocumentNode<RevertFileMutationResult>;
-export interface DeleteFileMutation {
+export interface DeleteFileMutationResult {
     deleteFile: {
         id: ID;
     };
 }
-export declare const DeleteFileMutation: import("../_common/ast").TypedDocumentNode<DeleteFileMutation>;
-export interface ArchiveDirectoryMutation {
+export declare const DeleteFileMutation: import("../_common/ast").TypedDocumentNode<DeleteFileMutationResult>;
+export interface ArchiveDirectoryMutationResult {
     archiveDirectory: {
         directory: {
             id: ID;
         };
     };
 }
-export declare const ArchiveDirectoryMutation: import("../_common/ast").TypedDocumentNode<ArchiveDirectoryMutation>;
-export interface UnarchiveDirectoryMutation {
+export declare const ArchiveDirectoryMutation: import("../_common/ast").TypedDocumentNode<ArchiveDirectoryMutationResult>;
+export interface UnarchiveDirectoryMutationResult {
     unarchiveDirectory: {
         directory: {
             id: ID;
         };
     };
 }
-export declare const UnarchiveDirectoryMutation: import("../_common/ast").TypedDocumentNode<UnarchiveDirectoryMutation>;
+export declare const UnarchiveDirectoryMutation: import("../_common/ast").TypedDocumentNode<UnarchiveDirectoryMutationResult>;
 export interface ChangeDirectoryParentsMutationResult {
     unarchiveDirectory: {
         directory: {