diff --git a/helm/capif/charts/ocf-register/templates/configmap.yaml b/helm/capif/charts/ocf-register/templates/configmap.yaml index cf801f40fec9ddef59ea7610477055ac9ff3cb77..0c01aedcddf6b4159a86ea52db051e809155e0b3 100644 --- a/helm/capif/charts/ocf-register/templates/configmap.yaml +++ b/helm/capif/charts/ocf-register/templates/configmap.yaml @@ -18,10 +18,14 @@ data: "port": "{{ .Values.env.vaultPort }}", "token": "{{ .Values.env.vaultAccessToken }}" } + ccf: { + "url": "{{ .Values.env.capifHostname }}", + "helper_remove_user": "/helper/deleteEntities/" + } register: { register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8', refresh_expiration: 30, #days token_expiration: 10, #mins admin_users: {admin_user: "admin", admin_pass: "password123"} - } \ No newline at end of file + } diff --git a/helm/capif/charts/ocf-register/values.yaml b/helm/capif/charts/ocf-register/values.yaml index b9e9e49ca140fa2085b9427043e887ab45a3bc22..5605ef8621f683bd734a5786583c57554c33c045 100644 --- a/helm/capif/charts/ocf-register/values.yaml +++ b/helm/capif/charts/ocf-register/values.yaml @@ -20,6 +20,7 @@ env: vaultHostname: vault vaultPort: 8200 vaultAccessToken: dev-only-token + capifHostname: capif-test.example.int serviceAccount: # Specifies whether a service account should be created diff --git a/services/register/config.yaml b/services/register/config.yaml index f63df9fe95452c0443dce72e8934dc2d4998d8fc..258821ff00ad2d1c094a5989098cadc86ae312b1 100644 --- a/services/register/config.yaml +++ b/services/register/config.yaml @@ -13,10 +13,15 @@ ca_factory: { "token": "dev-only-token" } +ccf: { + "url": "capifcore", + "helper_remove_user": "/helper/deleteEntities/" +} + register: { - register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8', - refresh_expiration: 30, #days - token_expiration: 10, #mins - admin_users: {admin_user: "admin", + "register_uuid": '6ba7b810-9dad-11d1-80b4-00c04fd430c8', + "refresh_expiration": 30, #days + "token_expiration": 10, #mins + "admin_users": {admin_user: "admin", admin_pass: "password123"} } \ No newline at end of file diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index b76d09286d16a0b0e8ab1ca066100f0f6ffb0d55..5082d5152c4c983366d667865bd21e9b85aa593c 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 +from flask import Flask, jsonify, request, Response, current_app from flask_jwt_extended import create_access_token from ..db.db import MongoDatabse from datetime import datetime @@ -63,7 +63,7 @@ class RegisterOperations: try: - url = f"https://capifcore/helper/deleteEntities/{uuid}" + url = f"https://{self.config["ccf"]["url"]}{self.config["ccf"]["helper_remove_user"]}{uuid}" requests.delete(url, cert=("register_service/certs/superadmin.crt", "register_service/certs/superadmin.key"), verify="register_service/certs/ca_root.crt") mycol.delete_one({"uuid": uuid})