change id by placeholder

DecisionsDev · Jan 18, 2024 · 206363c · 206363c
1 parent 0e1a094
commit 206363c
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 37 deletions.
diff --git a/azuread/AzureADProvider.json b/azuread/AzureADProvider.json
@@ -2,11 +2,11 @@
   "providers": [
     {
         "grantType": "password",
-        "authorizationURL": "https://login.microsoftonline.com/00df3463-7019-4488-aa48-b4ae46038334/oauth2/v2.0/authorize",
-        "tokenURL": "https://login.microsoftonline.com/00df3463-7019-4488-aa48-b4ae46038334/oauth2/v2.0/token",
-        "logoutURL": "https://login.microsoftonline.com/00df3463-7019-4488-aa48-b4ae46038334/oauth2/v2.0/logout",
-        "clientId": "b173bdb8-fd2c-4208-aef7-773df33456bb",
-        "scope": "b173bdb8-fd2c-4208-aef7-773df33456bb/.default",
+        "authorizationURL": "https://login.microsoftonline.com/<TENANT_ID>/oauth2/v2.0/authorize",
+        "tokenURL": "https://login.microsoftonline.com/<TENANT_ID>/oauth2/v2.0/token",
+        "logoutURL": "https://login.microsoftonline.com/<TENANT_ID>/oauth2/v2.0/logout",
+        "clientId": "<CLIENT_ID>",
+        "scope": "<CLIENT_ID>/.default",
         "name": "azure_ad"
     }
   ]

diff --git a/azuread/openIdParameters.properties b/azuread/openIdParameters.properties
@@ -1,7 +1,7 @@
-***REMOVED***
-***REMOVED***
-***REMOVED***
-***REMOVED***
-***REMOVED***
-***REMOVED***
-***REMOVED***
+OPENID_SERVER_URL=https://login.microsoftonline.com/<TENANT_ID>
+OPENID_PROVIDER=azure_ad
+OPENID_AUTHORIZATION_URL=https://login.microsoftonline.com/<TENANT_ID>/oauth2/v2.0/authorize
+OPENID_TOKEN_URL=https://login.microsoftonline.com/<TENANT_ID>/oauth2/v2.0/token
+OPENID_CLIENT_ID=<CLIENT_ID>
+OPENID_LOGOUT_URL=https://login.microsoftonline.com/<TENANT_ID>/oauth2/v2.0/logout
+OPENID_ALLOWED_DOMAINS=login.microsoftonline.com,login.w3.ibm.com
diff --git a/azuread/openIdWebSecurity.xml b/azuread/openIdWebSecurity.xml
@@ -1,11 +1,11 @@
 <server>
 
-  <variable name="ServerHost" value="https://login.microsoftonline.com/00df3463-7019-4488-aa48-b4ae46038334"/>
+  <variable name="ServerHost" value="https://login.microsoftonline.com/<TENANT_ID>"/>
 
   <!-- Open ID Connect -->
   <!-- Client with inbound propagation set to supported -->
   <openidConnectClient authFilterRef="browserAuthFilter" id="odm" scope="openid" accessTokenInLtpaCookie="true"
-                       clientId="b173bdb8-fd2c-4208-aef7-773df33456bb" pkceCodeChallengeMethod="S256"
+                       clientId="<CLIENT_ID>" pkceCodeChallengeMethod="S256"
                        signatureAlgorithm="RS256" inboundPropagation="supported"
                        jwkEndpointUrl="${ServerHost}/discovery/v2.0/keys"
                        issuerIdentifier="${ServerHost}/v2.0"
@@ -15,7 +15,7 @@
 
   <!-- Client with inbound propagation set to required -->
   <openidConnectClient authFilterRef="apiAuthFilter" id="odmapi" scope="openid"
-                       clientId="b173bdb8-fd2c-4208-aef7-773df33456bb"
+                       clientId="<CLIENT_ID>"
                        signatureAlgorithm="RS256" inboundPropagation="required"
                        jwkEndpointUrl="${ServerHost}/discovery/v2.0/keys"
                        issuerIdentifier="${ServerHost}/v2.0"

diff --git a/azuread/webSecurity.xml b/azuread/webSecurity.xml
@@ -11,7 +11,7 @@
 
 
 <!-- group mapping to authorize users of the OKTA_ODM_GROUP group -->
-<variable name="group1" value="group:https://login.microsoftonline.com/00df3463-7019-4488-aa48-b4ae46038334/v2.0/1e21bc53-8eed-4b4e-8edd-2d8e2fdc7e27"/>
+<variable name="group1" value="group:https://login.microsoftonline.com/<TENANT_ID>/v2.0/<GROUP_ID>"/>
 
 <variable name="odm.rtsAdministrators.group1" value="${group1}"/>
 <variable name="odm.rtsInstallers.group1" value="${group1}"/>
@@ -21,7 +21,7 @@
 <variable name="odm.resMonitors.group1" value="${group1}"/>
 <variable name="odm.resExecutors.group1" value="${group1}"/>
 
-<variable name="user1" value="user:https://login.microsoftonline.com/00df3463-7019-4488-aa48-b4ae46038334/v2.0/b173bdb8-fd2c-4208-aef7-773df33456bb"/>
+<variable name="user1" value="user:https://login.microsoftonline.com/<TENANT_ID>/v2.0/<CLIENT_ID>"/>
 
 <variable name="odm.resAdministrators.user1" value="${user1}"/>
 <variable name="odm.resDeployers.user1" value="${user1}"/>

diff --git a/iam/OdmOidcProvider.json b/iam/OdmOidcProvider.json
@@ -3,12 +3,12 @@
     {
         "name": "ums",
         "grantType": "password",
-        "authorizationURL": "https://cp-console.apps.9.20.212.178.nip.io/idprovider/v1/auth/authorize",
-        "tokenURL": "https://cp-console.apps.9.20.212.178.nip.io/idprovider/v1/auth/identitytoken",
-        "introspectionURL": "https://cp-console.apps.9.20.212.178.nip.io/idprovider/v1/auth/introspect",
-        "clientId": "ibm-odm-vtt-odm-oidc-client-id",
-        "clientSecret": "ibm-odm-vtt-odm-oidc-client-id-secret-value",
-        "logoutURL": "https://cp-console.apps.9.20.212.178.nip.io/idprovider/v1/auth/logout"
+        "authorizationURL": "https://cp-console.apps.<FYRE_MASTER_IP>.nip.io/idprovider/v1/auth/authorize",
+        "tokenURL": "https://cp-console.apps.<FYRE_MASTER_IP>.nip.io/idprovider/v1/auth/identitytoken",
+        "introspectionURL": "https://cp-console.apps.<FYRE_MASTER_IP>.nip.io/idprovider/v1/auth/introspect",
+        "clientId": "<ODM_OIDC_CLIENT_ID>",
+        "clientSecret": "<>ODM_OIDC_CLIENT_SECRET>",
+        "logoutURL": "https://cp-console.apps.<FYRE_MASTER_IP>.nip.io/idprovider/v1/auth/logout"
     }
   ]
 }
diff --git a/iam/iamclient-delete.sh b/iam/iamclient-delete.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-***REMOVED***
-***REMOVED***
-***REMOVED***
-***REMOVED***
+export admin_username=<oauthAdmin_login>
+export admin_password=<oauthAdmin_password>
+export registration_url=https://cp-console.apps.<fyre_master_ip>.nip.io/idauth/oidc/endpoint/OP/registration
+export OIDC_CLIENT_ID=<ODM_OIDC_CLIENT_ID>
 
 #curl -k -s -X GET -u ${admin_username}:${admin_password} ${registration_url}
 echo "***************"

diff --git a/iam/iamclient-list.sh b/iam/iamclient-list.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-***REMOVED***
-***REMOVED***
-***REMOVED***
-***REMOVED***
+export admin_username=<oauthAdmin_login>
+export admin_password=<oauthAdmin_password>
+export registration_url=https://cp-console.apps.<fyre_master_ip>.nip.io/idauth/oidc/endpoint/OP/registration
+export OIDC_CLIENT_ID=<ODM_OIDC_CLIENT_ID>
 
 #curl -k -s -X GET -u ${admin_username}:${admin_password} ${registration_url}
 echo "***************"

diff --git a/iam/iamclient-update.sh b/iam/iamclient-update.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-***REMOVED***
-***REMOVED***
-export registration_url=https://cp-console.apps.9.20.212.178.nip.io//idauth/oidc/endpoint/OP/registration
-export client_name=icp4aodm-prod-odm-oidc-client-id
-export client_secret=icp4aodm-prod-odm-oidc-client-id-secret-value
-export client_id=icp4aodm-prod-odm-oidc-client-id
+export admin_username=<oauthAdmin_login>
+export admin_password=<oauthAdmin_password>
+export registration_url=https://cp-console.apps.<fyre_master_ip>.nip.io/idauth/oidc/endpoint/OP/registration
+export client_name=<ODM_OIDC_CLIENT_ID>
+export client_secret=ODM_OIDC_CLIENT_SECRET>
+export client_id=<ODM_OIDC_CLIENT_ID>
 
 # Note: the functional_user_id and functional_user_groupIds are the functional user
 # and groups for client_crendetials. This works from 19.0.0.4.