@lilaquadrat/studio 10.0.0-beta.47 → 10.0.0-beta.49
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.js +1 -2
- package/lib/src/helpers/auth0config.js.map +1 -1
- package/lib/src/helpers/authPlugin.js +0 -3
- package/lib/src/helpers/authPlugin.js.map +1 -1
- package/lib/src/services/upload.service.js +6 -1
- package/lib/src/services/upload.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import ProjectModel from "../models/project.model";
|
|
1
|
+
import ProjectModel from "../models/project.model.js";
|
|
2
2
|
export default async (app) => {
|
|
3
3
|
let settings = {
|
|
4
4
|
url: process.env.JWT_URL,
|
|
5
5
|
issuer: process.env.JWT_ISSUER,
|
|
6
6
|
custom: false,
|
|
7
7
|
};
|
|
8
|
-
console.log(app);
|
|
9
8
|
if (app !== 'editor-app') {
|
|
10
9
|
const splitProject = app?.split('-');
|
|
11
10
|
if (splitProject) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0config.js","sourceRoot":"","sources":["../../../src/helpers/auth0config.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,
|
|
1
|
+
{"version":3,"file":"auth0config.js","sourceRoot":"","sources":["../../../src/helpers/auth0config.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,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,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"}
|
|
@@ -27,9 +27,7 @@ const authPlugin = async (fastify) => {
|
|
|
27
27
|
secret: async (request, token) => {
|
|
28
28
|
const header = 'header' in token ? token.header : token;
|
|
29
29
|
const app = request.studioApp ?? 'editor-app';
|
|
30
|
-
console.log(app);
|
|
31
30
|
const settings = await auth0config(app);
|
|
32
|
-
console.log(settings);
|
|
33
31
|
request.customApp = settings.custom;
|
|
34
32
|
const jwksUri = settings.url;
|
|
35
33
|
const client = getJwksClient(jwksUri);
|
|
@@ -44,7 +42,6 @@ const authPlugin = async (fastify) => {
|
|
|
44
42
|
fastify.decorate('authenticate', async (request, reply) => {
|
|
45
43
|
try {
|
|
46
44
|
await request.jwtVerify();
|
|
47
|
-
console.log(request.user);
|
|
48
45
|
request.auth = request.user;
|
|
49
46
|
}
|
|
50
47
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authPlugin.js","sourceRoot":"","sources":["../../../src/helpers/authPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAChC,OAAO,UAA6B,MAAM,cAAc,CAAC;AACzD,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,WAAW,MAAM,kBAAkB,CAAC;AA+B3C,MAAM,UAAU,GAAuB,KAAK,EAAE,OAAwB,EAAE,EAAE;IAExE,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,EAAE,CAAC;QAE9B,6EAA6E;QAC7E,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAC;QAE1D,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE;YAExC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBAE9B,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;oBAC/B,KAAK,EAAE,IAAI;oBACX,eAAe,EAAE,CAAC;oBAClB,WAAW,EAAE,MAAM,EAAE,mBAAmB;oBACxC,SAAS,EAAE,IAAI;oBACf,qBAAqB,EAAE,EAAE;oBACzB,OAAO;iBACR,CAAC,CAAC,CAAC;YAEN,CAAC;YAED,OAAO,WAAW,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;QAEnC,CAAC,CAAC;QAEF,qCAAqC;QACrC,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE;YACjC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC1B,MAAM,EAAE,KAAK,EAAE,OAAuB,EAAE,KAAoB,EAAmB,EAAE;gBAE/E,MAAM,MAAM,GAAG,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;gBACxD,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,YAAY,CAAC;gBAC9C,
|
|
1
|
+
{"version":3,"file":"authPlugin.js","sourceRoot":"","sources":["../../../src/helpers/authPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,13 +33,18 @@ export class UploadService {
|
|
|
33
33
|
});
|
|
34
34
|
const selectQuery = cleanObject({
|
|
35
35
|
filename: filenameObject.filename,
|
|
36
|
-
prefix: filenameObject.directory,
|
|
37
36
|
company: options.company,
|
|
38
37
|
project: options.project,
|
|
39
38
|
list,
|
|
40
39
|
customer,
|
|
41
40
|
app,
|
|
42
41
|
});
|
|
42
|
+
if (filenameObject.directory === undefined) {
|
|
43
|
+
selectQuery.prefix = { $exists: false };
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
selectQuery.prefix = filenameObject.directory;
|
|
47
|
+
}
|
|
43
48
|
const validation = UploadModel.validate(content, 'create');
|
|
44
49
|
if (!validation) {
|
|
45
50
|
console.error(UploadModel.compiledTypes.create.errors);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["../../../src/services/upload.service.ts"],"names":[],"mappings":"AAEA,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAClE,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,cAAc,MAAM,sBAAsB,CAAC;AAElD,MAAM,OAAO,aAAa;IAExB,KAAK,CAAC,MAAM,CAAC,gBAA0B;QAErC,OAAO,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAEvF,CAAC;IAED,KAAK,CAAC,MAAM,CACV,QAAgB,EAChB,IAAY,EACZ,MAAc,EACd,QAAgB,EAChB,GAAW,EACX,QAA4B,EAC5B,IAAwB,EACxB,OAAmD;QAGnD,MAAM,cAAc,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,IAAI,MAAM,cAAc,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC;YAE/H,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QAEjC,CAAC;QAED,MAAM,OAAO,GAAW,WAAW,CAAC;YAClC,QAAQ,EAAE,cAAc,CAAC,QAAQ;YACjC,MAAM,EAAE,cAAc,CAAC,SAAS;YAChC,IAAI;YACJ,MAAM;YACN,QAAQ;YACR,KAAK,EAAE,WAAW;YAClB,OAAO,EAAE,IAAI,IAAI,EAAE;YACnB,GAAG;YACH,IAAI;YACJ,QAAQ;YACR,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE;gBACP,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B;SACF,CAAC,CAAC;QAEH,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["../../../src/services/upload.service.ts"],"names":[],"mappings":"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"}
|