Commit 4397138f authored by Andres Anaya Amariels's avatar Andres Anaya Amariels 🚀
Browse files

Merge branch 'OCF46-hardcoded-url' into 'staging' 

fix

See merge request !32
parents 380c918a fa88d4a4

helm/capif/charts/ocf-register/templates/configmap.yaml

+5 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,10 @@ data: 
      "port": "{{ .Values.env.vaultPort }}",

      "port": "{{ .Values.env.vaultPort }}",

      "token": "{{ .Values.env.vaultAccessToken }}"

      "token": "{{ .Values.env.vaultAccessToken }}"

    }

    }

    ccf: {

      "url": "{{ .Values.env.capifHostname }}",

      "helper_remove_user": "/helper/deleteEntities/"

    }

    register: {

    register: {

      register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8',

      register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8',

      refresh_expiration: 30, #days

      refresh_expiration: 30, #days

helm/capif/charts/ocf-register/values.yaml

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ env: 
  vaultHostname: vault

  vaultHostname: vault

  vaultPort: 8200

  vaultPort: 8200

  vaultAccessToken: dev-only-token

  vaultAccessToken: dev-only-token

  capifHostname: capif-test.example.int





serviceAccount:

serviceAccount:

  # Specifies whether a service account should be created

  # Specifies whether a service account should be created

services/register/config.yaml

+9 −4
Original line number Original line Diff line number Diff line
@@ -13,10 +13,15 @@ ca_factory: { 
  "token": "dev-only-token"

  "token": "dev-only-token"

}

}





ccf: {

  "url": "capifcore",

  "helper_remove_user": "/helper/deleteEntities/"

}



register: {

register: {

  register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8',

  "register_uuid": '6ba7b810-9dad-11d1-80b4-00c04fd430c8',

  refresh_expiration: 30, #days

  "refresh_expiration": 30, #days

  token_expiration: 10, #mins

  "token_expiration": 10, #mins

  admin_users: {admin_user: "admin",

  "admin_users": {admin_user: "admin",

                admin_pass: "password123"}

                admin_pass: "password123"}

}
 
}
 
 No newline at end of file

services/register/register_service/core/register_operations.py

+2 −2
Original line number Original line Diff line number Diff line 
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 flask_jwt_extended import create_access_token

from ..db.db import MongoDatabse

from ..db.db import MongoDatabse

from datetime import datetime

from datetime import datetime
@@ -63,7 +63,7 @@ class RegisterOperations: 




        try:

        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")

            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})

            mycol.delete_one({"uuid": uuid})