Skip to content

Commit

Permalink
Updated member lib/auth service to use origin of site url (#10271)
Browse files Browse the repository at this point in the history
no-issue
  • Loading branch information
allouis committed Dec 11, 2018
1 parent ba087a1 commit 5cb0534
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions core/server/services/auth/members/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
const URL = require('url').URL;
const jwt = require('express-jwt');
const membersService = require('../../members');
const labs = require('../../labs');
const config = require('../../../config');

const siteOrigin = new URL(config.get('url')).origin;

let UNO_MEMBERINO;

module.exports = {
Expand All @@ -16,8 +19,8 @@ module.exports = {
UNO_MEMBERINO = jwt({
credentialsRequired: false,
requestProperty: 'member',
audience: config.get('url'),
issuer: config.get('url'),
audience: siteOrigin,
issuer: siteOrigin,
algorithm: 'RS512',
secret: membersService.api.publicKey,
getToken(req) {
Expand Down
7 changes: 5 additions & 2 deletions core/server/services/members/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@ const publicKey = settingsCache.get('members_public_key');
const privateKey = settingsCache.get('members_private_key');
const sessionSecret = settingsCache.get('members_session_secret');
const passwordResetUrl = config.get('url');
const issuer = config.get('url');
const ssoOrigin = new URL(config.get('url')).origin;

const siteOrigin = new URL(config.get('url')).origin;

const issuer = siteOrigin;
const ssoOrigin = siteOrigin;
let mailer;

function sendEmail(member, {token}) {
Expand Down

0 comments on commit 5cb0534

Please sign in to comment.