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

Upgrading satellizer library. (#1031)

This commit is contained in:
kevgliss 2018-01-02 09:12:06 -08:00 committed by GitHub
parent 848ce8c978
commit 9a0ada75fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -26,7 +26,7 @@
"ngletteravatar": "~4.0.0", "ngletteravatar": "~4.0.0",
"bootswatch": "~3.3.6", "bootswatch": "~3.3.6",
"fontawesome": "~4.5.0", "fontawesome": "~4.5.0",
"satellizer": "~0.13.4", "satellizer": "~0.15.5",
"angular-ui-router": "~0.2.15", "angular-ui-router": "~0.2.15",
"font-awesome": "~4.5.0", "font-awesome": "~4.5.0",
"lodash": "~4.0.1", "lodash": "~4.0.1",

72
lemur/auth/views.py
View File

@ -307,41 +307,7 @@ class Ping(Resource):
super(Ping, self).__init__() super(Ping, self).__init__()
def get(self): def get(self):
self.reqparse.add_argument('code', type=str, required=True, location='args') return 'Redirecting...'
args = self.reqparse.parse_args()
# you can either discover these dynamically or simply configure them
access_token_url = current_app.config.get('PING_ACCESS_TOKEN_URL')
user_api_url = current_app.config.get('PING_USER_API_URL')
client_id = current_app.config.get('PING_CLIENT_ID')
redirect_url = current_app.config.get('PING_REDIRECT_URI')
secret = current_app.config.get('PING_SECRET')
id_token, access_token = exchange_for_access_token(
args['code'],
redirect_url,
client_id,
secret,
access_token_url=access_token_url
)
jwks_url = current_app.config.get('PING_JWKS_URL')
validate_id_token(id_token, args['clientId'], jwks_url)
user, profile = retrieve_user(user_api_url, access_token)
roles = create_user_roles(profile)
update_user(user, profile, roles)
if not user.active:
metrics.send('invalid_login', 'counter', 1)
return dict(message='The supplied credentials are invalid'), 403
# Tell Flask-Principal the identity changed
identity_changed.send(current_app._get_current_object(), identity=Identity(user.id))
metrics.send('successful_login', 'counter', 1)
return dict(token=create_token(user))
def post(self): def post(self):
self.reqparse.add_argument('clientId', type=str, required=True, location='json') self.reqparse.add_argument('clientId', type=str, required=True, location='json')
@ -388,41 +354,7 @@ class OAuth2(Resource):
super(OAuth2, self).__init__() super(OAuth2, self).__init__()
def get(self): def get(self):
self.reqparse.add_argument('code', type=str, required=True, location='args') return 'Redirecting...'
args = self.reqparse.parse_args()
# you can either discover these dynamically or simply configure them
access_token_url = current_app.config.get('OAUTH2_ACCESS_TOKEN_URL')
user_api_url = current_app.config.get('OAUTH2_USER_API_URL')
verify_cert = current_app.config.get('OAUTH2_VERIFY_CERT')
secret = current_app.config.get('OAUTH2_SECRET')
id_token, access_token = exchange_for_access_token(
args['code'],
args['redirectUri'],
args['clientId'],
secret,
access_token_url=access_token_url,
verify_cert=verify_cert
)
jwks_url = current_app.config.get('PING_JWKS_URL')
validate_id_token(id_token, args['clientId'], jwks_url)
user, profile = retrieve_user(user_api_url, access_token)
roles = create_user_roles(profile)
update_user(user, profile, roles)
if not user.active:
metrics.send('invalid_login', 'counter', 1)
return dict(message='The supplied credentials are invalid'), 403
# Tell Flask-Principal the identity changed
identity_changed.send(current_app._get_current_object(), identity=Identity(user.id))
metrics.send('successful_login', 'counter', 1)
return dict(token=create_token(user))
def post(self): def post(self):
self.reqparse.add_argument('clientId', type=str, required=True, location='json') self.reqparse.add_argument('clientId', type=str, required=True, location='json')