maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-26 06:47:17 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass base url to SDK only if provided

Browse source
This commit is contained in:
Hannu Lyytikainen 2018-11-28 10:03:49 +02:00
parent 08e23c7c83
commit 7177cb37c7
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/csp.js
View file

@ -7,6 +7,7 @@ const unsafeEval = "'unsafe-eval'";
const data = 'data:'; const data = 'data:';
const blob = 'blob:'; const blob = 'blob:';
const devImagesMaybe = dev ? ['*.localhost:8000'] : []; const devImagesMaybe = dev ? ['*.localhost:8000'] : [];
const baseUrl = process.env.REACT_APP_SHARETRIBE_SDK_BASE_URL || 'https://flex-api.sharetribe.com';
// Default CSP whitelist. // Default CSP whitelist.
// //
@ -18,7 +19,7 @@ const defaultDirectives = {
childSrc: [blob], childSrc: [blob],
connectSrc: [ connectSrc: [
self, self,
process.env.REACT_APP_SHARETRIBE_SDK_BASE_URL, baseUrl,
'maps.googleapis.com', 'maps.googleapis.com',
'*.tiles.mapbox.com', '*.tiles.mapbox.com',
'api.mapbox.com', 'api.mapbox.com',

4
server/index.js
View file

@ -167,10 +167,11 @@ app.get('*', (req, res) => {
secure: USING_SSL, secure: USING_SSL,
}); });
const baseUrl = BASE_URL ? { baseUrl: BASE_URL } : {};
const sdk = sharetribeSdk.createInstance({ const sdk = sharetribeSdk.createInstance({
transitVerbose: TRANSIT_VERBOSE, transitVerbose: TRANSIT_VERBOSE,
clientId: CLIENT_ID, clientId: CLIENT_ID,
baseUrl: BASE_URL,
httpAgent: httpAgent, httpAgent: httpAgent,
httpsAgent: httpsAgent, httpsAgent: httpsAgent,
tokenStore, tokenStore,
@ -182,6 +183,7 @@ app.get('*', (req, res) => {
reader: v => new Decimal(v.value), reader: v => new Decimal(v.value),
}, },
], ],
...baseUrl,
}); });
// Until we have a better plan for caching dynamic content and we // Until we have a better plan for caching dynamic content and we

4
src/index.js
View file

@ -77,13 +77,14 @@ if (typeof window !== 'undefined') {
// set up logger with Sentry DSN client key and environment // set up logger with Sentry DSN client key and environment
log.setup(); log.setup();
const baseUrl = config.sdk.baseUrl ? { baseUrl: config.sdk.baseUrl } : {};
// eslint-disable-next-line no-underscore-dangle // eslint-disable-next-line no-underscore-dangle
const preloadedState = window.__PRELOADED_STATE__ || '{}'; const preloadedState = window.__PRELOADED_STATE__ || '{}';
const initialState = JSON.parse(preloadedState, sdkTypes.reviver); const initialState = JSON.parse(preloadedState, sdkTypes.reviver);
const sdk = createInstance({ const sdk = createInstance({
transitVerbose: config.sdk.transitVerbose, transitVerbose: config.sdk.transitVerbose,
clientId: config.sdk.clientId, clientId: config.sdk.clientId,
baseUrl: config.sdk.baseUrl,
secure: config.usingSSL, secure: config.usingSSL,
typeHandlers: [ typeHandlers: [
{ {
@ -93,6 +94,7 @@ if (typeof window !== 'undefined') {
reader: v => new Decimal(v.value), reader: v => new Decimal(v.value),
}, },
], ],
...baseUrl,
}); });
const analyticsHandlers = setupAnalyticsHandlers(); const analyticsHandlers = setupAnalyticsHandlers();
const store = configureStore(initialState, sdk, analyticsHandlers); const store = configureStore(initialState, sdk, analyticsHandlers);