Defining logout_uri for OAuth clients

ECOM-4678

playbooks/roles/credentials/defaults/main.yml

@@ -48,6 +48,7 @@ CREDENTIALS_CACHES:
 CREDENTIALS_DJANGO_SETTINGS_MODULE: "credentials.settings.production"
 CREDENTIALS_DOMAIN: 'credentials'
 CREDENTIALS_URL_ROOT: 'http://{{ CREDENTIALS_DOMAIN }}:18150'
+CREDENTIALS_LOGOUT_URL: '{{ CREDENTIALS_URL_ROOT }}/accounts/logout/'
 CREDENTIALS_OAUTH_URL_ROOT: '{{ EDXAPP_LMS_ROOT_URL | default("http://127.0.0.1:8000") }}/oauth2'
 CREDENTIALS_OIDC_LOGOUT_URL: '{{ EDXAPP_LMS_ROOT_URL | default("http://127.0.0.1:8000") }}/logout'
 

playbooks/roles/discovery/defaults/main.yml

@@ -54,6 +54,7 @@ DISCOVERY_CACHES:
 DISCOVERY_VERSION: "master"
 DISCOVERY_DJANGO_SETTINGS_MODULE: "course_discovery.settings.production"
 DISCOVERY_URL_ROOT: 'http://discovery:18381'
+DISCOVERY_LOGOUT_URL: '{{ DISCOVERY_URL_ROOT }}/logout/'
 DISCOVERY_OAUTH_URL_ROOT: '{{ EDXAPP_LMS_ROOT_URL | default("http://127.0.0.1:8000") }}/oauth2'
 DISCOVERY_OIDC_LOGOUT_URL: '{{ EDXAPP_LMS_ROOT_URL | default("http://127.0.0.1:8000") }}/logout'
 

playbooks/roles/ecommerce/defaults/main.yml

@@ -42,6 +42,7 @@ ECOMMERCE_TIME_ZONE: 'UTC'
 ECOMMERCE_LANGUAGE_CODE: 'en-us'
 ECOMMERCE_EDX_API_KEY: 'PUT_YOUR_API_KEY_HERE'  # This should match the value set for edxapp
 ECOMMERCE_ECOMMERCE_URL_ROOT: 'http://localhost:8002'
+ECOMMERCE_LOGOUT_URL: '{{ ECOMMERCE_ECOMMERCE_URL_ROOT }}/logout/'
 ECOMMERCE_LMS_URL_ROOT: 'http://127.0.0.1:8000'
 ECOMMERCE_JWT_SECRET_KEY: '{{ EDXAPP_JWT_SECRET_KEY | default("lms-secret") }}'
 ECOMMERCE_JWT_ALGORITHM: 'HS256'

playbooks/roles/insights/defaults/main.yml

@@ -17,6 +17,7 @@ INSIGHTS_BASE_URL: 'http://127.0.0.1:8110'
 INSIGHTS_MEMCACHE: [ '127.0.0.1:11211' ]
 INSIGHTS_FEEDBACK_EMAIL: 'dashboard@example.com'
 INSIGHTS_MKTG_BASE: 'http://example.com'
+INSIGHTS_LOGOUT_URL: '{{ INSIGHTS_MKTG_BASE }}/accounts/logout/'
 INSIGHTS_PRIVACY_POLICY_URL: '{{ INSIGHTS_MKTG_BASE }}/privacy-policy'
 INSIGHTS_TERMS_OF_SERVICE_URL: '{{ INSIGHTS_MKTG_BASE }}/terms-service'
 # Delete the 'INSIGHTS_SUPPORT_URL' once the release will out for 'INSIGHTS_SUPPORT_EMAIL'

playbooks/roles/oauth_client_setup/defaults/main.yml

@@ -21,25 +21,36 @@ oauth_client_setup_oauth2_clients:
         name: "{{ ecommerce_service_name | default('None') }}",
         url_root: "{{ ECOMMERCE_ECOMMERCE_URL_ROOT }}",
         id: "{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY }}", 
-        secret: "{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET }}" 
+        secret: "{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET }}",
+        logout_uri: "{{ ECOMMERCE_LOGOUT_URL }}"
       }
     - {
         name: "{{ INSIGHTS_OAUTH2_APP_CLIENT_NAME | default('None') }}",
         url_root: "{{ INSIGHTS_BASE_URL }}",
         id: "{{ INSIGHTS_OAUTH2_KEY }}",
-        secret: "{{ INSIGHTS_OAUTH2_SECRET }}" 
+        secret: "{{ INSIGHTS_OAUTH2_SECRET }}",
+        logout_uri: "{{ INSIGHTS_LOGOUT_URL }}"
       }
     - {
         name: "{{ programs_service_name | default('None') }}",
         url_root: "{{ PROGRAMS_URL_ROOT }}",
         id: "{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY }}",
-        secret: "{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}"
+        secret: "{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}",
+        logout_uri: "{{ PROGRAMS_LOGOUT_URL }}"
       }
     - {
         name: "{{ credentials_service_name | default('None') }}",
         url_root: "{{ CREDENTIALS_URL_ROOT }}",
         id: "{{ CREDENTIALS_SOCIAL_AUTH_EDX_OIDC_KEY }}",
-        secret: "{{ CREDENTIALS_SOCIAL_AUTH_EDX_OIDC_SECRET }}"
+        secret: "{{ CREDENTIALS_SOCIAL_AUTH_EDX_OIDC_SECRET }}",
+        logout_uri: "{{ CREDENTIALS_LOGOUT_URL }}"
+      }
+    - {
+        name: "{{ discovery_service_name | default('None') }}",
+        url_root: "{{ DISCOVERY_URL_ROOT }}",
+        id: "{{ DISCOVERY_SOCIAL_AUTH_EDX_OIDC_KEY }}",
+        secret: "{{ DISCOVERY_SOCIAL_AUTH_EDX_OIDC_SECRET }}",
+        logout_uri: "{{ DISCOVERY_LOGOUT_URL }}"
       }
 
 #

playbooks/roles/oauth_client_setup/tasks/main.yml

@@ -32,6 +32,7 @@
     --client_id {{ item.id }}
     --client_secret {{ item.secret }}
     --trusted
+    --logout_uri {{ item.logout_uri | default("") }}
   become_user: "{{ edxapp_user }}"
   environment: "{{ edxapp_environment }}"
   with_items: oauth_client_setup_oauth2_clients

playbooks/roles/programs/defaults/main.yml

@@ -36,6 +36,7 @@ PROGRAMS_DATABASES:
 PROGRAMS_VERSION: "master"
 PROGRAMS_DJANGO_SETTINGS_MODULE: "programs.settings.production"
 PROGRAMS_URL_ROOT: 'http://localhost:8004'
+PROGRAMS_LOGOUT_URL: '{{ PROGRAMS_URL_ROOT }}/accounts/logout/'
 PROGRAMS_LMS_URL_ROOT: 'http://127.0.0.1:8000'
 PROGRAMS_ORGANIZATIONS_API_URL_ROOT: '{{ PROGRAMS_LMS_URL_ROOT }}/api/organizations/v0/'