pr comments

Author: taraepp

services/core-api/app/api/users/minespace/resources/minespace_user.py

@@ -17,11 +17,9 @@
 
 class MinespaceUserListResource(Resource, UserMixin):
     parser = reqparse.RequestParser(trim=True)
-    parser.add_argument('bceid_username', type=str, location='json', required=True)
     parser.add_argument('mine_guids', type=list, location='json', required=True)
 
     @api.doc(params={
-        'bceid_username': 'find by bceid, this will return a list with at most one element',
         'mine_guid': 'find by mine guid, this will return all users with access to the specified mine'
     })
     @api.marshal_with(MINESPACE_USER_MODEL, envelope='records')
@@ -32,9 +30,6 @@ def get(self):
 
         if not is_admin and mine_guid is None:
             raise BadRequest("mine_guid is a required argument")
-        
-        if request.args.get('bceid_username'):
-            ms_users = [MinespaceUser.find_by_username(request.args.get('bceid_username'))]
         elif mine_guid:
             mine = Mine.find_by_mine_guid(mine_guid)
             if not mine:

services/core-api/app/api/users/resources/user_resource.py

@@ -25,24 +25,14 @@ def get(self):
         try:
             # Extract token information
             if is_minespace_user():
-                # bceid given/family name may be combined
-                given_name = user_info.get("given_name", "")
-                family_name = user_info.get("family_name", "")
-                display_name = user_info.get("display_name", "")
-
                 bceid_username_data = user_info.get("bceid_username", None)
                 bceid_username = bceid_username_data + "@bceid" if bceid_username_data is not None else ""
 
-                if given_name == display_name and family_name == "":
-                    name = display_name.split()
-                    given_name = name[0] if len(name) > 0 else ""
-                    family_name = name[1] if len(name) > 1 else ""
-
                 user_data = {
                     "sub": user_info.get("sub"),
                     "email": user_info.get("email", ""),
-                    "given_name": given_name,
-                    "family_name": family_name,
+                    "given_name": user_info.get("given_name", ""),
+                    "family_name": user_info.get("family_name", ""),
                     "display_name": user_info.get("display_name", ""),
                     "bceid_username": bceid_username,
                     "identity_provider": user_info.get("identity_provider", ""),
@@ -51,7 +41,6 @@ def get(self):
                 }
 
                 user = MinespaceUser.update_from_token_data(**user_data)
-                print(user)
 
             else:    
                 user_data = {