some changes to auth and group api

api/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from flask import Blueprint
+from flask import Blueprint, abort
 from flask_restplus import Api, Namespace
 
 api_authorizations = {
@@ -40,3 +40,13 @@ from .example_api import *
 from .auth_api import *
 from .user_api import *
 from .group_api import *
+
+
+@api_bp.route('/<path:path>')
+def catch_all_api(path):
+    """
+    Default 404 response for undefined paths in API.
+    :param path:
+    :return:
+    """
+    abort(404)

api/auth_api.py

@@ -136,13 +136,14 @@ def oidc(redirect_url=None):
     return response
 
 
-@auth_api_bp.route('/refresh', methods=['POST'])
+@auth_api_bp.route('/refresh', methods=['GET'])
 @jwt_refresh_token_required
 def refresh():
     """Refresh token endpoint. This will generate a new access token from
     the refresh token, but will mark that access token as non-fresh,
     as we do not actually verify a password in this endpoint."""
     current_user = get_jwt_identity()
+    app.logger.info("Refreshing token for " + current_user)
     new_token = create_access_token(identity=current_user, fresh=False)
     ret = {'access_token': new_token}
     return jsonify(ret), 200

api/group_api.py

@@ -17,8 +17,8 @@ group_model = api_group.model('Group', {
     'id': fields.String(required=False, description='The group\'s identifier'),
     'name': fields.String(required=True, description='The group\'s name'),
     'description': fields.String(required=False, description='The group\'s description'),
-    'users': fields.List(fields.Nested(
-        {'id': fields.Integer(), 'first_name': fields.String(), 'last_name': fields.String()}),
+    'users': fields.List(fields.Nested(api_group.model('group_member',
+        {'id': fields.Integer(), 'first_name': fields.String(), 'last_name': fields.String()})),
         required=False, description='Group members.')
 })
 

api/user_api.py

@@ -17,14 +17,14 @@ from backend.auth import oidc_auth
 from backend.models.user_model import User, Group
 
 
-
 user_model = api_user.model('User', {
     'id': fields.String(required=True, description='The user\'s identifier'),
     'first_name': fields.String(required=True, description='The user\'s first name'),
     'last_name': fields.String(required=True, description='The user\'s last name'),
     'email': fields.String(required=True, description='The user\'s email address'),
     'nickname': fields.String(required=False, description='The user\'s nick name'),
-    'groups': fields.List(fields.Nested({'name': fields.String()}), required=False, description='Group memberships.'),
+    'groups': fields.List(fields.Nested(api_user.model('user_group', {'id':fields.Integer(), 'name': fields.String()})),
+                          required=False, description='Group memberships.'),
 })