@silexlabs/silex 3.0.0-alpha.76 → 3.0.0-alpha.78
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/client/js/main.js +51 -51
- package/dist/plugins/client/client/api.js +2 -2
- package/dist/plugins/client/client/api.js.map +1 -1
- package/dist/plugins/client/client/assetUrl.js +2 -2
- package/dist/plugins/client/client/assetUrl.js.map +1 -1
- package/dist/plugins/client/client/config.js +1 -1
- package/dist/plugins/client/client/config.js.map +1 -1
- package/dist/plugins/client/client/grapesjs/LoginDialog.js +3 -1
- package/dist/plugins/client/client/grapesjs/LoginDialog.js.map +1 -1
- package/dist/plugins/client/client/grapesjs/PublicationManager.js +3 -1
- package/dist/plugins/client/client/grapesjs/PublicationManager.js.map +1 -1
- package/dist/plugins/server/server/config.js +1 -1
- package/dist/plugins/server/server/config.js.map +1 -1
- package/dist/server/server/api/websiteApi.js +1 -1
- package/dist/server/server/config.js +1 -1
- package/package.json +1 -1
- package/src/ts/client/api.ts +2 -2
- package/src/ts/client/assetUrl.ts +2 -2
- package/src/ts/client/config.ts +1 -1
- package/src/ts/client/grapesjs/LoginDialog.ts +4 -1
- package/src/ts/client/grapesjs/PublicationManager.ts +4 -1
- package/src/ts/server/api/websiteApi.ts +1 -1
- package/src/ts/server/config.ts +1 -1
|
@@ -34,7 +34,7 @@ export var ApiRoute;
|
|
|
34
34
|
ApiRoute["WEBSITE_META_WRITE"] = "/api/website/meta";
|
|
35
35
|
})(ApiRoute || (ApiRoute = {}));
|
|
36
36
|
// Root URL of Silex server, should we use config.rootUrl ?
|
|
37
|
-
const
|
|
37
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '');
|
|
38
38
|
export async function getUser({ type, connectorId }) {
|
|
39
39
|
return api(ApiRoute.CONNECTOR_USER, 'GET', {
|
|
40
40
|
type,
|
|
@@ -88,7 +88,7 @@ export async function websiteAssetsSave({ websiteId, connectorId, files }) {
|
|
|
88
88
|
return data;
|
|
89
89
|
}
|
|
90
90
|
export async function api(route, method, query, payload) {
|
|
91
|
-
const url = `${
|
|
91
|
+
const url = `${SERVER_URL}${route.toString()}?${new URLSearchParams(Object.entries(query)
|
|
92
92
|
.filter(([key, value]) => !!value)
|
|
93
93
|
.map(([key, value]) => [key, typeof value === 'string' ? value : JSON.stringify(value)])).toString()}`;
|
|
94
94
|
const response = await fetch(url, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/ts/client/api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,QAAQ,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAClZ,OAAO,EAA0+B,QAAQ,EAAE,MAAM,UAAU,CAAA;AAE3gC,MAAM,CAAN,IAAY,QAeX;AAfD,WAAY,QAAQ;IAClB,qDAA+E,CAAA;IAC/E,sEAA6E,CAAA;IAC7E,kDAAmE,CAAA;IACnE,sDAAuE,CAAA;IACvE,8CAAmE,CAAA;IACnE,0CAA6D,CAAA;IAC7D,2CAA+D,CAAA;IAC/D,4CAAiE,CAAA;IACjE,4CAAiE,CAAA;IACjE,0CAA6D,CAAA;IAC7D,uDAA0E,CAAA;IAC1E,wDAA6E,CAAA;IAC7E,mDAAuE,CAAA;IACvE,oDAAyE,CAAA;AAC3E,CAAC,EAfW,QAAQ,KAAR,QAAQ,QAenB;AAED,2DAA2D;AAC3D,MAAM,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/ts/client/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,8 @@ import { ClientSideFileType } from '../types';
|
|
|
8
8
|
* Before saving the site data we convert all URLs to the storage version
|
|
9
9
|
* During publicationn we convert all URLs to the storage version and back
|
|
10
10
|
*/
|
|
11
|
-
// Orging and path
|
|
12
|
-
const SERVER_URL =
|
|
11
|
+
// Orging and path, should we use config.rootUrl?
|
|
12
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '');
|
|
13
13
|
/**
|
|
14
14
|
* Function to convert a path from it stored version to the displayed version
|
|
15
15
|
* Stored version is like `/assets/image.webp`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assetUrl.js","sourceRoot":"","sources":["../../../../src/ts/client/assetUrl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACjF,OAAO,EAAS,kBAAkB,EAAkD,MAAM,UAAU,CAAA;AAEpG;;;;;;;GAOG;AAEH,
|
|
1
|
+
{"version":3,"file":"assetUrl.js","sourceRoot":"","sources":["../../../../src/ts/client/assetUrl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/ts/client/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAG5F,OAAO,EAA0B,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AACnG,OAAO,KAAK,GAAG,MAAM,OAAO,CAAA;AAE5B;;GAEG;AAEH,MAAM,OAAO,YAAa,SAAQ,MAAM;IACtC,GAAG,GAAG,GAAG,CAAA;IAET;;;OAGG;IACH,SAAS,GAAc,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAA;IAE1F;;;OAGG;IACH,SAAS,GAAgB,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAE/E;;OAEG;IACH,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAA;IAE1E;;OAEG;IACH,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/ts/client/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAG5F,OAAO,EAA0B,8BAA8B,EAAE,MAAM,4BAA4B,CAAA;AACnG,OAAO,KAAK,GAAG,MAAM,OAAO,CAAA;AAE5B;;GAEG;AAEH,MAAM,OAAO,YAAa,SAAQ,MAAM;IACtC,GAAG,GAAG,GAAG,CAAA;IAET;;;OAGG;IACH,SAAS,GAAc,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAA;IAE1F;;;OAGG;IACH,SAAS,GAAgB,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAE/E;;OAEG;IACH,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,gBAAgB,CAAA;IAE1E;;OAEG;IACH,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAE9E;;OAEG;IACH,KAAK,GAAG,KAAK,CAAA;IAEb;;OAEG;IACH,cAAc,CAAc;IAE5B;;;OAGG;IACH,eAAe,GAAG,GAAG,IAAI,CAAC,OAAO,IAAI,uBAAuB,EAAE,CAAA;IAE9D;;OAEG;IACH,gBAAgB;QACd,IAAI,CAAC,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;IACrF,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,SAAS,EAAE,CAAA;IACpB,CAAC;IAED;;OAEG;IACH,uBAAuB,GAAkC,EAAE,CAAA;IAE3D;;OAEG;IACH,0BAA0B,CAAC,YAA+D;QACxF,2BAA2B;QAC3B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAChC,YAAY,GAAG,CAAC,YAAY,CAAC,CAAA;SAC9B;QACD,WAAW;QACX,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACjC,8BAA8B,CAAC,WAAW,CAAC,CAAA;QAC7C,CAAC,CAAC,CAAA;QACF,kBAAkB;QAClB,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IAClF,CAAC;CACF"}
|
|
@@ -16,6 +16,8 @@ export async function updateUser(editor, type, connectorId) {
|
|
|
16
16
|
editor.getModel().set('user', user);
|
|
17
17
|
return user;
|
|
18
18
|
}
|
|
19
|
+
// Orging and path, should we use config.rootUrl?
|
|
20
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '');
|
|
19
21
|
let open = false;
|
|
20
22
|
let body = null;
|
|
21
23
|
export default function loginDialogPlugin(editor, opts) {
|
|
@@ -121,7 +123,7 @@ export default function loginDialogPlugin(editor, opts) {
|
|
|
121
123
|
}
|
|
122
124
|
}
|
|
123
125
|
async function loginWithConnector(connector) {
|
|
124
|
-
const nonOAuthUrl = `${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${connector.connectorId}&type=${connector.type}`;
|
|
126
|
+
const nonOAuthUrl = `${SERVER_URL}${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${connector.connectorId}&type=${connector.type}`;
|
|
125
127
|
window.open(connector.oauthUrl ?? nonOAuthUrl, '_blank');
|
|
126
128
|
return new Promise(resolve => {
|
|
127
129
|
render(html `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginDialog.js","sourceRoot":"","sources":["../../../../../src/ts/client/grapesjs/LoginDialog.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"LoginDialog.js","sourceRoot":"","sources":["../../../../../src/ts/client/grapesjs/LoginDialog.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,6 +58,8 @@ function jobStatusToPublicationStatus(status) {
|
|
|
58
58
|
}
|
|
59
59
|
throw new Error(`Unknown job status ${status}`);
|
|
60
60
|
}
|
|
61
|
+
// Orging and path, should we use config.rootUrl?
|
|
62
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '');
|
|
61
63
|
// The publication manager class
|
|
62
64
|
// This class is responsible for the publication dialog and for the publication process
|
|
63
65
|
// It is added to the editor instance as editor.PublicationManager
|
|
@@ -151,7 +153,7 @@ export class PublicationManager {
|
|
|
151
153
|
connectorId: connector.connectorId,
|
|
152
154
|
type: connector.type,
|
|
153
155
|
};
|
|
154
|
-
window.open(connector.oauthUrl || `${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${params.connectorId}&type=${params.type}`, '_blank');
|
|
156
|
+
window.open(connector.oauthUrl || `${SERVER_URL}${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${params.connectorId}&type=${params.type}`, '_blank');
|
|
155
157
|
return new Promise(resolve => {
|
|
156
158
|
const onMessage = async (event) => {
|
|
157
159
|
const data = event.data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicationManager.js","sourceRoot":"","sources":["../../../../../src/ts/client/grapesjs/PublicationManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PublicationManager.js","sourceRoot":"","sources":["../../../../../src/ts/client/grapesjs/PublicationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ class ServerConfig extends silex_plugins_1.Config {
|
|
|
46
46
|
};
|
|
47
47
|
port = process.env.SILEX_PORT;
|
|
48
48
|
debug = process.env.SILEX_DEBUG === 'true';
|
|
49
|
-
url = process.env.SILEX_URL ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
|
|
49
|
+
url = process.env.SILEX_URL?.replace(/\/$/, '') ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
|
|
50
50
|
userConfigPath = process.env.SILEX_CONFIG;
|
|
51
51
|
configFilePath = (0, path_1.resolve)(__dirname, '../../../.silex.js');
|
|
52
52
|
// All connectors or just the storage or hosting connectors
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/ts/server/config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAEH;;;GAGG;AAEH;;GAEG;AAEH,4DAAyD;AACzD,+BAA8B;AAC9B,4CAAsD;AAEtD,0CAAsC;AACtC,wDAA6F;AAC7F,sDAAkD;AAElD,oCAAwC;AACxC,sDAAkD;AAElD;;GAEG;AACH,MAAa,YAAa,SAAQ,sBAAM;IAC/B,cAAc,GAAG;QACtB,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;QAC/C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB;QAC/C,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B;QAC3D,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAC3C,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;QAC/C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;KACjC,CAAA;IACM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;IAC7B,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,CAAA;IAC1C,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/ts/server/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -231,7 +231,7 @@ function default_1(config, opts = {}) {
|
|
|
231
231
|
});
|
|
232
232
|
config.emit(events_1.ServerEvent.WEBSITE_ASSET_STORE_START, { files, websiteId, connectorId });
|
|
233
233
|
const result = await writeAssets(req['session'], websiteId, files, connectorId);
|
|
234
|
-
const baseUrl = new URL(config.url).pathname;
|
|
234
|
+
const baseUrl = new URL(config.url).pathname.replace(/\/$/, '');
|
|
235
235
|
res.json({
|
|
236
236
|
data: result.map(path => baseUrl + constants_1.API_PATH + constants_1.API_WEBSITE_PATH + constants_1.API_WEBSITE_ASSET_READ
|
|
237
237
|
+ path
|
|
@@ -20,7 +20,7 @@ class ServerConfig extends silex_plugins_1.Config {
|
|
|
20
20
|
};
|
|
21
21
|
port = process.env.SILEX_PORT;
|
|
22
22
|
debug = process.env.SILEX_DEBUG === 'true';
|
|
23
|
-
url = process.env.SILEX_URL ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
|
|
23
|
+
url = process.env.SILEX_URL?.replace(/\/$/, '') ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`;
|
|
24
24
|
userConfigPath = process.env.SILEX_CONFIG;
|
|
25
25
|
configFilePath = (0, path_1.resolve)(__dirname, '../../../.silex.js');
|
|
26
26
|
getConnectors(type = null) {
|
package/package.json
CHANGED
package/src/ts/client/api.ts
CHANGED
|
@@ -36,7 +36,7 @@ export enum ApiRoute {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
// Root URL of Silex server, should we use config.rootUrl ?
|
|
39
|
-
const
|
|
39
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '')
|
|
40
40
|
|
|
41
41
|
export async function getUser({type, connectorId}: {type: ConnectorType, connectorId?: ConnectorId}): Promise<ConnectorUser> {
|
|
42
42
|
return api<ApiConnectorUserQuery, null, ApiConnectorUserResponse>(ApiRoute.CONNECTOR_USER, 'GET', {
|
|
@@ -114,7 +114,7 @@ export async function websiteAssetsSave({websiteId, connectorId, files}: {websit
|
|
|
114
114
|
}
|
|
115
115
|
|
|
116
116
|
export async function api<ReqQuery, ReqBody, ResBody>(route: ApiRoute | string, method: string, query?: ReqQuery, payload?: ReqBody): Promise<ResBody> {
|
|
117
|
-
const url = `${
|
|
117
|
+
const url = `${SERVER_URL}${route.toString()}?${
|
|
118
118
|
new URLSearchParams(
|
|
119
119
|
Object.entries(query)
|
|
120
120
|
.filter(([key, value]) => !!value)
|
|
@@ -10,8 +10,8 @@ import { Asset, ClientSideFileType, Component, ConnectorId, Page, Style, Website
|
|
|
10
10
|
* During publicationn we convert all URLs to the storage version and back
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
|
-
// Orging and path
|
|
14
|
-
const SERVER_URL =
|
|
13
|
+
// Orging and path, should we use config.rootUrl?
|
|
14
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '')
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
17
|
* Function to convert a path from it stored version to the displayed version
|
package/src/ts/client/config.ts
CHANGED
|
@@ -26,6 +26,9 @@ export async function updateUser(editor: Editor, type: ConnectorType, connectorI
|
|
|
26
26
|
return user
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
+
// Orging and path, should we use config.rootUrl?
|
|
30
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '')
|
|
31
|
+
|
|
29
32
|
let open = false
|
|
30
33
|
let body: HTMLElement | null = null
|
|
31
34
|
export default function loginDialogPlugin(editor, opts) {
|
|
@@ -132,7 +135,7 @@ export default function loginDialogPlugin(editor, opts) {
|
|
|
132
135
|
}
|
|
133
136
|
}
|
|
134
137
|
async function loginWithConnector(connector: ConnectorData) {
|
|
135
|
-
const nonOAuthUrl = `${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${connector.connectorId}&type=${connector.type}`
|
|
138
|
+
const nonOAuthUrl = `${SERVER_URL}${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${connector.connectorId}&type=${connector.type}`
|
|
136
139
|
window.open(connector.oauthUrl ?? nonOAuthUrl, '_blank')
|
|
137
140
|
return new Promise(resolve => {
|
|
138
141
|
render(html`
|
|
@@ -75,6 +75,9 @@ function jobStatusToPublicationStatus(status: JobStatus): PublicationStatus {
|
|
|
75
75
|
throw new Error(`Unknown job status ${status}`)
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
+
// Orging and path, should we use config.rootUrl?
|
|
79
|
+
const SERVER_URL = window.location.origin + window.location.pathname.replace(/\/$/, '')
|
|
80
|
+
|
|
78
81
|
// The publication manager class
|
|
79
82
|
// This class is responsible for the publication dialog and for the publication process
|
|
80
83
|
// It is added to the editor instance as editor.PublicationManager
|
|
@@ -167,7 +170,7 @@ export class PublicationManager {
|
|
|
167
170
|
connectorId: connector.connectorId,
|
|
168
171
|
type: connector.type,
|
|
169
172
|
}
|
|
170
|
-
window.open(connector.oauthUrl || `${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${params.connectorId}&type=${params.type}`, '_blank')
|
|
173
|
+
window.open(connector.oauthUrl || `${SERVER_URL}${API_PATH}${API_CONNECTOR_PATH}${API_CONNECTOR_LOGIN}?connectorId=${params.connectorId}&type=${params.type}`, '_blank')
|
|
171
174
|
return new Promise(resolve => {
|
|
172
175
|
const onMessage = async (event) => {
|
|
173
176
|
const data = event.data as ApiConnectorLoggedInPostMessage
|
|
@@ -296,7 +296,7 @@ export default function (config: ServerConfig, opts = {}): Router {
|
|
|
296
296
|
const result = await writeAssets(req['session'], websiteId, files, connectorId)
|
|
297
297
|
|
|
298
298
|
// Base URL of silex serve
|
|
299
|
-
const baseUrl = new URL(config.url).pathname
|
|
299
|
+
const baseUrl = new URL(config.url).pathname.replace(/\/$/, '')
|
|
300
300
|
|
|
301
301
|
// Return the file URLs to insert in the website
|
|
302
302
|
// As expected by grapesjs (https://grapesjs.com/docs/modules/Assets.html#uploading-assets)
|
package/src/ts/server/config.ts
CHANGED
|
@@ -49,7 +49,7 @@ export class ServerConfig extends Config {
|
|
|
49
49
|
}
|
|
50
50
|
public port = process.env.SILEX_PORT
|
|
51
51
|
public debug = process.env.SILEX_DEBUG === 'true'
|
|
52
|
-
public url = process.env.SILEX_URL ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`
|
|
52
|
+
public url = process.env.SILEX_URL?.replace(/\/$/, '') ?? `${process.env.SILEX_PROTOCOL}://${process.env.SILEX_HOST}:${process.env.SILEX_PORT}`
|
|
53
53
|
public userConfigPath: Plugin | undefined = process.env.SILEX_CONFIG
|
|
54
54
|
public configFilePath: Plugin = resolve(__dirname, '../../../.silex.js')
|
|
55
55
|
|