Commit ae7c1c42 authored by Afonso Castanheta's avatar Afonso Castanheta
Browse files

Change identifier in Invoker Management for consistency with other services.

parent 032e16a2

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/auth_manager.py

+3 −3
Original line number Original line Diff line number Diff line
@@ -10,15 +10,15 @@ class AuthManager(Resource): 
        cert_col = self.db.get_col_by_name(self.db.certs_col)

        cert_col = self.db.get_col_by_name(self.db.certs_col)





        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())

        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())

        cert_col.insert_one({"cert_signature":cert_encode.signature.hex(), "role":"invoker", "invoker_id": invoker_id, "resources": {}})

        cert_col.insert_one({"cert_signature":cert_encode.signature.hex(), "role":"invoker", "id": invoker_id, "resources": {}})





    def update_auth_invoker(self, cert, invoker_id):

    def update_auth_invoker(self, cert, invoker_id):

        cert_col = self.db.get_col_by_name(self.db.certs_col)

        cert_col = self.db.get_col_by_name(self.db.certs_col)





        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())

        cert_encode = x509.load_pem_x509_certificate(str.encode(cert), default_backend())

        cert_col.find_one_and_update({"invoker_id":invoker_id}, {"$set":{"cert_signature":cert_encode.signature.hex()}})

        cert_col.find_one_and_update({"id":invoker_id}, {"$set":{"cert_signature":cert_encode.signature.hex()}})





    def remove_auth_invoker(self, invoker_id):

    def remove_auth_invoker(self, invoker_id):

        cert_col = self.db.get_col_by_name(self.db.certs_col)

        cert_col = self.db.get_col_by_name(self.db.certs_col)





        cert_col.delete_one({"invoker_id":invoker_id})
 
        cert_col.delete_one({"id":invoker_id})

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/validate_user.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ class ControlAccess(Resource): 
        cert_col = self.db.get_col_by_name(self.db.certs_col)

        cert_col = self.db.get_col_by_name(self.db.certs_col)





        try:

        try:

            my_query = {'invoker_id':api_invoker_id}

            my_query = {'id':api_invoker_id}

            cert_entry = cert_col.find_one(my_query)

            cert_entry = cert_col.find_one(my_query)





            if cert_entry is None:

            if cert_entry is None: