@steedos/accounts 3.0.14-beta.1 → 3.0.14-beta.11
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.
|
@@ -33,7 +33,7 @@ const getSettings = (accountsServer) => async (req, res) => {
|
|
|
33
33
|
if (!tenant._id) {
|
|
34
34
|
tenant._id = process.env.STEEDOS_TENANT_ID;
|
|
35
35
|
}
|
|
36
|
-
const platform = global.Steedos.settings.
|
|
36
|
+
const platform = (global.Steedos.settings.PUBLIC_SETTINGS || {}).platform || {};
|
|
37
37
|
if (tenant._id) {
|
|
38
38
|
let spaceDoc = await db_1.db.findOne("spaces", tenant._id, {
|
|
39
39
|
fields: [
|
|
@@ -49,23 +49,23 @@ const getSettings = (accountsServer) => async (req, res) => {
|
|
|
49
49
|
let steedosService = (0, core_1.getSteedosService)();
|
|
50
50
|
if (steedosService && spaceDoc) {
|
|
51
51
|
_.assignIn(tenant, spaceDoc);
|
|
52
|
-
if (spaceDoc.
|
|
52
|
+
if (spaceDoc.avatar) {
|
|
53
53
|
tenant.logo_url =
|
|
54
54
|
steedosService +
|
|
55
55
|
"api/v6/files/cfs.avatars.filerecord/" +
|
|
56
|
-
spaceDoc.
|
|
56
|
+
spaceDoc.avatar;
|
|
57
57
|
}
|
|
58
|
-
else if (spaceDoc.
|
|
58
|
+
else if (spaceDoc.account_logo) {
|
|
59
59
|
tenant.logo_url =
|
|
60
60
|
steedosService +
|
|
61
61
|
"api/v6/files/cfs.avatars.filerecord/" +
|
|
62
|
-
spaceDoc.
|
|
62
|
+
spaceDoc.account_logo;
|
|
63
63
|
}
|
|
64
|
-
else if (spaceDoc.
|
|
64
|
+
else if (spaceDoc.avatar_dark) {
|
|
65
65
|
tenant.logo_url =
|
|
66
66
|
steedosService +
|
|
67
67
|
"api/v6/files/cfs.avatars.filerecord/" +
|
|
68
|
-
spaceDoc.
|
|
68
|
+
spaceDoc.avatar_dark;
|
|
69
69
|
}
|
|
70
70
|
if (spaceDoc.background) {
|
|
71
71
|
tenant.background_url =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":";;;AAQA,4BAA4B;AAE5B,gDAAuE;AACvE,oCAAiC;AACjC,wCAA4E;AAC5E,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACvC,MAAM,IAAI,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACvC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAM,MAAM,GAAG,IAAA,2BAAgB,GAAE,CAAC;AAE3B,MAAM,WAAW,GACtB,CAAC,cAA8B,EAAE,EAAE,CACnC,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;IACpD,IAAI,MAAM,GAAQ;QAChB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,SAAS;QACnB,cAAc,EAAE,SAAS;QACzB,oBAAoB,EAAE,IAAI;QAC1B,eAAe,EAAE,IAAI;QACrB,sBAAsB,EAAE,IAAI;QAC5B,qBAAqB,EAAE,IAAI;QAC3B,wBAAwB,EAAE,KAAK;QAC/B,uBAAuB,EAAE,KAAK;QAC9B,kBAAkB,EAAE,KAAK;QACzB,iBAAiB,EAAE,KAAK;QACxB,WAAW,EAAE,SAAS,CAAC,SAAS,CAC9B,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,OAAO,EACjD,IAAI,CACL;QACD,mBAAmB,EAAE,SAAS,CAAC,SAAS,CACtC,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,OAAO,CACvD;QACD,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;QACjD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;KACpD,CAAC;IAEF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QAChB,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAC7C,CAAC;IAED,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/accounts",
|
|
3
|
-
"version": "3.0.14-beta.
|
|
3
|
+
"version": "3.0.14-beta.11",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"files": [
|
|
6
6
|
"/package.json",
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@accounts/types": "0.20.1",
|
|
27
27
|
"@babel/runtime": "^7.12.18",
|
|
28
|
-
"@steedos/auth": "3.0.14-beta.
|
|
29
|
-
"@steedos/objectql": "3.0.14-beta.
|
|
30
|
-
"@steedos/utils": "3.0.14-beta.
|
|
28
|
+
"@steedos/auth": "3.0.14-beta.11",
|
|
29
|
+
"@steedos/objectql": "3.0.14-beta.11",
|
|
30
|
+
"@steedos/utils": "3.0.14-beta.11",
|
|
31
31
|
"app-root-path": "^2.2.1",
|
|
32
32
|
"bcryptjs": "^3.0.3",
|
|
33
33
|
"body-parser": "^2.2.1",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"publishConfig": {
|
|
57
57
|
"access": "public"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "7374cbad62f260d4d07203866c4946bdaea8685a"
|
|
60
60
|
}
|
|
@@ -51,7 +51,7 @@ export const getSettings =
|
|
|
51
51
|
tenant._id = process.env.STEEDOS_TENANT_ID;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
const platform = (global
|
|
54
|
+
const platform = (global.Steedos.settings.PUBLIC_SETTINGS || {}).platform || {};
|
|
55
55
|
|
|
56
56
|
if (tenant._id) {
|
|
57
57
|
let spaceDoc = await db.findOne("spaces", tenant._id, {
|
|
@@ -68,22 +68,23 @@ export const getSettings =
|
|
|
68
68
|
let steedosService = getSteedosService();
|
|
69
69
|
if (steedosService && spaceDoc) {
|
|
70
70
|
_.assignIn(tenant, spaceDoc);
|
|
71
|
-
if (spaceDoc.
|
|
71
|
+
if (spaceDoc.avatar) {
|
|
72
72
|
tenant.logo_url =
|
|
73
73
|
steedosService +
|
|
74
74
|
"api/v6/files/cfs.avatars.filerecord/" +
|
|
75
|
-
spaceDoc.
|
|
76
|
-
}
|
|
75
|
+
spaceDoc.avatar;
|
|
76
|
+
}
|
|
77
|
+
else if (spaceDoc.account_logo) {
|
|
77
78
|
tenant.logo_url =
|
|
78
79
|
steedosService +
|
|
79
80
|
"api/v6/files/cfs.avatars.filerecord/" +
|
|
80
|
-
spaceDoc.
|
|
81
|
-
} else if (spaceDoc.
|
|
81
|
+
spaceDoc.account_logo;
|
|
82
|
+
} else if (spaceDoc.avatar_dark) {
|
|
82
83
|
tenant.logo_url =
|
|
83
84
|
steedosService +
|
|
84
85
|
"api/v6/files/cfs.avatars.filerecord/" +
|
|
85
|
-
spaceDoc.
|
|
86
|
-
}
|
|
86
|
+
spaceDoc.avatar_dark;
|
|
87
|
+
}
|
|
87
88
|
if (spaceDoc.background) {
|
|
88
89
|
tenant.background_url =
|
|
89
90
|
steedosService +
|