@nmshd/app-runtime 3.0.4 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/AppConfig.d.ts +2 -0
- package/dist/AppConfig.d.ts.map +1 -1
- package/dist/AppConfig.js +2 -1
- package/dist/AppConfig.js.map +1 -1
- package/dist/AppRuntime.d.ts +2 -2
- package/dist/AppRuntime.d.ts.map +1 -1
- package/dist/AppRuntime.js +10 -10
- package/dist/AppRuntime.js.map +1 -1
- package/dist/AppStringProcessor.d.ts +2 -2
- package/dist/AppStringProcessor.d.ts.map +1 -1
- package/dist/AppStringProcessor.js.map +1 -1
- package/dist/SessionStorage.d.ts +1 -0
- package/dist/SessionStorage.d.ts.map +1 -1
- package/dist/SessionStorage.js +6 -0
- package/dist/SessionStorage.js.map +1 -1
- package/dist/buildInformation.js +5 -5
- package/dist/multiAccount/AccountServices.d.ts +2 -1
- package/dist/multiAccount/AccountServices.d.ts.map +1 -1
- package/dist/multiAccount/AccountServices.js +3 -0
- package/dist/multiAccount/AccountServices.js.map +1 -1
- package/dist/multiAccount/MultiAccountController.d.ts +7 -3
- package/dist/multiAccount/MultiAccountController.d.ts.map +1 -1
- package/dist/multiAccount/MultiAccountController.js +30 -15
- package/dist/multiAccount/MultiAccountController.js.map +1 -1
- package/lib-web/nmshd.app-runtime.js +66 -31
- package/lib-web/nmshd.app-runtime.min.js +1 -1
- package/package.json +6 -6
package/dist/AppConfig.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export interface AppConfig extends RuntimeConfig {
|
|
|
5
5
|
accountsDbName: string;
|
|
6
6
|
applicationId: string;
|
|
7
7
|
applePushEnvironment?: "Development" | "Production";
|
|
8
|
+
allowMultipleAccountsWithSameAddress: boolean;
|
|
8
9
|
}
|
|
9
10
|
export interface AppConfigOverwrite {
|
|
10
11
|
transportLibrary?: Omit<IConfigOverwrite, "supportedIdentityVersion">;
|
|
@@ -12,6 +13,7 @@ export interface AppConfigOverwrite {
|
|
|
12
13
|
accountsDbName?: string;
|
|
13
14
|
applicationId: string;
|
|
14
15
|
applePushEnvironment?: "Development" | "Production";
|
|
16
|
+
allowMultipleAccountsWithSameAddress?: boolean;
|
|
15
17
|
}
|
|
16
18
|
export declare function createAppConfig(...configs: AppConfigOverwrite[]): AppConfig;
|
|
17
19
|
//# sourceMappingURL=AppConfig.d.ts.map
|
package/dist/AppConfig.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppConfig.d.ts","sourceRoot":"","sources":["../src/AppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAG3D,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC5C,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,aAAa,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"AppConfig.d.ts","sourceRoot":"","sources":["../src/AppConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAG3D,MAAM,WAAW,SAAU,SAAQ,aAAa;IAC5C,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,aAAa,GAAG,YAAY,CAAC;IACpD,oCAAoC,EAAE,OAAO,CAAC;CACjD;AAED,MAAM,WAAW,kBAAkB;IAC/B,gBAAgB,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAC;IACtE,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,aAAa,GAAG,YAAY,CAAC;IACpD,oCAAoC,CAAC,EAAE,OAAO,CAAC;CAClD;AAED,wBAAgB,eAAe,CAAC,GAAG,OAAO,EAAE,kBAAkB,EAAE,GAAG,SAAS,CAiF3E"}
|
package/dist/AppConfig.js
CHANGED
|
@@ -77,7 +77,8 @@ function createAppConfig(...configs) {
|
|
|
77
77
|
displayName: "Notification Module",
|
|
78
78
|
location: "@nmshd/runtime:NotificationModule"
|
|
79
79
|
}
|
|
80
|
-
}
|
|
80
|
+
},
|
|
81
|
+
allowMultipleAccountsWithSameAddress: false
|
|
81
82
|
};
|
|
82
83
|
const mergedConfig = (0, lodash_1.defaultsDeep)({}, ...configs, appConfig);
|
|
83
84
|
return mergedConfig;
|
package/dist/AppConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppConfig.js","sourceRoot":"","sources":["../src/AppConfig.ts"],"names":[],"mappings":";;;AACA,gDAA2D;AAC3D,mCAAsC;
|
|
1
|
+
{"version":3,"file":"AppConfig.js","sourceRoot":"","sources":["../src/AppConfig.ts"],"names":[],"mappings":";;;AACA,gDAA2D;AAC3D,mCAAsC;AAmBtC,SAAgB,eAAe,CAAC,GAAG,OAA6B;IAC5D,MAAM,SAAS,GAAG;QACd,cAAc,EAAE,UAAU;QAC1B,gBAAgB,EAAE;YACd,KAAK,EAAE,iBAAK,CAAC,IAAI;YACjB,iBAAiB,EAAE,IAAI;SAC1B;QACD,OAAO,EAAE;YACL,SAAS,EAAE;gBACP,IAAI,EAAE,WAAW;gBACjB,WAAW,EAAE,mBAAmB;gBAChC,QAAQ,EAAE,WAAW;gBACrB,OAAO,EAAE,IAAI;aAChB;YACD,gBAAgB,EAAE;gBACd,IAAI,EAAE,kBAAkB;gBACxB,WAAW,EAAE,0BAA0B;gBACvC,QAAQ,EAAE,kBAAkB;gBAC5B,OAAO,EAAE,IAAI;aAChB;YACD,YAAY,EAAE;gBACV,IAAI,EAAE,cAAc;gBACpB,WAAW,EAAE,sBAAsB;gBACnC,QAAQ,EAAE,cAAc;gBACxB,OAAO,EAAE,IAAI;aAChB;YACD,wBAAwB,EAAE;gBACtB,IAAI,EAAE,0BAA0B;gBAChC,WAAW,EAAE,mCAAmC;gBAChD,QAAQ,EAAE,0BAA0B;gBACpC,OAAO,EAAE,IAAI;aAChB;YACD,eAAe,EAAE;gBACb,IAAI,EAAE,iBAAiB;gBACvB,WAAW,EAAE,yBAAyB;gBACtC,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,IAAI;aAChB;YACD,mBAAmB,EAAE;gBACjB,IAAI,EAAE,qBAAqB;gBAC3B,WAAW,EAAE,6BAA6B;gBAC1C,QAAQ,EAAE,qBAAqB;gBAC/B,OAAO,EAAE,IAAI;aAChB;YACD,6BAA6B,EAAE;gBAC3B,IAAI,EAAE,+BAA+B;gBACrC,WAAW,EAAE,iCAAiC;gBAC9C,QAAQ,EAAE,+BAA+B;gBACzC,OAAO,EAAE,IAAI;aAChB;YACD,OAAO,EAAE;gBACL,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,eAAe;gBACrB,QAAQ,EAAE,8BAA8B;gBACxC,OAAO,EAAE,IAAI;aAChB;YACD,OAAO,EAAE;gBACL,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,eAAe;gBACrB,QAAQ,EAAE,8BAA8B;gBACxC,OAAO,EAAE,IAAI;aAChB;YACD,iBAAiB,EAAE;gBACf,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,yBAAyB;gBAC/B,WAAW,EAAE,oBAAoB;gBACjC,QAAQ,EAAE,wCAAwC;aACrD;YACD,YAAY,EAAE;gBACV,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,oBAAoB;gBAC1B,WAAW,EAAE,qBAAqB;gBAClC,QAAQ,EAAE,mCAAmC;aAChD;SACJ;QACD,oCAAoC,EAAE,KAAK;KAC9C,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,qBAAY,EAAC,EAAE,EAAE,GAAG,OAAO,EAAE,SAAS,CAAC,CAAC;IAE7D,OAAO,YAAY,CAAC;AACxB,CAAC;AAjFD,0CAiFC"}
|
package/dist/AppRuntime.d.ts
CHANGED
|
@@ -7,11 +7,11 @@ import { AccountController, ICoreAddress } from "@nmshd/transport";
|
|
|
7
7
|
import { AppConfig, AppConfigOverwrite } from "./AppConfig";
|
|
8
8
|
import { AppRuntimeServices } from "./AppRuntimeServices";
|
|
9
9
|
import { AppStringProcessor } from "./AppStringProcessor";
|
|
10
|
-
import { UserfriendlyResult } from "./UserfriendlyResult";
|
|
11
10
|
import { IUIBridge } from "./extensibility";
|
|
12
11
|
import { IAppRuntimeModuleConstructor } from "./modules";
|
|
13
12
|
import { AccountServices, LocalAccountDTO, LocalAccountSession, MultiAccountController } from "./multiAccount";
|
|
14
13
|
import { RuntimeNativeBootstrapper, RuntimeNativeEnvironment } from "./runtimeNatives";
|
|
14
|
+
import { UserfriendlyResult } from "./UserfriendlyResult";
|
|
15
15
|
export declare class AppRuntime extends Runtime<AppConfig> {
|
|
16
16
|
private readonly _nativeEnvironment;
|
|
17
17
|
constructor(_nativeEnvironment: RuntimeNativeEnvironment, appConfig: AppConfig);
|
|
@@ -34,7 +34,7 @@ export declare class AppRuntime extends Runtime<AppConfig> {
|
|
|
34
34
|
get stringProcessor(): AppStringProcessor;
|
|
35
35
|
protected login(accountController: AccountController, consumptionController: ConsumptionController): Promise<AppRuntimeServices>;
|
|
36
36
|
getServices(accountReference: string | ICoreAddress): Promise<AppRuntimeServices>;
|
|
37
|
-
selectAccount(accountReference: string
|
|
37
|
+
selectAccount(accountReference: string): Promise<LocalAccountSession>;
|
|
38
38
|
getOrCreateSession(accountReference: string): Promise<LocalAccountSession>;
|
|
39
39
|
private currentSessionPromise;
|
|
40
40
|
private createSession;
|
package/dist/AppRuntime.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppRuntime.d.ts","sourceRoot":"","sources":["../src/AppRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAU,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,
|
|
1
|
+
{"version":3,"file":"AppRuntime.d.ts","sourceRoot":"","sources":["../src/AppRuntime.ts"],"names":[],"mappings":"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"}
|
package/dist/AppRuntime.js
CHANGED
|
@@ -9,12 +9,12 @@ const transport_1 = require("@nmshd/transport");
|
|
|
9
9
|
const AppConfig_1 = require("./AppConfig");
|
|
10
10
|
const AppRuntimeErrors_1 = require("./AppRuntimeErrors");
|
|
11
11
|
const AppStringProcessor_1 = require("./AppStringProcessor");
|
|
12
|
-
const SessionStorage_1 = require("./SessionStorage");
|
|
13
|
-
const UserfriendlyResult_1 = require("./UserfriendlyResult");
|
|
14
12
|
const events_1 = require("./events");
|
|
15
13
|
const extensibility_1 = require("./extensibility");
|
|
16
14
|
const modules_1 = require("./modules");
|
|
17
15
|
const multiAccount_1 = require("./multiAccount");
|
|
16
|
+
const SessionStorage_1 = require("./SessionStorage");
|
|
17
|
+
const UserfriendlyResult_1 = require("./UserfriendlyResult");
|
|
18
18
|
class AppRuntime extends runtime_1.Runtime {
|
|
19
19
|
constructor(_nativeEnvironment, appConfig) {
|
|
20
20
|
super(appConfig, _nativeEnvironment.loggerFactory);
|
|
@@ -85,7 +85,7 @@ class AppRuntime extends runtime_1.Runtime {
|
|
|
85
85
|
dataViewExpander: session.expander
|
|
86
86
|
};
|
|
87
87
|
}
|
|
88
|
-
async selectAccount(accountReference
|
|
88
|
+
async selectAccount(accountReference) {
|
|
89
89
|
const session = await this.getOrCreateSession(accountReference);
|
|
90
90
|
this.sessionStorage.currentSession = session;
|
|
91
91
|
this.eventBus.publish(new events_1.AccountSelectedEvent(session.address, session.account.id));
|
|
@@ -99,7 +99,7 @@ class AppRuntime extends runtime_1.Runtime {
|
|
|
99
99
|
}
|
|
100
100
|
return await this.createSession(accountReference);
|
|
101
101
|
}
|
|
102
|
-
async createSession(accountReference
|
|
102
|
+
async createSession(accountReference) {
|
|
103
103
|
const accountId = accountReference.length === 20 ? accountReference : (await this.multiAccountController.getAccountByAddress(accountReference)).id.toString();
|
|
104
104
|
if (this.currentSessionPromise?.accountId === accountId) {
|
|
105
105
|
return await this.currentSessionPromise.promise;
|
|
@@ -108,9 +108,9 @@ class AppRuntime extends runtime_1.Runtime {
|
|
|
108
108
|
await this.currentSessionPromise.promise.catch(() => {
|
|
109
109
|
// ignore
|
|
110
110
|
});
|
|
111
|
-
return await this.createSession(accountId
|
|
111
|
+
return await this.createSession(accountId);
|
|
112
112
|
}
|
|
113
|
-
this.currentSessionPromise = { promise: this._createSession(accountId
|
|
113
|
+
this.currentSessionPromise = { promise: this._createSession(accountId), accountId };
|
|
114
114
|
try {
|
|
115
115
|
return await this.currentSessionPromise.promise;
|
|
116
116
|
}
|
|
@@ -118,8 +118,8 @@ class AppRuntime extends runtime_1.Runtime {
|
|
|
118
118
|
this.currentSessionPromise = undefined;
|
|
119
119
|
}
|
|
120
120
|
}
|
|
121
|
-
async _createSession(accountId
|
|
122
|
-
const [localAccount, accountController] = await this._multiAccountController.selectAccount(transport_1.CoreId.from(accountId)
|
|
121
|
+
async _createSession(accountId) {
|
|
122
|
+
const [localAccount, accountController] = await this._multiAccountController.selectAccount(transport_1.CoreId.from(accountId));
|
|
123
123
|
if (!localAccount.address) {
|
|
124
124
|
throw AppRuntimeErrors_1.AppRuntimeErrors.general.addressUnavailable().logWith(this.logger);
|
|
125
125
|
}
|
|
@@ -147,7 +147,7 @@ class AppRuntime extends runtime_1.Runtime {
|
|
|
147
147
|
return UserfriendlyResult_1.UserfriendlyResult.fail(AppRuntimeErrors_1.AppRuntimeErrors.general.noAccountAvailable(accountSelectionResult.error));
|
|
148
148
|
}
|
|
149
149
|
if (accountSelectionResult.value)
|
|
150
|
-
await this.selectAccount(accountSelectionResult.value.id
|
|
150
|
+
await this.selectAccount(accountSelectionResult.value.id);
|
|
151
151
|
return UserfriendlyResult_1.UserfriendlyResult.ok(accountSelectionResult.value);
|
|
152
152
|
}
|
|
153
153
|
async selectRelationship(id) {
|
|
@@ -170,7 +170,7 @@ class AppRuntime extends runtime_1.Runtime {
|
|
|
170
170
|
return Promise.resolve(health);
|
|
171
171
|
}
|
|
172
172
|
async initAccount() {
|
|
173
|
-
this._multiAccountController = new multiAccount_1.MultiAccountController(this.transport, this.runtimeConfig);
|
|
173
|
+
this._multiAccountController = new multiAccount_1.MultiAccountController(this.transport, this.runtimeConfig, this.lokiConnection, this.sessionStorage);
|
|
174
174
|
await this._multiAccountController.init();
|
|
175
175
|
this._accountServices = new multiAccount_1.AccountServices(this._multiAccountController);
|
|
176
176
|
}
|
package/dist/AppRuntime.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppRuntime.js","sourceRoot":"","sources":["../src/AppRuntime.ts"],"names":[],"mappings":";;;AACA,kEAA8D;AAE9D,gDAA2C;AAC3C,oDAA2D;AAC3D,4CAA6E;AAC7E,gDAA2E;AAC3E,2CAA6E;AAC7E,yDAAsD;AAEtD,6DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"AppRuntime.js","sourceRoot":"","sources":["../src/AppRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import { EventBus, Result } from "@js-soft/ts-utils";
|
|
|
3
3
|
import { AnonymousServices } from "@nmshd/runtime";
|
|
4
4
|
import { ICoreAddress } from "@nmshd/transport";
|
|
5
5
|
import { AppRuntimeServices } from "./AppRuntimeServices";
|
|
6
|
-
import { UserfriendlyResult } from "./UserfriendlyResult";
|
|
7
6
|
import { IUIBridge } from "./extensibility";
|
|
8
|
-
import { LocalAccountDTO } from "./multiAccount
|
|
7
|
+
import { LocalAccountDTO } from "./multiAccount";
|
|
8
|
+
import { UserfriendlyResult } from "./UserfriendlyResult";
|
|
9
9
|
export declare class AppStringProcessor {
|
|
10
10
|
protected readonly runtime: {
|
|
11
11
|
get anonymousServices(): AnonymousServices;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppStringProcessor.d.ts","sourceRoot":"","sources":["../src/AppStringProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAmC,MAAM,gBAAgB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAkC,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"AppStringProcessor.d.ts","sourceRoot":"","sources":["../src/AppStringProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAmC,MAAM,gBAAgB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAkC,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,kBAAkB;IAIvB,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE;QACxB,IAAI,iBAAiB,IAAI,iBAAiB,CAAC;QAC3C,uBAAuB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC;QACxH,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAC/B,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAClF,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAClE,IAAI,QAAQ,IAAI,QAAQ,CAAC;KAC5B;IAVL,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;gBAGV,OAAO,EAAE;QACxB,IAAI,iBAAiB,IAAI,iBAAiB,CAAC;QAC3C,uBAAuB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC;QACxH,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;QAC/B,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAClF,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAClE,IAAI,QAAQ,IAAI,QAAQ,CAAC;KAC5B,EACD,aAAa,EAAE,cAAc;IAKpB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAWrF,yBAAyB,CAAC,kBAAkB,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;YA0DlH,yBAAyB;IAyCvC,OAAO,CAAC,iBAAiB;CAQ5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppStringProcessor.js","sourceRoot":"","sources":["../src/AppStringProcessor.ts"],"names":[],"mappings":";;;AACA,kDAAkD;AAElD,4CAAoF;AACpF,gDAAgF;AAChF,yDAAsD;
|
|
1
|
+
{"version":3,"file":"AppStringProcessor.js","sourceRoot":"","sources":["../src/AppStringProcessor.ts"],"names":[],"mappings":"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"}
|
package/dist/SessionStorage.d.ts
CHANGED
|
@@ -7,5 +7,6 @@ export declare class SessionStorage {
|
|
|
7
7
|
getSessions(): LocalAccountSession[];
|
|
8
8
|
findSession(accountReference: string): LocalAccountSession | undefined;
|
|
9
9
|
addSession(session: LocalAccountSession): void;
|
|
10
|
+
removeSession(accountReference: string): void;
|
|
10
11
|
}
|
|
11
12
|
//# sourceMappingURL=SessionStorage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionStorage.d.ts","sourceRoot":"","sources":["../src/SessionStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAChE,OAAO,CAAC,eAAe,CAAC,CAAsB;IAE9C,IAAW,cAAc,CAAC,OAAO,EAAE,mBAAmB,EAErD;IAED,IAAW,cAAc,IAAI,mBAAmB,CAK/C;IAEM,WAAW,IAAI,mBAAmB,EAAE;IAIpC,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAItE,UAAU,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"SessionStorage.d.ts","sourceRoot":"","sources":["../src/SessionStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAChE,OAAO,CAAC,eAAe,CAAC,CAAsB;IAE9C,IAAW,cAAc,CAAC,OAAO,EAAE,mBAAmB,EAErD;IAED,IAAW,cAAc,IAAI,mBAAmB,CAK/C;IAEM,WAAW,IAAI,mBAAmB,EAAE;IAIpC,WAAW,CAAC,gBAAgB,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAItE,UAAU,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAM9C,aAAa,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI;CAMvD"}
|
package/dist/SessionStorage.js
CHANGED
|
@@ -26,6 +26,12 @@ class SessionStorage {
|
|
|
26
26
|
throw new Error("Session already exists");
|
|
27
27
|
this._availableSessions.push(session);
|
|
28
28
|
}
|
|
29
|
+
removeSession(accountReference) {
|
|
30
|
+
const session = this.findSession(accountReference);
|
|
31
|
+
if (!session)
|
|
32
|
+
return;
|
|
33
|
+
this._availableSessions.splice(this._availableSessions.indexOf(session), 1);
|
|
34
|
+
}
|
|
29
35
|
}
|
|
30
36
|
exports.SessionStorage = SessionStorage;
|
|
31
37
|
//# sourceMappingURL=SessionStorage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionStorage.js","sourceRoot":"","sources":["../src/SessionStorage.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AAGtD,MAAa,cAAc;IAA3B;QACqB,uBAAkB,GAA0B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SessionStorage.js","sourceRoot":"","sources":["../src/SessionStorage.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AAGtD,MAAa,cAAc;IAA3B;QACqB,uBAAkB,GAA0B,EAAE,CAAC;IAkCpE,CAAC;IA/BG,IAAW,cAAc,CAAC,OAA4B;QAClD,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;IACnC,CAAC;IAED,IAAW,cAAc;QACrB,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YACxB,MAAM,mCAAgB,CAAC,OAAO,CAAC,yBAAyB,EAAE,CAAC;QAC/D,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAEM,WAAW,CAAC,gBAAwB;QACvC,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,gBAAgB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,gBAAgB,CAAC,CAAC;IACrI,CAAC;IAEM,UAAU,CAAC,OAA4B;QAC1C,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAEpF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAEM,aAAa,CAAC,gBAAwB;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAChF,CAAC;CACJ;AAnCD,wCAmCC"}
|
package/dist/buildInformation.js
CHANGED
|
@@ -8,11 +8,11 @@ const crypto_1 = require("@nmshd/crypto");
|
|
|
8
8
|
const runtime_1 = require("@nmshd/runtime");
|
|
9
9
|
const transport_1 = require("@nmshd/transport");
|
|
10
10
|
exports.buildInformation = {
|
|
11
|
-
version: "3.0
|
|
12
|
-
build: "
|
|
13
|
-
date: "2024-
|
|
14
|
-
commit: "
|
|
15
|
-
dependencies: {"@js-soft/docdb-access-loki":"^1.0
|
|
11
|
+
version: "3.1.0",
|
|
12
|
+
build: "64",
|
|
13
|
+
date: "2024-04-08T14:18:55+00:00",
|
|
14
|
+
commit: "2c9d6dbb7fd529de72e9693b07ad44c49073c795",
|
|
15
|
+
dependencies: {"@js-soft/docdb-access-loki":"^1.1.0","@js-soft/native-abstractions":"^1.2.2","lodash":"^4.17.21"},
|
|
16
16
|
libraries: {
|
|
17
17
|
serval: ts_serval_1.buildInformation,
|
|
18
18
|
crypto: crypto_1.buildInformation,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DeviceOnboardingInfoDTO } from "@nmshd/runtime";
|
|
2
2
|
import { Realm } from "@nmshd/transport";
|
|
3
|
-
import { MultiAccountController } from "./MultiAccountController";
|
|
4
3
|
import { LocalAccountDTO } from "./data/LocalAccountDTO";
|
|
4
|
+
import { MultiAccountController } from "./MultiAccountController";
|
|
5
5
|
export declare class AccountServices {
|
|
6
6
|
protected readonly multiAccountController: MultiAccountController;
|
|
7
7
|
constructor(multiAccountController: MultiAccountController);
|
|
@@ -9,6 +9,7 @@ export declare class AccountServices {
|
|
|
9
9
|
onboardAccount(onboardingInfo: DeviceOnboardingInfoDTO): Promise<LocalAccountDTO>;
|
|
10
10
|
getAccounts(): Promise<LocalAccountDTO[]>;
|
|
11
11
|
getAccount(id: string): Promise<LocalAccountDTO>;
|
|
12
|
+
deleteAccount(id: string): Promise<void>;
|
|
12
13
|
getAccountByAddress(address: string): Promise<LocalAccountDTO>;
|
|
13
14
|
clearAccounts(): Promise<void>;
|
|
14
15
|
renameAccount(localAccountId: string, newAccountName: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountServices.d.ts","sourceRoot":"","sources":["../../src/multiAccount/AccountServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAU,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AccountServices.d.ts","sourceRoot":"","sources":["../../src/multiAccount/AccountServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAU,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,qBAAa,eAAe;IACL,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,sBAAsB;gBAA9C,sBAAsB,EAAE,sBAAsB;IAEvE,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAUnE,cAAc,CAAC,cAAc,EAAE,uBAAuB,GAAG,OAAO,CAAC,eAAe,CAAC;IAMjF,WAAW,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAKzC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAKhD,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAK9D,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG5F"}
|
|
@@ -30,6 +30,9 @@ class AccountServices {
|
|
|
30
30
|
const localAccount = await this.multiAccountController.getAccount(transport_1.CoreId.from(id));
|
|
31
31
|
return LocalAccountMapper_1.LocalAccountMapper.toLocalAccountDTO(localAccount);
|
|
32
32
|
}
|
|
33
|
+
async deleteAccount(id) {
|
|
34
|
+
await this.multiAccountController.deleteAccount(transport_1.CoreId.from(id));
|
|
35
|
+
}
|
|
33
36
|
async getAccountByAddress(address) {
|
|
34
37
|
const localAccount = await this.multiAccountController.getAccountByAddress(address);
|
|
35
38
|
return LocalAccountMapper_1.LocalAccountMapper.toLocalAccountDTO(localAccount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountServices.js","sourceRoot":"","sources":["../../src/multiAccount/AccountServices.ts"],"names":[],"mappings":";;;AAAA,4CAAuE;AACvE,gDAAiD;AACjD,0DAAuD;
|
|
1
|
+
{"version":3,"file":"AccountServices.js","sourceRoot":"","sources":["../../src/multiAccount/AccountServices.ts"],"names":[],"mappings":";;;AAAA,4CAAuE;AACvE,gDAAiD;AACjD,0DAAuD;AAEvD,kEAA+D;AAG/D,MAAa,eAAe;IACxB,YAAsC,sBAA8C;QAA9C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAAG,CAAC;IAEjF,KAAK,CAAC,aAAa,CAAC,KAAY,EAAE,IAAY;QACjD,uEAAuE;QACvE,IAAI,KAAK,KAAK,iBAAK,CAAC,GAAG,IAAI,KAAK,KAAK,iBAAK,CAAC,IAAI,IAAI,KAAK,KAAK,iBAAK,CAAC,KAAK,EAAE,CAAC;YACvE,MAAM,mCAAgB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpF,OAAO,uCAAkB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,cAAuC;QAC/D,MAAM,YAAY,GAAG,sBAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QACvE,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACrF,OAAO,uCAAkB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,WAAW;QACpB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,CAAC;QACtE,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,uCAAkB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IACzF,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,EAAU;QAC9B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,kBAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACnF,OAAO,uCAAkB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,EAAU;QACjC,MAAM,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,kBAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAe;QAC5C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACpF,OAAO,uCAAkB,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,aAAa;QACtB,MAAM,IAAI,CAAC,sBAAsB,CAAC,aAAa,EAAE,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,cAAsB,EAAE,cAAsB;QACrE,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,kBAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,CAAC;IACtG,CAAC;CACJ;AA7CD,0CA6CC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
import { LokiJsConnection } from "@js-soft/docdb-access-loki";
|
|
1
2
|
import { AccountController, CoreId, DeviceSharedSecret, Realm, Transport } from "@nmshd/transport";
|
|
2
3
|
import { AppConfig } from "../AppConfig";
|
|
4
|
+
import { SessionStorage } from "../SessionStorage";
|
|
3
5
|
import { LocalAccount } from "./data/LocalAccount";
|
|
4
6
|
export declare class MultiAccountController {
|
|
5
7
|
private readonly config;
|
|
8
|
+
private readonly databaseConnection;
|
|
9
|
+
private readonly sessionStorage;
|
|
6
10
|
private readonly _log;
|
|
7
11
|
private _localAccounts;
|
|
8
12
|
private _db?;
|
|
@@ -11,15 +15,15 @@ export declare class MultiAccountController {
|
|
|
11
15
|
get transport(): Transport;
|
|
12
16
|
private readonly _path;
|
|
13
17
|
get path(): string;
|
|
14
|
-
constructor(transport: Transport, config: AppConfig);
|
|
18
|
+
constructor(transport: Transport, config: AppConfig, databaseConnection: LokiJsConnection, sessionStorage: SessionStorage);
|
|
15
19
|
init(): Promise<MultiAccountController>;
|
|
16
20
|
close(): Promise<void>;
|
|
17
21
|
private readonly _openAccounts;
|
|
18
|
-
get openAccounts(): AccountController[];
|
|
19
22
|
getAccount(id: CoreId): Promise<LocalAccount>;
|
|
20
23
|
getAccountByAddress(address: string): Promise<LocalAccount>;
|
|
21
24
|
getAccounts(): Promise<LocalAccount[]>;
|
|
22
|
-
selectAccount(id: CoreId
|
|
25
|
+
selectAccount(id: CoreId): Promise<[LocalAccount, AccountController]>;
|
|
26
|
+
deleteAccount(id: CoreId): Promise<void>;
|
|
23
27
|
clearAccounts(): Promise<void>;
|
|
24
28
|
closeAccounts(): Promise<void>;
|
|
25
29
|
onboardDevice(deviceSharedSecret: DeviceSharedSecret): Promise<[LocalAccount, AccountController]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiAccountController.d.ts","sourceRoot":"","sources":["../../src/multiAccount/MultiAccountController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MultiAccountController.d.ts","sourceRoot":"","sources":["../../src/multiAccount/MultiAccountController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EACH,iBAAiB,EAIjB,MAAM,EACN,kBAAkB,EAClB,KAAK,EACL,SAAS,EAGZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,qBAAa,sBAAsB;IAoB3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,cAAc;IArBnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAE/B,OAAO,CAAC,cAAc,CAAsB;IAE5C,OAAO,CAAC,GAAG,CAAC,CAA8B;IAC1C,SAAS,CAAC,SAAS,UAAS;IAE5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,IAAW,SAAS,IAAI,SAAS,CAEhC;IAED,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,IAAW,IAAI,IAAI,MAAM,CAExB;gBAGG,SAAS,EAAE,SAAS,EACH,MAAM,EAAE,SAAS,EACjB,kBAAkB,EAAE,gBAAgB,EACpC,cAAc,EAAE,cAAc;IAMtC,IAAI,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAUvC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAWnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqD;IAEtE,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAS7C,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAS3D,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAKtC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IA+BrE,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAaxC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAwCjG,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;YA8BpF,yBAAyB;IAc1B,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa3D,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAWtE"}
|
|
@@ -10,10 +10,12 @@ class MultiAccountController {
|
|
|
10
10
|
get path() {
|
|
11
11
|
return this._path;
|
|
12
12
|
}
|
|
13
|
-
constructor(transport, config) {
|
|
13
|
+
constructor(transport, config, databaseConnection, sessionStorage) {
|
|
14
14
|
this.config = config;
|
|
15
|
+
this.databaseConnection = databaseConnection;
|
|
16
|
+
this.sessionStorage = sessionStorage;
|
|
15
17
|
this._dbClosed = false;
|
|
16
|
-
this._openAccounts =
|
|
18
|
+
this._openAccounts = {};
|
|
17
19
|
this._transport = transport;
|
|
18
20
|
this._log = transport_1.TransportLoggerFactory.getLogger(MultiAccountController);
|
|
19
21
|
}
|
|
@@ -33,9 +35,6 @@ class MultiAccountController {
|
|
|
33
35
|
this._dbClosed = true;
|
|
34
36
|
}
|
|
35
37
|
}
|
|
36
|
-
get openAccounts() {
|
|
37
|
-
return this._openAccounts;
|
|
38
|
-
}
|
|
39
38
|
async getAccount(id) {
|
|
40
39
|
const dbAccount = await this._localAccounts.read(id.toString());
|
|
41
40
|
if (!dbAccount) {
|
|
@@ -54,13 +53,16 @@ class MultiAccountController {
|
|
|
54
53
|
const dbAccounts = await this._localAccounts.list();
|
|
55
54
|
return dbAccounts.map((account) => LocalAccount_1.LocalAccount.from(account));
|
|
56
55
|
}
|
|
57
|
-
async selectAccount(id
|
|
56
|
+
async selectAccount(id) {
|
|
58
57
|
this._log.trace(`Selecting LocalAccount with id ${id}...`);
|
|
59
58
|
const account = await this._localAccounts.read(id.toString());
|
|
60
59
|
if (!account) {
|
|
61
60
|
throw transport_1.CoreErrors.general.recordNotFound(LocalAccount_1.LocalAccount, id.toString()).logWith(this._log);
|
|
62
61
|
}
|
|
63
62
|
let localAccount = LocalAccount_1.LocalAccount.from(account);
|
|
63
|
+
if (this._openAccounts[localAccount.id.toString()]) {
|
|
64
|
+
return [localAccount, this._openAccounts[localAccount.id.toString()]];
|
|
65
|
+
}
|
|
64
66
|
this._log.trace(`Opening DB for account ${localAccount.id}...`);
|
|
65
67
|
const db = await this.transport.createDatabase(`acc-${localAccount.id.toString()}`);
|
|
66
68
|
this._log.trace(`DB for account ${id} opened.`);
|
|
@@ -68,26 +70,39 @@ class MultiAccountController {
|
|
|
68
70
|
const accountController = new transport_1.AccountController(this.transport, db, this.transport.config);
|
|
69
71
|
await accountController.init();
|
|
70
72
|
this._log.trace(`AccountController for local account ${id} initialized.`);
|
|
71
|
-
this._openAccounts.
|
|
73
|
+
this._openAccounts[localAccount.id.toString()] = accountController;
|
|
72
74
|
if (!localAccount.address) {
|
|
73
75
|
// Update address after first login if not set already
|
|
74
76
|
localAccount = await this.updateLocalAccountAddress(localAccount.id, accountController.identity.address);
|
|
75
77
|
}
|
|
76
78
|
return [localAccount, accountController];
|
|
77
79
|
}
|
|
80
|
+
async deleteAccount(id) {
|
|
81
|
+
const [localAccount, accountController] = await this.selectAccount(id);
|
|
82
|
+
await accountController.unregisterPushNotificationToken();
|
|
83
|
+
await accountController.activeDevice.markAsOffboarded();
|
|
84
|
+
await accountController.close();
|
|
85
|
+
delete this._openAccounts[localAccount.id.toString()];
|
|
86
|
+
await this.databaseConnection.deleteDatabase(`acc-${id.toString()}`);
|
|
87
|
+
await this._localAccounts.delete({ id: id.toString() });
|
|
88
|
+
this.sessionStorage.removeSession(id.toString());
|
|
89
|
+
}
|
|
78
90
|
async clearAccounts() {
|
|
79
91
|
await this._localAccounts.delete({});
|
|
80
92
|
}
|
|
81
93
|
async closeAccounts() {
|
|
82
|
-
for (
|
|
83
|
-
|
|
84
|
-
await account.close();
|
|
94
|
+
for (const account of Object.values(this._openAccounts)) {
|
|
95
|
+
await account?.close();
|
|
85
96
|
}
|
|
86
97
|
}
|
|
87
98
|
async onboardDevice(deviceSharedSecret) {
|
|
99
|
+
const existingAccounts = await this._localAccounts.find({ address: deviceSharedSecret.identity.address.toString() });
|
|
100
|
+
if (existingAccounts.length > 0 && !this.config.allowMultipleAccountsWithSameAddress) {
|
|
101
|
+
throw new transport_1.CoreError("error.app-runtime.onboardedAccountAlreadyExists", `An account with the address '${deviceSharedSecret.identity.address.toString()}' already exists in this app-runtime instance.`).logWith(this._log);
|
|
102
|
+
}
|
|
88
103
|
this._log.trace(`Onboarding device ${deviceSharedSecret.id} for identity ${deviceSharedSecret.identity.address}...`);
|
|
89
104
|
const id = await transport_1.CoreId.generate();
|
|
90
|
-
|
|
105
|
+
const localAccount = LocalAccount_1.LocalAccount.from({
|
|
91
106
|
id,
|
|
92
107
|
address: deviceSharedSecret.identity.address,
|
|
93
108
|
directory: ".",
|
|
@@ -104,9 +119,9 @@ class MultiAccountController {
|
|
|
104
119
|
const accountController = new transport_1.AccountController(this.transport, db, this.transport.config);
|
|
105
120
|
await accountController.init(deviceSharedSecret);
|
|
106
121
|
this._log.trace(`AccountController for local account ${id} initialized.`);
|
|
107
|
-
this._openAccounts.
|
|
108
|
-
|
|
109
|
-
return [
|
|
122
|
+
this._openAccounts[id.toString()] = accountController;
|
|
123
|
+
const updatedLocalAccount = await this.updateLocalAccountAddress(localAccount.id, accountController.identity.address);
|
|
124
|
+
return [updatedLocalAccount, accountController];
|
|
110
125
|
}
|
|
111
126
|
async createAccount(realm, name) {
|
|
112
127
|
this._log.trace(`Creating account for realm ${realm}.`);
|
|
@@ -127,7 +142,7 @@ class MultiAccountController {
|
|
|
127
142
|
const accountController = new transport_1.AccountController(this.transport, db, this.transport.config);
|
|
128
143
|
await accountController.init();
|
|
129
144
|
this._log.trace(`AccountController for local account ${id} initialized.`);
|
|
130
|
-
this._openAccounts.
|
|
145
|
+
this._openAccounts[id.toString()] = accountController;
|
|
131
146
|
localAccount = await this.updateLocalAccountAddress(localAccount.id, accountController.identity.address);
|
|
132
147
|
return [localAccount, accountController];
|
|
133
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiAccountController.js","sourceRoot":"","sources":["../../src/multiAccount/MultiAccountController.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"MultiAccountController.js","sourceRoot":"","sources":["../../src/multiAccount/MultiAccountController.ts"],"names":[],"mappings":"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"}
|