CyberShell
/
sites-blog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
rob 2 years ago
parent 8f451cad25 1b255d53fb
commit 554209489a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
app/controllers/admin/core-node.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save