Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

master
rob 2 years ago
commit 554209489a

@ -45,15 +45,15 @@ class CoreNodeController extends SiteController {
}
const CORE_SCHEME = process.env.DTP_CORE_AUTH_SCHEME || 'https';
res.locals.siteConfig = Object.assign({ }, this.dtp.config.site);
const siteConfig = Object.assign({ }, this.dtp.config.site);
if (req.body.callbackUri) {
res.locals.siteConfig.coreAuth.callbackUrl = `${CORE_SCHEME}://${this.dtp.config.site.domain}${req.body.callbackUri}`;
this.log.info('registering with custom callback URL', { callbackUrl: res.locals.siteConfig.coreAuth.callbackUrl });
siteConfig.coreAuth.callbackUrl = `${CORE_SCHEME}://${this.dtp.config.site.domain}${req.body.callbackUri}`;
this.log.info('registering with custom callback URL', { callbackUrl: siteConfig.coreAuth.callbackUrl });
} else {
const callbackUri = `/auth/core/${res.locals.core._id}/callback`;
res.locals.siteConfig.coreAuth.callbackUrl = `${CORE_SCHEME}://${this.dtp.config.site.domain}${callbackUri}`;
this.log.info('registering with standard callback URL', { callbackUrl: res.locals.siteConfig.coreAuth.callbackUrl });
siteConfig.coreAuth.callbackUrl = `${CORE_SCHEME}://${this.dtp.config.site.domain}${callbackUri}`;
this.log.info('registering with standard callback URL', { callbackUrl: siteConfig.coreAuth.callbackUrl });
}
try {
@ -63,7 +63,7 @@ class CoreNodeController extends SiteController {
tokenized: true,
body: {
version: this.dtp.pkg.version,
site: res.locals.siteConfig,
site: siteConfig,
},
});

Loading…
Cancel
Save