Addressing second feedback about redirect logic on logout behing feat…

…ure flag

cms/envs/production.py

@@ -13,8 +13,8 @@
 from path import Path as path
 from xmodule.modulestore.modulestore_settings import convert_module_store_setting_if_needed
 from openedx.core.djangoapps.plugins import plugin_settings, constants as plugin_constants
-from django.core.urlresolvers import reverse_lazy
 from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import reverse_lazy
 
 from .common import *
 

openedx/core/djangoapps/user_authn/views/logout.py

@@ -57,11 +57,11 @@ def dispatch(self, request, *args, **kwargs):
 
         logout(request)
 
-        # If we don't need to deal with OIDC logouts, just redirect the user.
-        if self.oauth_client_ids:
-            response = super(LogoutView, self).dispatch(request, *args, **kwargs)
-        else:
+        # If we are using studio logout directly and there is not OIDC logouts we can just redirect the user
+        if settings.FEATURES.get('DISABLE_STUDIO_SSO_OVER_LMS', False) and not self.oauth_client_ids:
             response = redirect(self.target)
+        else:
+            response = super(LogoutView, self).dispatch(request, *args, **kwargs)
 
         # Clear the cookie used by the edx.org marketing site
         delete_logged_in_cookies(response)