diff --git a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py index eb047f064d5012bd8fc5743ff0e4d358ca075298..52174b1eee09160d184a65d3d412954f187240db 100644 --- a/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py +++ b/services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/controllers/default_controller.py @@ -43,5 +43,4 @@ def access_control_policy_list_service_api_id_get(service_api_id, aef_id, api_in :rtype: Union[AccessControlPolicyList, Tuple[AccessControlPolicyList, int], Tuple[AccessControlPolicyList, int, Dict[str, str]] """ current_app.logger.debug("Obtaining service ACLs") - #current_app.logger.debug(f"AEF-id: {service_api_id}") return accessControlPolicyApi().get_acl(service_api_id, aef_id, api_invoker_id, supported_features) diff --git a/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py index 45ec5184b5dee5a886ddbe16fa3f00eeb5172a57..04d893edc45aa4b477a123755a4aeb1d36c05868 100644 --- a/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py +++ b/services/TS29222_CAPIF_Security_API/capif_security/core/validate_user.py @@ -3,7 +3,7 @@ import json from ..models.problem_details import ProblemDetails from ..encoder import JSONEncoder from .resources import Resource -from .responses import internal_server_error +from .responses import internal_server_error,serialize_clean_camel_case class ControlAccess(Resource): @@ -18,6 +18,7 @@ class ControlAccess(Resource): if cert_entry is not None: if cert_entry["cert_signature"] != cert_signature: prob = ProblemDetails(title="Unauthorized", detail="User not authorized", cause="You are not the owner of this resource") + prob = serialize_clean_camel_case(prob) return Response(json.dumps(prob, cls=JSONEncoder), status=401, mimetype="application/json") except Exception as e: diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index 9d4bd9317d7192c1e5f2e33f1062148971490b1f..42627fd304b30322ee27a112405a5a5a2bc1da3d 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -1,4 +1,4 @@ -from flask import Flask, jsonify, request, Response, current_app +from flask import jsonify, current_app from flask_jwt_extended import create_access_token from db.db import MongoDatabse from datetime import datetime @@ -28,7 +28,7 @@ class RegisterOperations: user_info["uuid"] = user_uuid user_info["onboarding_date"]=datetime.now() - obj = mycol.insert_one(user_info) + mycol.insert_one(user_info) current_app.logger.debug(f"User with uuid {user_uuid} and username {user_info["username"]} registered successfully") @@ -43,8 +43,8 @@ class RegisterOperations: exist_user = mycol.find_one({"username": username}) if exist_user is None: - current_app.logger.debug(f"Not exister user with this credentials : {username}") - return jsonify("Not exister user with this credentials"), 400 + current_app.logger.debug(f"No user exists with these credentials: {username}") + return jsonify("No user exists with these credentials"), 400 access_token = create_access_token(identity=(username + " " + exist_user["uuid"])) current_app.logger.debug(f"Access token generated for user {username} : {access_token}") diff --git a/tests/resources/common.resource b/tests/resources/common.resource index d4733b8ee4e12ac5477501b1e1c0ffab4a09f79d..b2f19ae673b2ee2eb0008d215707a93c0f1c1f5f 100644 --- a/tests/resources/common.resource +++ b/tests/resources/common.resource @@ -32,6 +32,8 @@ ${CAPIF_CALLBACK_PORT} 8086 ${REGISTER_ADMIN_USER} admin ${REGISTER_ADMIN_PASSWORD} password123 +${REQUESTS_TIMEOUT} 120s + ${MOCK_SERVER_URL} diff --git a/tests/resources/common/basicRequests.robot b/tests/resources/common/basicRequests.robot index 433a13cd74e3fb02a1333d812c9d5679a7b16b36..6d4f4569592e1685ec9b72554b9849f368db0082 100644 --- a/tests/resources/common/basicRequests.robot +++ b/tests/resources/common/basicRequests.robot @@ -84,7 +84,7 @@ Create Register Admin Session ## NEW REQUESTS TO REGISTER Post Request Admin Register - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -114,7 +114,7 @@ Post Request Admin Register RETURN ${resp} Get Request Admin Register - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE} @@ -142,7 +142,7 @@ Get Request Admin Register # NEW REQUESTS END Post Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -172,7 +172,7 @@ Post Request Capif RETURN ${resp} Get Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE} @@ -198,7 +198,7 @@ Get Request Capif RETURN ${resp} Get CA Vault - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE} @@ -225,7 +225,7 @@ Get CA Vault RETURN ${response} Put Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -254,7 +254,7 @@ Put Request Capif RETURN ${resp} Patch Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${json}=${NONE} @@ -283,7 +283,7 @@ Patch Request Capif RETURN ${resp} Delete Request Capif - [Timeout] 60s + [Timeout] ${REQUESTS_TIMEOUT} [Arguments] ... ${endpoint} ... ${server}=${NONE}