[release-1.8] RHIDP-8118: update variables in authentication docs

modules/authentication/snip-enabling-user-authentication-with-microsoft-azure-common-authentication-provider-steps.adoc

@@ -9,24 +9,24 @@ auth:
   providers:
     microsoft:
       production:
-        clientId: ${AUTHENTICATION_AZURE_CLIENT_ID}
-        clientSecret: ${AUTHENTICATION_AZURE_CLIENT_SECRET}
-        tenantId: ${AUTHENTICATION_AZURE_TENANT_ID}
+        clientId: ${MICROSOFT_CLIENT_ID}
+        clientSecret: ${MICROSOFT_CLIENT_SECRET}
+        tenantId: ${MICROSOFT_TENANT_ID}
 signInPage: microsoft
 ----
 
 `environment`::
 Enter `production` to disable the **Guest** login option in the {product-short} login page.
 
 `clientId`::
-Enter the configured secret variable name:  `$\{AUTHENTICATION_AZURE_CLIENT_ID}`.
+Enter the configured secret variable name:  `$\{MICROSOFT_CLIENT_ID}`.
 
 `clientSecret`::
 Enter the configured secret variable name:
-`$\{AUTHENTICATION_AZURE_CLIENT_SECRET}`.
+`$\{MICROSOFT_CLIENT_SECRET}`.
 
 `tenantId`::
-Enter the configured secret variable name: `$\{AUTHENTICATION_AZURE_TENANT_ID}`.
+Enter the configured secret variable name: `$\{MICROSOFT_TENANT_ID}`.
 
 `signInPage`::
 Enter `microsoft` to set the {azure-short} provider as your {product-short} sign-in provider.

modules/authentication/snip-enabling-user-authentication-with-microsoft-azure-common-first-steps.adoc

@@ -73,13 +73,13 @@ Optional: Enter optional custom scopes for the Microsoft Graph API that you defi
 
 . Add your {azure-short} credentials to {product-short}, by adding the following key/value pairs to {configuring-book-link}#provisioning-your-custom-configuration[your {product-short} secrets]:
 
-`AUTHENTICATION_AZURE_TENANT_ID`::
+`MICROSOFT_TENANT_ID`::
 Enter your saved *Directory (tenant) ID*.
 
-`AUTHENTICATION_AZURE_CLIENT_ID`::
+`MICROSOFT_CLIENT_ID`::
 Enter your saved *Application (client) ID*.
 
-`AUTHENTICATION_AZURE_CLIENT_SECRET`::
+`MICROSOFT_CLIENT_SECRET`::
 Enter your saved *Application (client) secret*.
 
 . Enable the Microsoft Graph catalog provider plugin in your `dynamic-plugins.yaml`
@@ -103,9 +103,9 @@ catalog:
     microsoftGraphOrg:
       providerId:
         target: https://graph.microsoft.com/v1.0
-        tenantId: ${AUTHENTICATION_AZURE_TENANT_ID}
-        clientId: ${AUTHENTICATION_AZURE_CLIENT_ID}
-        clientSecret: ${AUTHENTICATION_AZURE_CLIENT_SECRET}
+        tenantId: ${MICROSOFT_TENANT_ID}
+        clientId: ${MICROSOFT_CLIENT_ID}
+        clientSecret: ${MICROSOFT_CLIENT_SECRET}
         schedule:
           frequency:
             hours: 1
@@ -120,13 +120,13 @@ Enter `\https://graph.microsoft.com/v1.0` to define the MSGraph API endpoint the
 You might change this parameter to use a different version, such as the link:https://learn.microsoft.com/en-us/graph/api/overview?view=graph-rest-beta#call-the-beta-endpoint[beta endpoint].
 
 `tenandId`::
-Enter the configured secret variable name: `$\{AUTHENTICATION_AZURE_TENANT_ID}`.
+Enter the configured secret variable name: `$\{MICROSOFT_TENANT_ID}`.
 
 `clientId`::
-Enter the configured secret variable name: `$\{AUTHENTICATION_AZURE_CLIENT_ID}`.
+Enter the configured secret variable name: `$\{MICROSOFT_CLIENT_ID}`.
 
 `clientSecret`::
-Enter the configured secret variable name: `$\{AUTHENTICATION_AZURE_CLIENT_SECRET}`.
+Enter the configured secret variable name: `$\{MICROSOFT_CLIENT_SECRET}`.
 
 `schedule`::
 

modules/authentication/snip-enabling-user-authentication-with-microsoft-azure-optional-authentication-provider-steps.adoc

@@ -9,10 +9,10 @@ auth:
   providers:
     microsoft:
       production:
-        clientId: ${AUTHENTICATION_AZURE_CLIENT_ID}
-        clientSecret: ${AUTHENTICATION_AZURE_CLIENT_SECRET}
-        tenantId: ${AUTHENTICATION_AZURE_TENANT_ID}
-        domainHint: ${AUTHENTICATION_AZURE_TENANT_ID}
+        clientId: ${MICROSOFT_CLIENT_ID}
+        clientSecret: ${MICROSOFT_CLIENT_SECRET}
+        tenantId: ${MICROSOFT_TENANT_ID}
+        domainHint: ${MICROSOFT_TENANT_ID}
         additionalScopes:
            - Mail.Send
         sessionDuration:

modules/authentication/snip-enabling-user-authentication-with-rhbk-common-first-steps.adoc

@@ -42,6 +42,12 @@ Enter the saved **Client Secret**.
 `KEYCLOAK_BASE_URL`::
 Enter the saved **{rhbk} realm base URL**.
 
+`KEYCLOAK_REALM`::
+Enter the realm name to provision users.
+
+`KEYCLOAK_LOGIN_REALM`::
+Enter the realm name to authenticate users.
+
 . Enable the Keycloak catalog provider plugin in your `dynamic-plugins.yaml` file.
 +
 The plugin is named after {rhbk} upstream project.
@@ -67,8 +73,8 @@ catalog:
         baseUrl: ${KEYCLOAK_BASE_URL}
         clientId: ${KEYCLOAK_CLIENT_ID}
         clientSecret: ${KEYCLOAK_CLIENT_SECRET}
-        realm: master
-        loginRealm: master
+        realm: ${KEYCLOAK_REALM}
+        loginRealm: ${KEYCLOAK_LOGIN_REALM}
 ----
 
 `baseUrl`::
@@ -81,7 +87,7 @@ Enter your {product-short} application client ID in {rhbk}, defined earlier.
 Enter your {product-short} application client secret in {rhbk}, defined earlier.
 
 `realm`::
-Enter the realm name to provision users, such as `master`.
+Enter the realm name to provision users.
 
 `loginRealm`::
-Enter the realm name to authenticate users, such as `master`.
+Enter the realm name to authenticate users.

modules/authentication/snip-enabling-user-authentication-with-rhbk-optional-catalog-provider-steps.adoc

@@ -1,6 +1,6 @@
 :_mod-docs-content-type: SNIPPET
 
-Optional: Add optional fields to the keycloackOrg catalog provider section in your `{my-app-config-file}` file:
+Optional: Add optional fields to the `keycloackOrg` catalog provider section in your `{my-app-config-file}` file:
 
 [source,yaml]
 ----
@@ -11,8 +11,8 @@ catalog:
         baseUrl: ${KEYCLOAK_BASE_URL}
         clientId: ${KEYCLOAK_CLIENT_ID}
         clientSecret: ${KEYCLOAK_CLIENT_SECRET}
-        realm: master
-        loginRealm: master
+        realm: ${KEYCLOAK_REALM}
+        loginRealm: ${KEYCLOAK_LOGIN_REALM}
         userQuerySize: 100
         groupQuerySize: 100
         schedule: