Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into add_metrics_reissue_rotate

This commit is contained in:
Curtis 2019-05-08 07:48:44 -07:00 committed by GitHub
parent 87470602fd 9cfdf55d9e
commit c9c782684d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gulp/server.js
View File

@ -6,31 +6,31 @@ var browserSync = require('browser-sync');
var httpProxy = require('http-proxy'); var httpProxy = require('http-proxy');
/* This configuration allow you to configure browser sync to proxy your backend */ /* This configuration allow you to configure browser sync to proxy your backend */
/*
var proxyTarget = 'http://localhost/context/'; // The location of your backend var proxyTarget = 'http://localhost:8000/'; // The location of your backend
var proxyApiPrefix = 'api'; // The element in the URL which differentiate between API request and static file request var proxyApiPrefix = '/api/'; // The element in the URL which differentiate between API request and static file request
var proxy = httpProxy.createProxyServer({ var proxy = httpProxy.createProxyServer({
target: proxyTarget target: proxyTarget
}); });
function proxyMiddleware(req, res, next) { function proxyMiddleware(req, res, next) {
if (req.url.indexOf(proxyApiPrefix) !== -1) { if (req.url.indexOf(proxyApiPrefix) !== -1) {
proxy.web(req, res); proxy.web(req, res);
} else { } else {
next(); next();
}
} }
}
*/
function browserSyncInit(baseDir, files, browser) { function browserSyncInit(baseDir, files, browser) {
browser = browser === undefined ? 'default' : browser; browser = browser === undefined ? 'default' : browser;
browserSync.instance = browserSync.init(files, { browserSync.instance = browserSync.init(files, {
startPath: '/index.html', startPath: '/index.html',
server: { server: {
baseDir: baseDir, middleware: [proxyMiddleware],
routes: { baseDir: baseDir,
'/bower_components': './bower_components' routes: {
} '/bower_components': './bower_components'
}
}, },
browser: browser, browser: browser,
ghostMode: false ghostMode: false

9
lemur/auth/views.py
View File

@ -343,8 +343,9 @@ class Ping(Resource):
) )
jwks_url = current_app.config.get('PING_JWKS_URL') jwks_url = current_app.config.get('PING_JWKS_URL')
validate_id_token(id_token, args['clientId'], jwks_url) error_code = validate_id_token(id_token, args['clientId'], jwks_url)
if error_code:
return error_code
user, profile = retrieve_user(user_api_url, access_token) user, profile = retrieve_user(user_api_url, access_token)
roles = create_user_roles(profile) roles = create_user_roles(profile)
update_user(user, profile, roles) update_user(user, profile, roles)
@ -392,7 +393,9 @@ class OAuth2(Resource):
) )
jwks_url = current_app.config.get('PING_JWKS_URL') jwks_url = current_app.config.get('PING_JWKS_URL')
validate_id_token(id_token, args['clientId'], jwks_url) error_code = validate_id_token(id_token, args['clientId'], jwks_url)
if error_code:
return error_code
user, profile = retrieve_user(user_api_url, access_token) user, profile = retrieve_user(user_api_url, access_token)
roles = create_user_roles(profile) roles = create_user_roles(profile)