@futo-org/backups-orchestrator-api 0.24.0 → 0.26.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/backends/local.backend.js +12 -0
- package/dist/backends/local.backend.js.map +1 -1
- package/dist/backends/yucca.backend.d.ts +0 -15
- package/dist/backends/yucca.backend.js +3 -22
- package/dist/backends/yucca.backend.js.map +1 -1
- package/dist/const.d.ts +1 -1
- package/dist/const.js +1 -1
- package/dist/const.js.map +1 -1
- package/dist/dto/repository.dto.d.ts +3 -0
- package/dist/dto/repository.dto.js +17 -0
- package/dist/dto/repository.dto.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/moduleConfig.d.ts +1 -1
- package/dist/orchestrationApi.module.d.ts +1 -1
- package/dist/orchestrationApi.module.js +2 -0
- package/dist/orchestrationApi.module.js.map +1 -1
- package/dist/repositories/config.repository.d.ts +8 -1
- package/dist/repositories/config.repository.js +10 -3
- package/dist/repositories/config.repository.js.map +1 -1
- package/dist/repositories/repository.repository.d.ts +2 -0
- package/dist/repositories/repository.repository.js +6 -0
- package/dist/repositories/repository.repository.js.map +1 -1
- package/dist/repositories/restic.repository.d.ts +13 -13
- package/dist/repositories/restic.repository.js +38 -24
- package/dist/repositories/restic.repository.js.map +1 -1
- package/dist/schema/migrations/20260729130000-AddRepositoryPlacement.d.ts +3 -0
- package/dist/schema/migrations/20260729130000-AddRepositoryPlacement.js +13 -0
- package/dist/schema/migrations/20260729130000-AddRepositoryPlacement.js.map +1 -0
- package/dist/schema/tables/backend.table.d.ts +0 -1
- package/dist/schema/tables/backend.table.js.map +1 -1
- package/dist/schema/tables/repository.table.d.ts +2 -0
- package/dist/schema/tables/repository.table.js +2 -0
- package/dist/schema/tables/repository.table.js.map +1 -1
- package/dist/services/auth.service.d.ts +5 -1
- package/dist/services/auth.service.js +57 -9
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/repository.service.js +71 -40
- package/dist/services/repository.service.js.map +1 -1
- package/dist/utils/connectionsMath.d.ts +2 -0
- package/dist/utils/connectionsMath.js +131 -0
- package/dist/utils/connectionsMath.js.map +1 -0
- package/dist/wellKnown.d.ts +79 -0
- package/dist/wellKnown.js +163 -0
- package/dist/wellKnown.js.map +1 -0
- package/package.json +3 -2
|
@@ -19,17 +19,20 @@ let ResticRepository = class ResticRepository {
|
|
|
19
19
|
constructor(config) {
|
|
20
20
|
this.config = config;
|
|
21
21
|
}
|
|
22
|
-
async init(repository, key) {
|
|
22
|
+
async init(repository, key, placement) {
|
|
23
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
23
24
|
await (0, restic_wrapper_1.init)()
|
|
24
|
-
.option(`rest.connections=${
|
|
25
|
+
.option(`rest.connections=${connections}`)
|
|
25
26
|
.repository(repository)
|
|
26
27
|
.password(Buffer.from(key).toString('hex'))
|
|
27
28
|
.run();
|
|
28
29
|
}
|
|
29
|
-
async backup(repository, key, paths, logStream, signal, tags = []) {
|
|
30
|
+
async backup(repository, key, placement, paths, logStream, signal, tags = []) {
|
|
30
31
|
const write = (0, restic_1.createSampledLogWriter)(logStream);
|
|
32
|
+
const { connections, packSizeMib } = await this.config.getResticOptions(placement);
|
|
31
33
|
return await (0, restic_wrapper_1.backup)()
|
|
32
|
-
.option(`rest.connections=${
|
|
34
|
+
.option(`rest.connections=${connections}`)
|
|
35
|
+
.packSize(packSizeMib)
|
|
33
36
|
.repository(repository)
|
|
34
37
|
.password(Buffer.from(key).toString('hex'))
|
|
35
38
|
.tag(...tags)
|
|
@@ -38,10 +41,11 @@ let ResticRepository = class ResticRepository {
|
|
|
38
41
|
.on('event', write)
|
|
39
42
|
.run();
|
|
40
43
|
}
|
|
41
|
-
async restore(repository, key, snapshotId, { include, target }, logStream, signal) {
|
|
44
|
+
async restore(repository, key, placement, snapshotId, { include, target }, logStream, signal) {
|
|
42
45
|
const write = (0, restic_1.createSampledLogWriter)(logStream);
|
|
46
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
43
47
|
let command = (0, restic_wrapper_1.restore)()
|
|
44
|
-
.option(`rest.connections=${
|
|
48
|
+
.option(`rest.connections=${connections}`)
|
|
45
49
|
.repository(repository)
|
|
46
50
|
.password(Buffer.from(key).toString('hex'))
|
|
47
51
|
.snapshot(snapshotId)
|
|
@@ -53,41 +57,46 @@ let ResticRepository = class ResticRepository {
|
|
|
53
57
|
}
|
|
54
58
|
return await command.run();
|
|
55
59
|
}
|
|
56
|
-
async ls(repository, key, snapshotId, path) {
|
|
60
|
+
async ls(repository, key, placement, snapshotId, path) {
|
|
61
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
57
62
|
return await (0, restic_wrapper_1.ls)()
|
|
58
|
-
.option(`rest.connections=${
|
|
63
|
+
.option(`rest.connections=${connections}`)
|
|
59
64
|
.repository(repository)
|
|
60
65
|
.password(Buffer.from(key).toString('hex'))
|
|
61
66
|
.snapshot(snapshotId)
|
|
62
67
|
.directory(path)
|
|
63
68
|
.run();
|
|
64
69
|
}
|
|
65
|
-
async stats(repository, key) {
|
|
70
|
+
async stats(repository, key, placement) {
|
|
71
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
66
72
|
return await (0, restic_wrapper_1.stats)()
|
|
67
|
-
.option(`rest.connections=${
|
|
73
|
+
.option(`rest.connections=${connections}`)
|
|
68
74
|
.repository(repository)
|
|
69
75
|
.password(Buffer.from(key).toString('hex'))
|
|
70
76
|
.modeRawData()
|
|
71
77
|
.run();
|
|
72
78
|
}
|
|
73
|
-
async snapshots(repository, key) {
|
|
79
|
+
async snapshots(repository, key, placement) {
|
|
80
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
74
81
|
return await (0, restic_wrapper_1.snapshots)()
|
|
75
|
-
.option(`rest.connections=${
|
|
82
|
+
.option(`rest.connections=${connections}`)
|
|
76
83
|
.repository(repository)
|
|
77
84
|
.password(Buffer.from(key).toString('hex'))
|
|
78
85
|
.run();
|
|
79
86
|
}
|
|
80
|
-
async snapshot(repository, key, snapshotId) {
|
|
87
|
+
async snapshot(repository, key, placement, snapshotId) {
|
|
88
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
81
89
|
return await (0, restic_wrapper_1.snapshots)()
|
|
82
|
-
.option(`rest.connections=${
|
|
90
|
+
.option(`rest.connections=${connections}`)
|
|
83
91
|
.repository(repository)
|
|
84
92
|
.password(Buffer.from(key).toString('hex'))
|
|
85
93
|
.snapshot(snapshotId)
|
|
86
94
|
.run();
|
|
87
95
|
}
|
|
88
|
-
async forget(repository, key, snapshotId, prune = true, signal) {
|
|
96
|
+
async forget(repository, key, placement, snapshotId, prune = true, signal) {
|
|
97
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
89
98
|
return await (0, restic_wrapper_1.forget)()
|
|
90
|
-
.option(`rest.connections=${
|
|
99
|
+
.option(`rest.connections=${connections}`)
|
|
91
100
|
.repository(repository)
|
|
92
101
|
.password(Buffer.from(key).toString('hex'))
|
|
93
102
|
.snapshot(snapshotId)
|
|
@@ -95,9 +104,10 @@ let ResticRepository = class ResticRepository {
|
|
|
95
104
|
.signal(signal)
|
|
96
105
|
.run();
|
|
97
106
|
}
|
|
98
|
-
async forgetByPolicy(repository, key, policy, signal) {
|
|
107
|
+
async forgetByPolicy(repository, key, placement, policy, signal) {
|
|
108
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
99
109
|
return await (0, restic_wrapper_1.forget)()
|
|
100
|
-
.option(`rest.connections=${
|
|
110
|
+
.option(`rest.connections=${connections}`)
|
|
101
111
|
.repository(repository)
|
|
102
112
|
.password(Buffer.from(key).toString('hex'))
|
|
103
113
|
.signal(signal)
|
|
@@ -110,24 +120,28 @@ let ResticRepository = class ResticRepository {
|
|
|
110
120
|
.keepWithinYearly(policy.keepWithinYearly)
|
|
111
121
|
.run();
|
|
112
122
|
}
|
|
113
|
-
async prune(repository, key, signal) {
|
|
123
|
+
async prune(repository, key, placement, signal) {
|
|
124
|
+
const { connections, packSizeMib } = await this.config.getResticOptions(placement);
|
|
114
125
|
return await (0, restic_wrapper_1.prune)()
|
|
115
|
-
.option(`rest.connections=${
|
|
126
|
+
.option(`rest.connections=${connections}`)
|
|
127
|
+
.packSize(packSizeMib)
|
|
116
128
|
.repository(repository)
|
|
117
129
|
.password(Buffer.from(key).toString('hex'))
|
|
118
130
|
.signal(signal)
|
|
119
131
|
.run();
|
|
120
132
|
}
|
|
121
|
-
async keyList(repository, key) {
|
|
133
|
+
async keyList(repository, key, placement) {
|
|
134
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
122
135
|
return await (0, restic_wrapper_1.keyList)()
|
|
123
|
-
.option(`rest.connections=${
|
|
136
|
+
.option(`rest.connections=${connections}`)
|
|
124
137
|
.repository(repository)
|
|
125
138
|
.password(Buffer.from(key).toString('hex'))
|
|
126
139
|
.run();
|
|
127
140
|
}
|
|
128
|
-
async unlockAll(repository, key) {
|
|
141
|
+
async unlockAll(repository, key, placement) {
|
|
142
|
+
const { connections } = await this.config.getResticOptions(placement);
|
|
129
143
|
return await (0, restic_wrapper_1.unlock)()
|
|
130
|
-
.option(`rest.connections=${
|
|
144
|
+
.option(`rest.connections=${connections}`)
|
|
131
145
|
.removeAll()
|
|
132
146
|
.repository(repository)
|
|
133
147
|
.password(Buffer.from(key).toString('hex'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restic.repository.js","sourceRoot":"","sources":["../../src/repositories/restic.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAAuH;AACvH,2CAA4C;AAG5C,4CAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"restic.repository.js","sourceRoot":"","sources":["../../src/repositories/restic.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.up = up;
|
|
4
|
+
exports.down = down;
|
|
5
|
+
async function up(db) {
|
|
6
|
+
await db.schema.alterTable('repositories').addColumn('siteCode', 'text').execute();
|
|
7
|
+
await db.schema.alterTable('repositories').addColumn('storageClusterCode', 'text').execute();
|
|
8
|
+
}
|
|
9
|
+
async function down(db) {
|
|
10
|
+
await db.schema.alterTable('repositories').dropColumn('storageClusterCode').execute();
|
|
11
|
+
await db.schema.alterTable('repositories').dropColumn('siteCode').execute();
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=20260729130000-AddRepositoryPlacement.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20260729130000-AddRepositoryPlacement.js","sourceRoot":"","sources":["../../../src/schema/migrations/20260729130000-AddRepositoryPlacement.ts"],"names":[],"mappings":";;AAEA,gBAGC;AAED,oBAGC;AARM,KAAK,UAAU,EAAE,CAAC,EAAe;IACtC,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;IACnF,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;AAC/F,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,EAAe;IACxC,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;IACtF,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;AAC9E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.table.js","sourceRoot":"","sources":["../../../src/schema/tables/backend.table.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"backend.table.js","sourceRoot":"","sources":["../../../src/schema/tables/backend.table.ts"],"names":[],"mappings":";;;AAuCA,MAAa,YAAY;IACvB,EAAE,CAAqB;IACvB,aAAa,CAAU;CACxB;AAHD,oCAGC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.table.js","sourceRoot":"","sources":["../../../src/schema/tables/repository.table.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;IAC1B,EAAE,CAAU;IAEZ,QAAQ,CAAU;IAElB,SAAS,CAAU;IAEnB,eAAe,CAAiB;
|
|
1
|
+
{"version":3,"file":"repository.table.js","sourceRoot":"","sources":["../../../src/schema/tables/repository.table.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;IAC1B,EAAE,CAAU;IAEZ,QAAQ,CAAU;IAElB,SAAS,CAAU;IAEnB,eAAe,CAAiB;IAEhC,QAAQ,CAAiB;IAEzB,kBAAkB,CAAiB;CACpC;AAZD,0CAYC"}
|
|
@@ -2,6 +2,7 @@ import { EventsGateway } from '../events/events.gateway';
|
|
|
2
2
|
import { BackendRepository } from '../repositories/backend.repository';
|
|
3
3
|
import { ConfigRepository } from '../repositories/config.repository';
|
|
4
4
|
import { ModuleConfigRepository } from '../repositories/moduleConfig.repository';
|
|
5
|
+
import { RepositoryRepository } from '../repositories/repository.repository';
|
|
5
6
|
import { TelemetryService } from './telemetry.service';
|
|
6
7
|
export declare class AuthService {
|
|
7
8
|
readonly config: ConfigRepository;
|
|
@@ -9,7 +10,10 @@ export declare class AuthService {
|
|
|
9
10
|
readonly moduleConfig: ModuleConfigRepository;
|
|
10
11
|
readonly events: EventsGateway;
|
|
11
12
|
readonly telemetry: TelemetryService;
|
|
12
|
-
|
|
13
|
+
readonly repository: RepositoryRepository;
|
|
14
|
+
constructor(config: ConfigRepository, backend: BackendRepository, moduleConfig: ModuleConfigRepository, events: EventsGateway, telemetry: TelemetryService, repository: RepositoryRepository);
|
|
15
|
+
private connectionName;
|
|
16
|
+
private adoptOwnRepositories;
|
|
13
17
|
private waitForDeviceFlow;
|
|
14
18
|
oidcDeviceFlow(): Promise<{
|
|
15
19
|
userCode: string;
|
|
@@ -10,15 +10,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.AuthService = void 0;
|
|
13
|
+
const backups_api_client_1 = require("@futo-org/backups-api-client");
|
|
13
14
|
const common_1 = require("@nestjs/common");
|
|
14
15
|
const eventsource_client_1 = require("eventsource-client");
|
|
15
|
-
const
|
|
16
|
+
const node_os_1 = require("node:os");
|
|
16
17
|
const const_1 = require("../const");
|
|
17
18
|
const enum_1 = require("../enum");
|
|
18
19
|
const events_gateway_1 = require("../events/events.gateway");
|
|
19
20
|
const backend_repository_1 = require("../repositories/backend.repository");
|
|
20
21
|
const config_repository_1 = require("../repositories/config.repository");
|
|
21
22
|
const moduleConfig_repository_1 = require("../repositories/moduleConfig.repository");
|
|
23
|
+
const repository_repository_1 = require("../repositories/repository.repository");
|
|
24
|
+
const wellKnown_1 = require("../wellKnown");
|
|
22
25
|
const telemetry_service_1 = require("./telemetry.service");
|
|
23
26
|
let AuthService = class AuthService {
|
|
24
27
|
config;
|
|
@@ -26,14 +29,55 @@ let AuthService = class AuthService {
|
|
|
26
29
|
moduleConfig;
|
|
27
30
|
events;
|
|
28
31
|
telemetry;
|
|
29
|
-
|
|
32
|
+
repository;
|
|
33
|
+
constructor(config, backend, moduleConfig, events, telemetry, repository) {
|
|
30
34
|
this.config = config;
|
|
31
35
|
this.backend = backend;
|
|
32
36
|
this.moduleConfig = moduleConfig;
|
|
33
37
|
this.events = events;
|
|
34
38
|
this.telemetry = telemetry;
|
|
39
|
+
this.repository = repository;
|
|
35
40
|
}
|
|
36
|
-
|
|
41
|
+
connectionName() {
|
|
42
|
+
const external = this.moduleConfig.get().externalBaseUrl;
|
|
43
|
+
if (external) {
|
|
44
|
+
try {
|
|
45
|
+
return new URL(external).host;
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
return (0, node_os_1.hostname)() || 'immich';
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return (0, node_os_1.hostname)() || 'immich';
|
|
52
|
+
}
|
|
53
|
+
async adoptOwnRepositories(endpoint, accessToken) {
|
|
54
|
+
try {
|
|
55
|
+
const requestOptions = {
|
|
56
|
+
baseUrl: endpoint,
|
|
57
|
+
headers: { cookie: `${enum_1.CookieName.YuccaAccessToken}=${accessToken}` },
|
|
58
|
+
};
|
|
59
|
+
const auth = await (0, backups_api_client_1.getAuth)(requestOptions);
|
|
60
|
+
if (!auth.connectionId) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const repositories = await this.repository.getAll();
|
|
64
|
+
const repositoryIds = repositories
|
|
65
|
+
.filter((row) => row.backendId === const_1.REPOSITORY_DEFAULT_CLOUD_UUID)
|
|
66
|
+
.map((row) => row.remoteId);
|
|
67
|
+
if (repositoryIds.length === 0) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
await (0, backups_api_client_1.adoptRepositories)(auth.connectionId, { repositoryIds }, requestOptions);
|
|
71
|
+
this.telemetry.submitStructuredLog('Adopted repositories into instance connection', {
|
|
72
|
+
connectionId: auth.connectionId,
|
|
73
|
+
count: repositoryIds.length,
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
77
|
+
this.telemetry.submitStructuredLog('Repository adoption skipped', { error: String(error) });
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
async waitForDeviceFlow(events, overrideEndpoint, endpoint) {
|
|
37
81
|
for await (const { data } of events) {
|
|
38
82
|
const { type, accessToken } = JSON.parse(data);
|
|
39
83
|
switch (type) {
|
|
@@ -41,8 +85,9 @@ let AuthService = class AuthService {
|
|
|
41
85
|
await this.backend.updateBackend(const_1.REPOSITORY_DEFAULT_CLOUD_UUID, {
|
|
42
86
|
type: enum_1.BackendType.Yucca,
|
|
43
87
|
accessToken,
|
|
44
|
-
url,
|
|
88
|
+
url: overrideEndpoint,
|
|
45
89
|
});
|
|
90
|
+
await this.adoptOwnRepositories(endpoint, accessToken);
|
|
46
91
|
this.telemetry.submitStructuredLog('Connected FUTO Backups backend', {
|
|
47
92
|
backendId: const_1.REPOSITORY_DEFAULT_CLOUD_UUID,
|
|
48
93
|
});
|
|
@@ -69,17 +114,19 @@ let AuthService = class AuthService {
|
|
|
69
114
|
events.close();
|
|
70
115
|
}
|
|
71
116
|
async oidcDeviceFlow() {
|
|
72
|
-
const
|
|
73
|
-
const
|
|
117
|
+
const endpoint = await wellKnown_1.yuccaWellKnown.getBaseUrl();
|
|
118
|
+
const url = new URL('/api/auth/oidc/device', endpoint);
|
|
119
|
+
url.searchParams.set('connection_type', 'immich');
|
|
120
|
+
url.searchParams.set('connection_name', this.connectionName());
|
|
74
121
|
const events = (0, eventsource_client_1.createEventSource)({
|
|
75
|
-
url
|
|
122
|
+
url,
|
|
76
123
|
onDisconnect: () => events.close(),
|
|
77
124
|
});
|
|
78
125
|
const connectTimeout = setTimeout(() => events.close(), 10_000);
|
|
79
126
|
for await (const { data } of events) {
|
|
80
127
|
clearTimeout(connectTimeout);
|
|
81
128
|
const { userCode, verificationUri } = JSON.parse(data);
|
|
82
|
-
void this.waitForDeviceFlow(events,
|
|
129
|
+
void this.waitForDeviceFlow(events, undefined, endpoint).catch((error) => {
|
|
83
130
|
this.telemetry.submitStructuredLog('Device flow authentication errored', { error });
|
|
84
131
|
this.events.publish({ type: 'DeviceFlowFailure' });
|
|
85
132
|
});
|
|
@@ -98,6 +145,7 @@ exports.AuthService = AuthService = __decorate([
|
|
|
98
145
|
backend_repository_1.BackendRepository,
|
|
99
146
|
moduleConfig_repository_1.ModuleConfigRepository,
|
|
100
147
|
events_gateway_1.EventsGateway,
|
|
101
|
-
telemetry_service_1.TelemetryService
|
|
148
|
+
telemetry_service_1.TelemetryService,
|
|
149
|
+
repository_repository_1.RepositoryRepository])
|
|
102
150
|
], AuthService);
|
|
103
151
|
//# sourceMappingURL=auth.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0E;AAC1E,2DAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qEAA0E;AAC1E,2CAA0E;AAC1E,2DAA0E;AAC1E,qCAAmC;AACnC,oCAAyD;AACzD,kCAAkD;AAClD,6DAAyD;AACzD,2EAAuE;AACvE,yEAAqE;AACrE,qFAAiF;AACjF,iFAA6E;AAC7E,4CAA8C;AAC9C,2DAAuD;AAGhD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEX;IACA;IACA;IACA;IACA;IACA;IANX,YACW,MAAwB,EACxB,OAA0B,EAC1B,YAAoC,EACpC,MAAqB,EACrB,SAA2B,EAC3B,UAAgC;QALhC,WAAM,GAAN,MAAM,CAAkB;QACxB,YAAO,GAAP,OAAO,CAAmB;QAC1B,iBAAY,GAAZ,YAAY,CAAwB;QACpC,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAkB;QAC3B,eAAU,GAAV,UAAU,CAAsB;IACxC,CAAC;IAEI,cAAc;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC;QACzD,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC;gBACH,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;YAChC,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAA,kBAAQ,GAAE,IAAI,QAAQ,CAAC;YAChC,CAAC;QACH,CAAC;QACD,OAAO,IAAA,kBAAQ,GAAE,IAAI,QAAQ,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,QAA4B,EAAE,WAAmB;QAClF,IAAI,CAAC;YACH,MAAM,cAAc,GAAG;gBACrB,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,iBAAU,CAAC,gBAAgB,IAAI,WAAW,EAAE,EAAE;aACrE,CAAC;YAEF,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAO,EAAC,cAAc,CAAC,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACpD,MAAM,aAAa,GAAG,YAAY;iBAC/B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,qCAA6B,CAAC;iBAChE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9B,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,OAAO;YACT,CAAC;YAED,MAAM,IAAA,sCAAiB,EAAC,IAAI,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,EAAE,cAAc,CAAC,CAAC;YAC9E,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,+CAA+C,EAAE;gBAClF,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,KAAK,EAAE,aAAa,CAAC,MAAM;aAC5B,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,MAAyB,EAAE,gBAAoC,EAAE,QAAgB;QAC/G,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;YACpC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE/C,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,qCAA6B,EAAE;wBAC9D,IAAI,EAAE,kBAAW,CAAC,KAAK;wBACvB,WAAW;wBACX,GAAG,EAAE,gBAAgB;qBACtB,CAAC,CAAC;oBAEH,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;oBAEvD,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,gCAAgC,EAAE;wBACnE,SAAS,EAAE,qCAA6B;qBACzC,CAAC,CAAC;oBAEH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;wBAClB,IAAI,EAAE,eAAe;wBACrB,OAAO,EAAE;4BACP,EAAE,EAAE,qCAA6B;4BACjC,IAAI,EAAE,kBAAW,CAAC,KAAK;4BACvB,WAAW,EAAE,cAAc;4BAC3B,QAAQ,EAAE,IAAI;yBACf;qBACF,CAAC,CAAC;oBAEH,MAAM;gBACR,CAAC;gBACD,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;oBAE5E,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;wBAClB,IAAI,EAAE,mBAAmB;qBAC1B,CAAC,CAAC;oBAEH,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,CAAC,KAAK,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,QAAQ,GAAG,MAAM,0BAAc,CAAC,UAAU,EAAE,CAAC;QAEnD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC;QACvD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QAClD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAsB,IAAA,sCAAiB,EAAC;YAClD,GAAG;YACH,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;SACnC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QAEhE,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;YACpC,YAAY,CAAC,cAAc,CAAC,CAAC;YAC7B,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAEvD,KAAK,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACvE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,oCAAoC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACpF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YAEH,OAAO;gBACL,QAAQ;gBACR,eAAe;aAChB,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,qCAA4B,CAAC,kDAAkD,CAAC,CAAC;IAC7F,CAAC;CACF,CAAA;AAhIY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGQ,oCAAgB;QACf,sCAAiB;QACZ,gDAAsB;QAC5B,8BAAa;QACV,oCAAgB;QACf,4CAAoB;GAPhC,WAAW,CAgIvB"}
|