@lilaquadrat/studio 10.0.0-beta.45 → 10.0.0-beta.47
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/lib/src/helpers/auth0config.d.ts +6 -0
- package/lib/src/helpers/auth0config.js +24 -0
- package/lib/src/helpers/auth0config.js.map +1 -0
- package/lib/src/helpers/authPlugin.js +29 -21
- package/lib/src/helpers/authPlugin.js.map +1 -1
- package/lib/src/models/hostingSettings.model.js +6 -4
- package/lib/src/models/hostingSettings.model.js.map +1 -1
- package/lib/src/services/domains.service.d.ts +1 -4
- package/lib/src/services/domains.service.js +13 -4
- package/lib/src/services/domains.service.js.map +1 -1
- package/lib/src/services/hosting.service.js +4 -7
- package/lib/src/services/hosting.service.js.map +1 -1
- package/lib/src/services/hostingAdmin.service.d.ts +1 -1
- package/lib/src/services/hostingAdmin.service.js +2 -2
- package/lib/src/services/hostingAdmin.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import ProjectModel from "../models/project.model";
|
|
2
|
+
export default async (app) => {
|
|
3
|
+
let settings = {
|
|
4
|
+
url: process.env.JWT_URL,
|
|
5
|
+
issuer: process.env.JWT_ISSUER,
|
|
6
|
+
custom: false,
|
|
7
|
+
};
|
|
8
|
+
console.log(app);
|
|
9
|
+
if (app !== 'editor-app') {
|
|
10
|
+
const splitProject = app?.split('-');
|
|
11
|
+
if (splitProject) {
|
|
12
|
+
const project = await ProjectModel.db.findOne({ company: splitProject[0], id: splitProject[1] });
|
|
13
|
+
if (project?.auth0?.domain) {
|
|
14
|
+
settings = {
|
|
15
|
+
url: `https://${project?.auth0?.domain}/.well-known/jwks.json`,
|
|
16
|
+
issuer: `https://${project?.auth0?.domain}/`,
|
|
17
|
+
custom: true,
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
return settings;
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=auth0config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth0config.js","sourceRoot":"","sources":["../../../src/helpers/auth0config.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,yBAAyB,CAAC;AAEnD,eAAe,KAAK,EAAE,GAAW,EAAE,EAAE;IAEnC,IAAI,QAAQ,GAAG;QACb,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,OAAiB;QAClC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAoB;QACxC,MAAM,EAAE,KAAK;KACd,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjB,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;QAEzB,MAAM,YAAY,GAAG,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAErC,IAAI,YAAY,EAAE,CAAC;YAEjB,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAEjG,IAAI,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;gBAE3B,QAAQ,GAAG;oBACT,GAAG,EAAE,WAAW,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB;oBAC9D,MAAM,EAAE,WAAW,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG;oBAC5C,MAAM,EAAE,IAAI;iBACb,CAAC;YAEJ,CAAC;QAEH,CAAC;IAEH,CAAC;IAED,OAAO,QAAQ,CAAC;AAElB,CAAC,CAAC"}
|
|
@@ -1,33 +1,40 @@
|
|
|
1
|
+
import { promisify } from 'node:util';
|
|
1
2
|
import fp from 'fastify-plugin';
|
|
2
3
|
import fastifyJwt from '@fastify/jwt';
|
|
3
4
|
import jwksRsa from 'jwks-rsa';
|
|
4
5
|
import respondCode from '../functions/respondCode.js';
|
|
6
|
+
import auth0config from './auth0config.js';
|
|
5
7
|
const authPlugin = async (fastify) => {
|
|
6
8
|
if (process.env.ENV !== 'dev') {
|
|
7
|
-
//
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
// Per-domain JWKS client cache to avoid re-creating clients on every request
|
|
10
|
+
const jwksClients = new Map();
|
|
11
|
+
const getJwksClient = (jwksUri) => {
|
|
12
|
+
if (!jwksClients.has(jwksUri)) {
|
|
13
|
+
jwksClients.set(jwksUri, jwksRsa({
|
|
14
|
+
cache: true,
|
|
15
|
+
cacheMaxEntries: 5,
|
|
16
|
+
cacheMaxAge: 600000, // 10 minutes in ms
|
|
17
|
+
rateLimit: true,
|
|
18
|
+
jwksRequestsPerMinute: 10,
|
|
19
|
+
jwksUri,
|
|
20
|
+
}));
|
|
21
|
+
}
|
|
22
|
+
return jwksClients.get(jwksUri);
|
|
23
|
+
};
|
|
16
24
|
// Production: Register JWT with JWKS
|
|
17
25
|
await fastify.register(fastifyJwt, {
|
|
18
26
|
decode: { complete: true },
|
|
19
|
-
secret: (request, token
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
});
|
|
27
|
+
secret: async (request, token) => {
|
|
28
|
+
const header = 'header' in token ? token.header : token;
|
|
29
|
+
const app = request.studioApp ?? 'editor-app';
|
|
30
|
+
console.log(app);
|
|
31
|
+
const settings = await auth0config(app);
|
|
32
|
+
console.log(settings);
|
|
33
|
+
request.customApp = settings.custom;
|
|
34
|
+
const jwksUri = settings.url;
|
|
35
|
+
const client = getJwksClient(jwksUri);
|
|
36
|
+
const key = await promisify(client.getSigningKey.bind(client))(header.kid);
|
|
37
|
+
return key.getPublicKey();
|
|
31
38
|
},
|
|
32
39
|
verify: {
|
|
33
40
|
algorithms: ['RS256']
|
|
@@ -37,6 +44,7 @@ const authPlugin = async (fastify) => {
|
|
|
37
44
|
fastify.decorate('authenticate', async (request, reply) => {
|
|
38
45
|
try {
|
|
39
46
|
await request.jwtVerify();
|
|
47
|
+
console.log(request.user);
|
|
40
48
|
request.auth = request.user;
|
|
41
49
|
}
|
|
42
50
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authPlugin.js","sourceRoot":"","sources":["../../../src/helpers/authPlugin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"authPlugin.js","sourceRoot":"","sources":["../../../src/helpers/authPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,18 +6,20 @@ model.setSchema({
|
|
|
6
6
|
properties: {
|
|
7
7
|
id: { type: 'string' },
|
|
8
8
|
baseDomain: { type: 'string' },
|
|
9
|
-
|
|
9
|
+
ipv4: { type: 'string' },
|
|
10
|
+
ipv6: { type: 'string' },
|
|
10
11
|
},
|
|
11
|
-
required: ['baseDomain', '
|
|
12
|
+
required: ['baseDomain', 'ipv4', 'ipv6', 'id'],
|
|
12
13
|
additionalProperties: false,
|
|
13
14
|
}, 'create');
|
|
14
15
|
model.setSchema({
|
|
15
16
|
type: 'object',
|
|
16
17
|
properties: {
|
|
17
18
|
baseDomain: { type: 'string' },
|
|
18
|
-
|
|
19
|
+
ipv4: { type: 'string' },
|
|
20
|
+
ipv6: { type: 'string' },
|
|
19
21
|
},
|
|
20
|
-
required: ['baseDomain', '
|
|
22
|
+
required: ['baseDomain', 'ipv4', 'ipv6'],
|
|
21
23
|
additionalProperties: false,
|
|
22
24
|
}, 'change');
|
|
23
25
|
export default model;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostingSettings.model.js","sourceRoot":"","sources":["../../../src/models/hostingSettings.model.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD,MAAM,KAAK,GAAG,IAAI,OAAO,CAAkB,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;AACjF,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,CAAC;AAEzB,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACtB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,
|
|
1
|
+
{"version":3,"file":"hostingSettings.model.js","sourceRoot":"","sources":["../../../src/models/hostingSettings.model.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD,MAAM,KAAK,GAAG,IAAI,OAAO,CAAkB,iBAAiB,EAAE,iBAAiB,CAAC,CAAC;AACjF,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,CAAC;AAEzB,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACtB,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC;IAC9C,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CAAC,CAAC;AAEV,KAAK,CAAC,SAAS,CAAC;IACd,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KACzB;IACD,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC;IACxC,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CAAC,CAAC;AAEV,eAAe,KAAK,CAAC"}
|
|
@@ -10,11 +10,8 @@ declare class DomainsService extends Immutable<Domain> {
|
|
|
10
10
|
* a TXT entry with ``lila-studio-SECRET`` needs to be added to the DNS
|
|
11
11
|
*/
|
|
12
12
|
validateDnsSecret(domain: string, key: string): Promise<boolean>;
|
|
13
|
-
/**
|
|
14
|
-
* In order to bind a domain to lilaquadrat STUDIO, the ownership of the domains needs to be validated.
|
|
15
|
-
* a TXT entry with ``lila-studio-SECRET`` needs to be added to the DNS
|
|
16
|
-
*/
|
|
17
13
|
validateDnsARecord(domain: string, ip: string): Promise<boolean>;
|
|
14
|
+
validateDnsAAAARecord(domain: string, ip: string): Promise<boolean>;
|
|
18
15
|
getDefaultDomain(company: string, project: string, hostingDomain: string): string;
|
|
19
16
|
getAllDomains(): Promise<WithId<Domain>[]>;
|
|
20
17
|
/**
|
|
@@ -41,10 +41,6 @@ class DomainsService extends Immutable {
|
|
|
41
41
|
throw error;
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
/**
|
|
45
|
-
* In order to bind a domain to lilaquadrat STUDIO, the ownership of the domains needs to be validated.
|
|
46
|
-
* a TXT entry with ``lila-studio-SECRET`` needs to be added to the DNS
|
|
47
|
-
*/
|
|
48
44
|
async validateDnsARecord(domain, ip) {
|
|
49
45
|
try {
|
|
50
46
|
const records = await dns.resolve4(domain);
|
|
@@ -58,6 +54,19 @@ class DomainsService extends Immutable {
|
|
|
58
54
|
throw error;
|
|
59
55
|
}
|
|
60
56
|
}
|
|
57
|
+
async validateDnsAAAARecord(domain, ip) {
|
|
58
|
+
try {
|
|
59
|
+
const records = await dns.resolve6(domain);
|
|
60
|
+
return records.some((record) => record.includes(ip));
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
// ENODATA/ENOTFOUND means no AAAA records exist, which means validation fails
|
|
64
|
+
if (error.code === 'ENODATA' || error.code === 'ENOTFOUND') {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
throw error;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
61
70
|
getDefaultDomain(company, project, hostingDomain) {
|
|
62
71
|
return `${company}-${project}.${hostingDomain}`;
|
|
63
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domains.service.js","sourceRoot":"","sources":["../../../src/services/domains.service.ts"],"names":[],"mappings":"AAEA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAKhD,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC;AAEzB,MAAM,cAAe,SAAQ,SAAiB;IAA9C;;QAEE,UAAK,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"domains.service.js","sourceRoot":"","sources":["../../../src/services/domains.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,15 +24,11 @@ class HostingService extends Immutable {
|
|
|
24
24
|
pipeline: [
|
|
25
25
|
{
|
|
26
26
|
$project: {
|
|
27
|
-
|
|
27
|
+
ipv4: 1,
|
|
28
|
+
ipv6: 1,
|
|
28
29
|
_id: 0,
|
|
29
30
|
},
|
|
30
31
|
},
|
|
31
|
-
{
|
|
32
|
-
$unwind: {
|
|
33
|
-
path: '$ipAdresses',
|
|
34
|
-
},
|
|
35
|
-
},
|
|
36
32
|
],
|
|
37
33
|
},
|
|
38
34
|
},
|
|
@@ -44,7 +40,8 @@ class HostingService extends Immutable {
|
|
|
44
40
|
{
|
|
45
41
|
$addFields: {
|
|
46
42
|
settings: {
|
|
47
|
-
|
|
43
|
+
ipv4: '$ip.ipv4',
|
|
44
|
+
ipv6: '$ip.ipv6',
|
|
48
45
|
},
|
|
49
46
|
},
|
|
50
47
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting.service.js","sourceRoot":"","sources":["../../../src/services/hosting.service.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAE9C,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAClD,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,mBAAmB,MAAM,2BAA2B,CAAC;AAE5D,OAAO,gBAAgB,MAAM,wBAAwB,CAAC;AAEtD,MAAM,cAAe,SAAQ,SAAkB;IAA/C;;QAEE,UAAK,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"hosting.service.js","sourceRoot":"","sources":["../../../src/services/hosting.service.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAE9C,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAClD,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,mBAAmB,MAAM,2BAA2B,CAAC;AAE5D,OAAO,gBAAgB,MAAM,wBAAwB,CAAC;AAEtD,MAAM,cAAe,SAAQ,SAAkB;IAA/C;;QAEE,UAAK,GAAG,YAAY,CAAC;IAgJvB,CAAC;IA9IC,MAAM,CAAC,OAAe,EAAE,OAAe;QAErC,MAAM,gBAAgB,GAAG;YACvB;gBACE,MAAM,EAAE;oBACN,OAAO;oBACP,OAAO;iBACR;aACF;YACD;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,iBAAiB;oBACvB,EAAE,EAAE,IAAI;oBACR,QAAQ,EAAE;wBACR;4BACE,QAAQ,EAAE;gCACR,IAAI,EAAE,CAAC;gCACP,IAAI,EAAE,CAAC;gCACP,GAAG,EAAE,CAAC;6BACP;yBACF;qBACF;iBACF;aACF;YACD;gBACE,OAAO,EAAE;oBACP,IAAI,EAAE,KAAK;iBACZ;aACF;YACD;gBACE,UAAU,EAAE;oBACV,QAAQ,EAAE;wBACR,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,UAAU;qBACjB;iBACF;aACF;YACD;gBACE,QAAQ,EAAE;oBACR,EAAE,EAAE,CAAC;iBACN;aACF;SACF,CAAC;QAEF,OAAO,YAAY,CAAC,EAAE,CAAC,SAAS,CAAsB,gBAAgB,CAAC;aACpE,OAAO,EAAE;aACT,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAEzD,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,QAAQ,CAAC,OAAe,EAAE,OAAe,EAAE,IAAY,EAAE,GAAW;QAExE,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAEpE,IAAI,OAAO,EAAE,CAAC;YAEZ,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QAE1H,CAAC;aAAM,CAAC;YAEN,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;QAExD,CAAC;QAED,MAAM,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE9C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe,EAAE,OAAe,EAAE,IAAY,EAAE,GAAW;QAE1E,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QACzH,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,OAAe,EAAE,IAAY,EAAE,GAAW;QAE7E,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEnE,MAAM,cAAc,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,eAAe,EAAE,UAAoB,EAAE,CAAC,CAAC;QAE7H,OAAO,IAAI,CAAC,MAAM,CAAC;YACjB,OAAO;YACP,OAAO;YACP,MAAM,EAAE,IAAI;SACb,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAEhB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,OAAe;QAElD,OAAO,gBAAgB,CAAC,OAAO,CAAoB,4BAA4B,EAAE;YAC/E,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,SAAS;YACxB,aAAa,EAAE,OAAO;YACtB,aAAa,EAAE,OAAO;YACtB,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,SAAS;YACd,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IAEL,CAAC;IAED,4CAA4C;IAC5C,SAAS;QAEP,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE;aACjB,SAAS,CAAa;YACrB;gBACE,MAAM,EAAE;oBACN,MAAM,EAAE,IAAI;iBACb;aACF;YACD;gBACE,QAAQ,EAAE;oBACR,OAAO,EAAE,CAAC;iBACX;aACF;SACF,CAAC;aACD,OAAO,EAAE,CAAC;IAEf,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAe,EAAE,OAAe;QAE7C,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;IAEtF,CAAC;CAEF;AACD,eAAe,IAAI,cAAc,EAAE,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { HostingSettings, UserApp } from '@lilaquadrat/interfaces';
|
|
|
2
2
|
import Immutable from '../Immutable.class.js';
|
|
3
3
|
declare class HostingService extends Immutable<HostingSettings> {
|
|
4
4
|
model: import("../classes/modelv2.class.js").default<HostingSettings, string>;
|
|
5
|
-
updateSettings(id: string, baseDomain: string,
|
|
5
|
+
updateSettings(id: string, baseDomain: string, ipv4: string, ipv6: string, options: Required<UserApp>): Promise<(import("mongodb").UpdateResult<import("bson").Document> & {
|
|
6
6
|
_id: import("bson").ObjectId;
|
|
7
7
|
}) | import("@lilaquadrat/interfaces").CreateResult<import("@lilaquadrat/interfaces").BasicData<HostingSettings>>>;
|
|
8
8
|
settings(id: string): Promise<import("mongodb").WithId<HostingSettings> | null>;
|
|
@@ -5,8 +5,8 @@ class HostingService extends Immutable {
|
|
|
5
5
|
super(...arguments);
|
|
6
6
|
this.model = HostingSettingsModel;
|
|
7
7
|
}
|
|
8
|
-
updateSettings(id, baseDomain,
|
|
9
|
-
return this.immutableUpsert({ id }, { id, baseDomain,
|
|
8
|
+
updateSettings(id, baseDomain, ipv4, ipv6, options) {
|
|
9
|
+
return this.immutableUpsert({ id }, { id, baseDomain, ipv4, ipv6 }, options.app, 'change', options.user);
|
|
10
10
|
}
|
|
11
11
|
settings(id) {
|
|
12
12
|
return this.model.db.findOne({ id });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hostingAdmin.service.js","sourceRoot":"","sources":["../../../src/services/hostingAdmin.service.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,oBAAoB,MAAM,oCAAoC,CAAC;AAEtE,MAAM,cAAe,SAAQ,SAA0B;IAAvD;;QAEE,UAAK,GAAG,oBAAoB,CAAC;IAc/B,CAAC;IAZC,cAAc,CAAC,EAAU,EAAE,UAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"hostingAdmin.service.js","sourceRoot":"","sources":["../../../src/services/hostingAdmin.service.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,oBAAoB,MAAM,oCAAoC,CAAC;AAEtE,MAAM,cAAe,SAAQ,SAA0B;IAAvD;;QAEE,UAAK,GAAG,oBAAoB,CAAC;IAc/B,CAAC;IAZC,cAAc,CAAC,EAAU,EAAE,UAAkB,EAAE,IAAY,EAAE,IAAY,EAAE,OAA0B;QAEnG,OAAO,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3G,CAAC;IAED,QAAQ,CAAC,EAAU;QAEjB,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEvC,CAAC;CAEF;AACD,eAAe,IAAI,cAAc,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lilaquadrat/studio",
|
|
3
|
-
"version": "10.0.0-beta.
|
|
3
|
+
"version": "10.0.0-beta.47",
|
|
4
4
|
"description": "classes and tools for STUDIO",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -122,7 +122,7 @@
|
|
|
122
122
|
},
|
|
123
123
|
"dependencies": {
|
|
124
124
|
"@google/genai": "^1.42.0",
|
|
125
|
-
"@lilaquadrat/interfaces": "^1.
|
|
125
|
+
"@lilaquadrat/interfaces": "^1.39.0",
|
|
126
126
|
"@lilaquadrat/storage-sdk": "^0.1.13",
|
|
127
127
|
"@nats-io/jetstream": "^3.2.0",
|
|
128
128
|
"@nats-io/transport-node": "^3.2.0",
|