Aerogear 3525 duplicate mobile services section

modules/ROOT/pages/_partials/attributes.adoc

@@ -4,7 +4,7 @@
 
 :release-number: 1.0.0-alpha
 
-:service-name:  
+:service-name:
 
 :mobile-client: Mobile Client
 :mobile-client-openshift: Mobile Client in your OpenShift project
@@ -19,10 +19,11 @@
 :keycloak-service: Identity Management
 :keycloak-ui: Keycloak Admin UI
 :keycloak-dashboard: Auth Dashboard
+:idm-name: Keycloak
 
 // Push Service
 
-:unifiedpush-service: Push Notifications  
+:unifiedpush-service: Push Notifications
 :push-ui: Unified Push Admin UI
 :push-notification: push notification
 

modules/ROOT/pages/_partials/generic-binding.adoc

@@ -8,16 +8,8 @@ NOTE: The association between a {mobile-client} and {service-name} Service uses
 
 To associate a {mobile-client} with a mobile service:
 
-. Navigate to the *Overview* of your OpenShift project.
-
-. Click on the {mobile-client} and navigate to {mobile-client} view.
-+
-NOTE: Your mobile app will be represented by two items in OpenShift, an item in the *{mobile-client}s* list and an item in the *Provisioned Services* list. Make sure to click on the item in the *{mobile-client}s* list.
-
-. Navigate to *Mobile Services* tab.
-
-. Expand the {service-name} Service by clicking the *>* icon.
+include::generic-service-nav.adoc[]
 
 . Click *Create Binding* and follow the *Create Binding* wizard to associate the {mobile-client} with the {service-name} Service.
 
-. Fill out the binding parameters required by the {service-name} Service.
+. Fill out the binding parameters required by the {service-name} Service.

modules/ROOT/pages/_partials/generic-service-nav.adoc

@@ -0,0 +1,11 @@
+include::{partialsdir}/attributes.adoc[]
+
+. Navigate to the *Overview* of your OpenShift project.
+
+. Click on the {mobile-client} and navigate to {mobile-client} view.
++
+NOTE: Your mobile app will be represented by two items in OpenShift, an item in the *{mobile-client}s* list and an item in the *Provisioned Services* list. Make sure to click on the item in the *{mobile-client}s* list.
+
+. Navigate to *Mobile Services* tab.
+
+. Expand the {service-name} Service by clicking the *>* icon.

modules/ROOT/pages/getting-started.adoc

@@ -21,12 +21,14 @@ The following services are available with this release:
 * xref:device-security.adoc[{device-security-service}]
 
 
-This guide introduces the procedures for using mobile services by guiding you through the process for running an Android app using the Identity Management service. 
+This guide introduces the procedures for using mobile services by guiding you through the process for running an Android app using the Identity Management service.
 
 include::keycloak/provisioning.adoc[leveloffset=1]
 [[binding]]
 include::keycloak/binding.adoc[leveloffset=1]
 [[localdev]]
+include::keycloak/keycloak-setup.adoc[leveloffset=2]
+
 == Setting Up your Local Development Environment
 
 === Supported Environments
@@ -38,7 +40,6 @@ In order to perform local development, you will need to have set up a local deve
 * link:https://cordova.apache.org/#getstarted[Cordova]
 * link:https://developer.xamarin.com/getting-started/[Xamarin]
 
-include::keycloak/configuring-dev-env-keycloak.adoc[leveloffset=2]
 [[running]]
 
 == Running your First Mobile App

modules/ROOT/pages/keycloak/configuring-dev-env-keycloak.adoc

@@ -9,6 +9,6 @@ include::{partialsdir}/attributes.adoc[]
 * [x] You have provisioned one of the {product-name} as described in xref:keycloak/provisioning.adoc[Provisioning {service-name} Service].
 * [x] You have associated the service with a {mobile-client} as described in xref:keycloak/binding.adoc[Binding a {mobile-client} with the {service-name} Service].
 
-include::{partialsdir}/generic-obtaining-the-mobile-sdk-config-file.adoc[leveloffset=1]
-
 include::./keycloak-setup.adoc[leveloffset=1]
+
+include::{partialsdir}/generic-obtaining-the-mobile-sdk-config-file.adoc[leveloffset=1]

modules/ROOT/pages/keycloak/keycloak-setup.adoc

@@ -1,10 +1,22 @@
 //include::{partialsdir}/attributes.adoc[]
 
-= Keycloak Setup
+= Configuring the Identity Management Service
 
-The following guide helps you to configure schema of the redirect url and web origin for a client in Keycloak. This is required to use the Auth SDK.
+The following section will guide you through configuring the schema of the redirect url and web origin for a client in {idm-name}. This is required to enable OpenID authentication.
 
-== Choose the schema of a redirect url
+:service-name: Identity Management
+
+include::{partialsdir}/generic-service-nav.adoc[]
+
+. Click on the Realm URL link to open the {idm-name} Administration Console.
+
+. Log in to the Administration console using the credentials you specified at xref:keycloak/provisioning.adoc[Provisioning] (defaults to admin:admin)
+
+. Open `Clients` from the menu.
+
+. Open your Android client.
+
+. Add the schema to `Valid Redirect URIs`.
 
 [role="primary"]
 .Android
@@ -27,11 +39,6 @@ The schema of the redirect url should be `\http://localhost/*`.
 Depending on the platform set the redirect as described in either the Android or the iOS tab.
 ****
 
-== Configuring Keycloak
-
-. Open Keycloak Administration Console by selecting route in OpenShift.
-. Log in to the Administration console using the credentials you specified at xref:keycloak/provisioning.adoc[Provisioning] (defaults to admin:admin)
-. Open `Clients` from the menu.
-. Open your Android client.
-. Add the schema to `Valid Redirect URIs`.
 . Add `*` to `Web Origins`.
+
+. Save your changes.