Merge branch 'v2' into feature/update-config

Author: adorton-adobe

examples/config files - basic/connector-adobe-console.yml

@@ -27,9 +27,9 @@ server:
 # client_id and client_secret can be stored in plaintext or can be secured (see below)
 # See https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/sync_from_console.html#integration-settings
 integration:
-  org_id: "Org ID goes here"
   client_id: "Client ID goes here"
   client_secret: "Client secret goes here"
+  org_id: "Org ID goes here"
 
   # NOTE: Credentials can be stored securely with these options
   # secure_client_id_key: my_client_id

examples/config files - basic/connector-umapi.yml

@@ -26,9 +26,9 @@ server:
 # client_id and client_secret can be stored in plaintext or can be secured (see below)
 # See https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/connect_adobe.html#enterprise-settings
 enterprise:
-  org_id: "Org ID goes here"
   client_id: "Client ID goes here"
   client_secret: "Client secret goes here"
+  org_id: "Org ID goes here"
 
   # NOTE: Credentials can be stored securely with these options
   # secure_client_id_key: my_client_id

user_sync/connector/connector_umapi.py

@@ -70,10 +70,14 @@ def __init__(self, name, caller_options, is_primary=False):
         server_builder.set_string_value('host', 'usermanagement.adobe.io')
         server_builder.set_string_value('endpoint', '/v2/usermanagement')
 
-        auth_host_key = 'ims_host' if 'ims_host' in server_config else 'auth_host'
-        server_builder.set_string_value(auth_host_key, 'ims-na1.adobelogin.com')
+        if server_config is None:
+            auth_host_key = 'auth_host'
+            auth_endpoint_key = 'auth_endpoint'
+        else:
+            auth_host_key = 'ims_host' if 'ims_host' in server_config else 'auth_host'
+            auth_endpoint_key = 'ims_endpoint_jwt' if 'ims_endpoint_jwt' in server_config else 'auth_endpoint'
 
-        auth_endpoint_key = 'ims_endpoint_jwt' if 'ims_endpoint_jwt' in server_config else 'auth_endpoint'
+        server_builder.set_string_value(auth_host_key, 'ims-na1.adobelogin.com')
         auth_endpoint_default = '/ims/exchange/jwt'
         if options['authentication_method'] == 'oauth':
             auth_endpoint_default = '/ims/token/v2'

user_sync/connector/directory_adobe_console.py

@@ -60,10 +60,14 @@ def __init__(self, caller_options, *args, **kwargs):
         server_builder.set_string_value('endpoint', '/v2/usermanagement')
         server_builder.set_string_value('ims_endpoint_jwt', '/ims/exchange/jwt')
 
-        auth_host_key = 'ims_host' if 'ims_host' in server_config else 'auth_host'
-        server_builder.set_string_value(auth_host_key, 'ims-na1.adobelogin.com')
+        if server_config is None:
+            auth_host_key = 'auth_host'
+            auth_endpoint_key = 'auth_endpoint'
+        else:
+            auth_host_key = 'ims_host' if 'ims_host' in server_config else 'auth_host'
+            auth_endpoint_key = 'ims_endpoint_jwt' if 'ims_endpoint_jwt' in server_config else 'auth_endpoint'
 
-        auth_endpoint_key = 'ims_endpoint_jwt' if 'ims_endpoint_jwt' in server_config else 'auth_endpoint'
+        server_builder.set_string_value(auth_host_key, 'ims-na1.adobelogin.com')
         auth_endpoint_default = '/ims/exchange/jwt'
         if options['authentication_method'] == 'oauth':
             auth_endpoint_default = '/ims/token/v2'