Move Invoker Management API from testing to production server, remove unnecessary imports (d140ad20) · Commits · OCF / capif

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/main.py→services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py

+6 −15

Original line number	Diff line number	Diff line
		@@ -2,13 +2,10 @@

		import connexion
		import logging
		from api_invoker_management import encoder

		from flask import Flask, jsonify, request
		import encoder
		from flask_jwt_extended import JWTManager, jwt_required, create_access_token
		from pymongo import MongoClient
		from .config import Config
		from .core.consumer_messager import Subscriber
		from config import Config
		from core.consumer_messager import Subscriber
		from logging.handlers import RotatingFileHandler
		import os
		from fluent import sender
		@@ -23,12 +20,6 @@ from opentelemetry.sdk.trace.export import BatchSpanProcessor
		from opentelemetry.instrumentation.redis import RedisInstrumentor



		import sys
		import uuid



		NAME = "Invoker-Service"

		def configure_monitoring(app, config):
		@@ -146,7 +137,7 @@ subscriber = Subscriber()
		def create_listener_message():
		executor.submit(subscriber.listen)

		if __name__ == '__main__':
		import logging
		app.run(debug=True, port=8080)
		# if __name__ == '__main__':
		# import logging
		# app.run(debug=True, port=8080)

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/config.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ import os
		class Config:
		def __init__(self):
		self.cached = 0
		self.file="./config.yaml"
		self.file="../config.yaml"
		self.my_config = {}

		stamp = os.stat(self.file).st_mtime

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py

+1 −4

Original line number	Diff line number	Diff line
		import connexion

		from api_invoker_management.models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # noqa: E501
		from ..models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # noqa: E501
		from ..core.apiinvokerenrolmentdetails import InvokerManagementOperations
		from ..core.validate_user import ControlAccess

		import json
		from flask import Response, request, current_app
		from flask_jwt_extended import jwt_required, get_jwt_identity
		from ..encoder import JSONEncoder
		from ..models.problem_details import ProblemDetails
		from cryptography import x509
		from cryptography.hazmat.backends import default_backend
		from ..core.publisher import Publisher

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py

+5 −4

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ from .responses import bad_request_error, not_found_error, forbidden_error, inte
		from flask import current_app, Flask, Response
		import json
		from datetime import datetime
		from ..util import dict_to_camel_case
		from ..util import dict_to_camel_case, clean_empty
		from .auth_manager import AuthManager
		from .resources import Resource
		from ..config import Config
		@@ -73,7 +73,6 @@ class InvokerManagementOperations(Resource):
		api_invoker_id = 'INV'+str(secrets.token_hex(15))
		cert = self.__sign_cert(apiinvokerenrolmentdetail.onboarding_information.api_invoker_public_key, api_invoker_id)


		apiinvokerenrolmentdetail.api_invoker_id = api_invoker_id
		current_app.logger.debug(cert)
		apiinvokerenrolmentdetail.onboarding_information.api_invoker_certificate = cert['data']['certificate']
		@@ -91,7 +90,7 @@ class InvokerManagementOperations(Resource):

		self.auth_manager.add_auth_invoker(cert['data']['certificate'], api_invoker_id)

		res = make_response(object=apiinvokerenrolmentdetail, status=201)
		res = make_response(object=dict_to_camel_case(clean_empty(apiinvokerenrolmentdetail.to_dict())), status=201)
		res.headers['Location'] = "/api-invoker-management/v1/onboardedInvokers/" + str(api_invoker_id)
		return res

		@@ -129,7 +128,9 @@ class InvokerManagementOperations(Resource):

		current_app.logger.debug("Invoker Resource inserted in database")

		res = make_response(object=APIInvokerEnrolmentDetails().from_dict(dict_to_camel_case(result)), status=200)
		invoker_updated = APIInvokerEnrolmentDetails().from_dict(dict_to_camel_case(result))

		res = make_response(object=dict_to_camel_case(clean_empty(invoker_updated.to_dict())), status=200)
		return res

		except Exception as e:

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py

+0 −2

Original line number	Diff line number	Diff line

		from flask import current_app
		from cryptography import x509
		from cryptography.hazmat.backends import default_backend
		from .resources import Resource