From 9bd50f3463d618aa89e498819daed784147aa9aa Mon Sep 17 00:00:00 2001 From: Hamza Munir Date: Tue, 18 Jul 2017 18:11:00 +0500 Subject: [PATCH 1/4] Background color changed for microsoft button in social auth login/register --- lms/static/sass/partials/base/_variables.scss | 2 +- lms/static/sass/views/_login-register.scss | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lms/static/sass/partials/base/_variables.scss b/lms/static/sass/partials/base/_variables.scss index 00aa6d412f..6f948bfd9c 100644 --- a/lms/static/sass/partials/base/_variables.scss +++ b/lms/static/sass/partials/base/_variables.scss @@ -201,7 +201,7 @@ $twitter-blue: #55ACEE; $facebook-blue: #3B5998; $linkedin-blue: #0077B5; $google-red: #D73924; -$microsoft-blue: #00BCF2; +$microsoft-black: #000000; // shadows $shadow: rgba(0,0,0,0.2) !default; diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss index b9f1adcfd7..c38e6165fe 100644 --- a/lms/static/sass/views/_login-register.scss +++ b/lms/static/sass/views/_login-register.scss @@ -509,16 +509,16 @@ } &.button-oa2-azuread-oauth2 { - color: darken($microsoft-blue, 20%); + color: darken($microsoft-black, 20%); .icon { - background: $microsoft-blue; + background: $microsoft-black; } &:hover, &:focus { - background-color: $microsoft-blue; - border: 1px solid $microsoft-blue; + background-color: $microsoft-black; + border: 1px solid $microsoft-black; color: $white; } } From 831ee5f3cb7659852286ebc3e16e3ea0b809ea52 Mon Sep 17 00:00:00 2001 From: Hamza Munir Date: Wed, 19 Jul 2017 15:34:01 +0500 Subject: [PATCH 2/4] Passing the extra argument key value pair to the social auth url for microsoft. --- common/djangoapps/third_party_auth/settings.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/djangoapps/third_party_auth/settings.py b/common/djangoapps/third_party_auth/settings.py index c768332270..8e902da18d 100644 --- a/common/djangoapps/third_party_auth/settings.py +++ b/common/djangoapps/third_party_auth/settings.py @@ -18,7 +18,9 @@ _MIDDLEWARE_CLASSES = ( 'third_party_auth.middleware.PipelineQuarantineMiddleware', ) _SOCIAL_AUTH_LOGIN_REDIRECT_URL = '/dashboard' - +_SOCIAL_AUTH_AZUREAD_OAUTH2_AUTH_EXTRA_ARGUMENTS = { + 'msafed': 0 +} def apply_settings(django_settings): """Set provider-independent settings.""" @@ -38,6 +40,9 @@ def apply_settings(django_settings): # Where to send the user once social authentication is successful. django_settings.SOCIAL_AUTH_LOGIN_REDIRECT_URL = _SOCIAL_AUTH_LOGIN_REDIRECT_URL + # Adding extra key value pair in the url query string for microsoft as per request + django_settings.SOCIAL_AUTH_AZUREAD_OAUTH2_AUTH_EXTRA_ARGUMENTS = _SOCIAL_AUTH_AZUREAD_OAUTH2_AUTH_EXTRA_ARGUMENTS + # Inject our customized auth pipeline. All auth backends must work with # this pipeline. django_settings.SOCIAL_AUTH_PIPELINE = [ From 8de3bc2fe6b4346cd05e7204e97e0d7b6bd48a0a Mon Sep 17 00:00:00 2001 From: Hamza Munir Date: Thu, 20 Jul 2017 12:06:45 +0500 Subject: [PATCH 3/4] Removed darken from the css for icon of microsoft auth button. --- lms/static/sass/views/_login-register.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss index c38e6165fe..9c148e5d49 100644 --- a/lms/static/sass/views/_login-register.scss +++ b/lms/static/sass/views/_login-register.scss @@ -509,7 +509,7 @@ } &.button-oa2-azuread-oauth2 { - color: darken($microsoft-black, 20%); + color: $microsoft-black; .icon { background: $microsoft-black; From 3f9f07818900f458cf1765bb21ca2ed68b4f7c63 Mon Sep 17 00:00:00 2001 From: Hamza Munir Date: Wed, 26 Jul 2017 19:43:37 +0500 Subject: [PATCH 4/4] fix for the quality tests failing --- common/djangoapps/third_party_auth/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/common/djangoapps/third_party_auth/settings.py b/common/djangoapps/third_party_auth/settings.py index 8e902da18d..f5e6b44ea5 100644 --- a/common/djangoapps/third_party_auth/settings.py +++ b/common/djangoapps/third_party_auth/settings.py @@ -22,6 +22,7 @@ _SOCIAL_AUTH_AZUREAD_OAUTH2_AUTH_EXTRA_ARGUMENTS = { 'msafed': 0 } + def apply_settings(django_settings): """Set provider-independent settings."""