Added: Changes for Dedi Registry Integration

shreyvishal · shreyvishal · commit 91c4a7b575f1 · 2025-04-23T18:53:20.000+05:30
diff --git a/install/beckn-onix.sh b/install/beckn-onix.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 source scripts/variables.sh
 source scripts/get_container_details.sh
+source scripts/registry_entry.sh
 
 # Function to start a specific service inside docker-compose file
 install_package() {
@@ -130,17 +131,24 @@ install_layer2_config() {
 
 # Function to install BAP Protocol Server
 install_bap_protocol_server() {
-    start_support_services
+    # start_support_services # Start MongoDB, RabbitMQ, and Redis services
+     # POST containers are started, now update the configuration
     if [[ $1 ]]; then
+        # If parameters are provided, use them to update the configuration
         registry_url=$1
         bap_subscriber_id=$2
         bap_subscriber_key_id=$3
         bap_subscriber_url=$4
-        bash scripts/update_bap_config.sh $registry_url $bap_subscriber_id $bap_subscriber_key_id $bap_subscriber_url $api_key $np_domain
+        source scripts/update_bap_config.sh $registry_url $bap_subscriber_id $bap_subscriber_key_id $bap_subscriber_url $api_key "$np_domain"
     else
-        bash scripts/update_bap_config.sh
+        # If no parameters are provided, use the default configuration
+        source scripts/update_bap_config.sh
     fi
+
+    
     sleep 10
+    return
+    
     docker volume create bap_client_config_volume
     docker volume create bap_network_config_volume
     docker run --rm -v $SCRIPT_DIR/../protocol-server-data:/source -v bap_client_config_volume:/target busybox cp /source/bap-client.yml /target/default.yml
@@ -161,6 +169,42 @@ install_bap_protocol_server() {
         install_layer2_config bap-client
         install_layer2_config bap-network
     fi
+
+
+    
+    # Keep trying API call until we get 200 status
+    status_code=0
+    attempt=1
+    max_attempts=5
+    
+    while [ $status_code -ne 200 ] && [ $attempt -le $max_attempts ]; do
+        echo "Attempt $attempt of $max_attempts to verify BAP protocol server..."
+        
+        response=$(curl -s -w "%{http_code}" --location "$bap_subscriber_url/status" \
+            -H "Content-Type: application/json")
+            
+        status_code="${response: -3}"
+        
+        if [ $status_code -eq 200 ]; then
+            echo "${GREEN}BAP protocol server is up and running${NC}"
+            break
+        else
+            echo "${YELLOW}BAP protocol server not ready yet (status: $status_code). Retrying in 5 seconds...${NC}"
+            sleep 5
+            ((attempt++))
+        fi
+    done
+    
+    if [ $status_code -ne 200 ]; then
+        echo "${RED}Failed to verify BAP protocol server after $max_attempts attempts${NC}"
+        exit 1
+    fi
+
+
+    echo "${BLUE}Registering BAP protocol server on the registry${NC}"
+    create_network_participant "$registry_url" "application/json" "$bap_subscriber_id" "$bap_subscriber_key_id" "$bap_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type" "$api_key" "$np_domain"
+
+     
     echo "Protocol server BAP installation successful"
 }
 
@@ -328,29 +372,32 @@ validate_user() {
     echo      # Move to a new line after input
 
     # Replace '/subscribers' with '/login' for validation
-    local login_url="${registry_url%/subscribers}/login"
-
+    local login_url="${registry_url%/subscribers}/auth/local"
+    echo "login_url: $login_url"
+    
     # Validate credentials using a POST request
     local response
-    response=$(curl -s -w "%{http_code}" -X POST "$login_url" \
+    response=$(curl -s -w "%{http_code}" --location "$login_url" \
         -H "Content-Type: application/json" \
-        -d '{ "Name" : "'"$username"'", "Password" : "'"$password"'" }')
-
+        -d '{ "identifier": "'"$username"'", "password": "'"$password"'" }')
+   
+   
     # Check if the HTTP response is 200 (success)
     status_code="${response: -3}"
     if [ "$status_code" -eq 200 ]; then
         response_body="${response%???}"
-        api_key=$(echo "$response_body" | jq -r '.api_key')
+        api_key=$(echo "$response_body" | jq -r '.jwt')
+        echo "api_key: $api_key"
         return 0
     else
-        response=$(curl -s -w "%{http_code}" -X POST "$login_url" \
-            -H "Content-Type: application/json" \
-            -d '{ "User" : { "Name" : "'"$username"'", "Password" : "'"$password"'" }}')
+        response=$(curl -s -w "%{http_code}" --location "$login_url" \
+        -H "Content-Type: application/json" \
+        -d '{ "identifier": "'"$username"'", "password": "'"$password"'" }')
 
         status_code="${response: -3}"
         if [ "$status_code" -eq 200 ]; then
             response_body="${response%???}"
-            api_key=$(echo "$response_body" | jq -r '.api_key')
+            api_key=$(echo "$response_body" | jq -r '.jwt')
             return 0
         fi
     fi
@@ -368,15 +415,18 @@ get_np_domain() {
     if [[ "$dchoice" == "Y" || "$dchoice" == "y" ]]; then
         local login_url="${registry_url%/subscribers}"
         read -p "Enter the domain name for $1 : " np_domain
-        domain_present=$(curl -s -H "ApiKey:$api_key" --header 'Content-Type: application/json' $login_url/network_domains/index | jq -r '.[].name' | tr '\n' ' ')
+        echo "login_url: $login_url/network_domains/index"
+   
+        domain_present=$(curl -s --header 'Content-Type: application/json' $login_url/network_domains | jq -r '.[].name' | tr '\n' ' ')
         if echo "$domain_present" | grep -Fqw "$np_domain"; then
+            echo "The domain '$np_domain' is present in the network domains."
             return 0
         else
             echo "${BoldRed}The domain '$np_domain' is NOT present in the network domains.${NC}"
             echo "${BoldGreen}Available network domains: $domain_present ${NC}"
         fi
     else
-        np_domain=" " #If user don't want to add specific domain then save empty string
+        np_domain="*" #If user don't want to add specific domain then save "*"
         return 0
     fi
 }
@@ -430,31 +480,40 @@ completeSetup() {
         install_gateway $registry_url $gateway_url
         ;;
     "BAP")
+        # Display installation header
         echo "${GREEN}................Installing Protocol Server for BAP................${NC}"
 
+        # Step 1: Get BAP Subscriber ID
         read -p "Enter BAP Subscriber ID: " bap_subscriber_id
+        
+        # Step 2: Get and validate BAP Subscriber URL
         while true; do
             read -p "Enter BAP Subscriber URL: " bap_subscriber_url
             if [[ $bap_subscriber_url =~ ^(http|https):// ]]; then
-                break
+                break # Valid URL format, exit loop
             else
                 echo "${RED}Invalid URL format. Please enter a valid URL starting with http:// or https://.${NC}"
             fi
         done
 
+        # Step 3: Get and validate Registry URL
         while true; do
             read -p "Enter the registry URL (e.g., https://registry.becknprotocol.io/subscribers): " registry_url
-            if [[ $registry_url =~ ^(http|https):// ]] && [[ $registry_url == */subscribers ]]; then
-                break
+            # Check if URL starts with http/https AND ends with /subscribers
+            if [[ $registry_url =~ ^(http|https):// ]]; then
+                break # Valid URL format, exit loop
             else
                 echo "${RED}Invalid URL format. Please enter a valid URL starting with http:// or https://.${NC}"
             fi
         done
+        
+        # Step 4: Validate user credentials
         validate_user
         if [ $? -eq 1 ]; then
             exit
         fi
 
+        # Step 5: Get and validate NP Domain
         get_np_domain $bap_subscriber_id
         if [ $? -eq 1 ]; then
             exit
@@ -464,8 +523,10 @@ completeSetup() {
         public_address=$bap_subscriber_url
 
         layer2_config
-        install_package
+        # install_package
         install_bap_protocol_server $registry_url $bap_subscriber_id $bap_subscriber_key_id $bap_subscriber_url
+      
+       
         ;;
     "BPP")
         echo "${GREEN}................Installing Protocol Server for BPP................${NC}"
diff --git a/install/scripts/generate_keys.sh b/install/scripts/generate_keys.sh
@@ -18,6 +18,12 @@ if [ $? -eq 0 ]; then
     public_key=$(echo "$public_key" | tr -d '[:space:]')
     private_key=$(echo "$private_key" | tr -d '[:space:]')
 
+    # Export public key as global variable
+    # Export both variables
+    export public_key
+    export public_key_global="$public_key"
+    echo "Public Key inside generate_keys.sh: $public_key"
+
 else
     # Print an error message if the script failed
     echo "${RED}Error: Key generation script failed. Please check the script output.${NC}"
diff --git a/install/scripts/registry_entry.sh b/install/scripts/registry_entry.sh
@@ -15,29 +15,41 @@ create_network_participant() {
         type="${10}"
         api_key="${11}"
         np_domain="${12}"
-
+    
     json_data=$(cat <<EOF
         {
             "subscriber_id": "$subscriber_id",
-            "pub_key_id": "$pub_key_id",
-            "unique_key_id": "$pub_key_id",
-            "subscriber_url": "$subscriber_url",
-            "domain": "$np_domain",
-            "extended_attributes": {"domains": []},
-            "encr_public_key": "$encr_public_key",
+            "url": "$subscriber_url",
+            "type": "$type",
+            "domain": "${np_domain}",
+            "location": {
+                "city": {
+                    "name": "Bangalore",
+                    "code": "BLR"
+                },
+                "country": {
+                    "name": "India", 
+                    "code": "IN"
+                }
+            },
+            "key_id": "$pub_key_id",
             "signing_public_key": "$signing_public_key",
+            "encr_public_key": "$encr_public_key",
             "valid_from": "$valid_from",
             "valid_until": "$valid_until",
-            "type": "$type",
-            "country": "IND",
-            "status": "SUBSCRIBED"
-        }
+            "created": "$valid_from",
+            "updated": "$valid_from",
+            "nonce": "$pub_key_id"
+}
+        
 EOF
 )
+    echo "json_data: $json_data"
 
-    response=$(curl --location --request POST "$registry_url/register" \
-    --header "ApiKey:$api_key" --header "Content-Type: $content_type" \
-    --data-raw "$json_data" 2>&1)
+    response=$(curl --location "$registry_url/subscribers/subscribe" \
+    --header "Authorization: Bearer $api_key" \
+    --header "Content-Type: $content_type" \
+    --data "$json_data" 2>&1)
     if [ $? -eq 0 ]; then
         
         echo "${GREEN}Network Participant Entry is created. Please login to registry $registry_url and subscribe you Network Participant.${NC}"
diff --git a/install/scripts/update_bap_config.sh b/install/scripts/update_bap_config.sh
@@ -119,6 +119,8 @@ else
     done
 fi
 
-echo "Registering BAP protocol server on the registry"
 
-create_network_participant "$registry_url" "application/json" "$bap_subscriber_id" "$bap_subscriber_key_id" "$bap_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type" "$api_key" "$np_domain"
+# Commenting out the create_network_participant function call from here as it will be called after the container is started
+# echo "Registering BAP protocol server on the registry"
+
+# create_network_participant "$registry_url" "application/json" "$bap_subscriber_id" "$bap_subscriber_key_id" "$bap_subscriber_url" "$public_key" "$public_key" "$valid_from" "$valid_until" "$type" "$api_key" "$np_domain"
