Skip to content
This repository was archived by the owner on Oct 1, 2022. It is now read-only.

Commit 3cad1cf

Browse files
committed
Can't store TransformRequest.submitted_by when user mgmt is disabled due to fkey constraint
1 parent 7842b72 commit 3cad1cf

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

servicex/resources/users/token_refresh.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828

29+
from flask import current_app
2930
from flask_restful import Resource
3031
from flask_jwt_extended import (create_access_token, get_raw_jwt, decode_token,
3132
jwt_refresh_token_required, get_jwt_identity)
@@ -35,11 +36,12 @@
3536
class TokenRefresh(Resource):
3637
@jwt_refresh_token_required
3738
def post(self):
38-
user = UserModel.find_by_sub(get_jwt_identity())
39-
claims = get_raw_jwt()
40-
decoded = decode_token(user.refresh_token)
41-
if not claims['jti'] == decoded['jti']:
42-
return {'message': 'Invalid or outdated refresh token'}, 401
39+
if not current_app.config.get('DISABLE_USER_MGMT'):
40+
user = UserModel.find_by_sub(get_jwt_identity())
41+
claims = get_raw_jwt()
42+
decoded = decode_token(user.refresh_token)
43+
if not claims['jti'] == decoded['jti']:
44+
return {'message': 'Invalid or outdated refresh token'}, 401
4345
current_user = get_jwt_identity()
4446
access_token = create_access_token(identity=current_user)
4547
return {'access_token': access_token}

tests/resources/test_submit_transformation_request.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ def test_submit_transformation_with_title(self, client):
331331
title = "Things Fall Apart"
332332
request = self._generate_transformation_request(title=title)
333333
response = client.post('/servicex/transformation', json=request)
334+
334335
assert response.status_code == 200
335336
request_id = response.json['request_id']
336337
with client.application.app_context():

0 commit comments

Comments
 (0)