extract correct entity id for ukamf metadata

GitOrigin-RevId: 4cb1d7f6e5636bbed77c4279d7d7704ab9b9ab77

services/web/scripts/ukamf/metadata-processor.js

@@ -30,7 +30,7 @@ async function main() {
   const samlConfig = entity.getSamlConfig()
 
   console.log(`UPDATE universities SET
-  sso_entity_id = '${entityId}',
+  sso_entity_id = '${samlConfig.entityId}',
   sso_entry_point = '${samlConfig.entryPoint}',
   sso_cert = '${samlConfig.cert}',
   sso_user_id_attribute = 'eduPersonPrincipalName',

services/web/scripts/ukamf/ukamf-db.js

@@ -22,7 +22,7 @@ class UKAMFDB {
     const entity = this.entities.find(
       matcher instanceof RegExp
         ? e => e.$.entityID.match(matcher)
-        : e => e.$.entityID === matcher
+        : e => e.$.entityID.includes(matcher)
     )
     return entity ? new UKAMFEntity(entity) : null
   }

services/web/scripts/ukamf/ukamf-entity.js

@@ -11,6 +11,7 @@ class UKAMFEntity {
     const idp = this.data.IDPSSODescriptor[0]
     const keys = idp.KeyDescriptor
     const signingKey = keys.find(key => _.get(key, ['$', 'use']) === 'signing')
+    const entityId = this.data.$.entityID
 
     let cert = _.get(signingKey, [
       'ds:KeyInfo',
@@ -37,6 +38,7 @@ class UKAMFEntity {
 
     return {
       cert,
+      entityId,
       entryPoint
     }
   }