Merge branch 'release'

common/djangoapps/student/views.py

@@ -883,13 +883,17 @@ def login_user(request, error=""):  # pylint: disable-msg=too-many-statements,un
             AUDIT_LOG.warning(
                 u'Login failed - user with username {username} has no social auth with backend_name {backend_name}'.format(
                     username=username, backend_name=backend_name))
-            return JsonResponse({
-                "success": False,
-                # Translators: provider_name is the name of an external, third-party user authentication service (like
-                # Google or LinkedIn).
-                "value": _('There is no {platform_name} account associated with your {provider_name} account. Please use your {platform_name} credentials or pick another provider.').format(
-                    platform_name=settings.PLATFORM_NAME, provider_name=requested_provider.NAME)
-            })  # TODO: this should be a status code 401  # pylint: disable=fixme
+            return HttpResponseBadRequest(
+                _("You've successfully logged into your {provider_name} account, but this account isn't linked with an {platform_name} account yet.").format(
+                      platform_name=settings.PLATFORM_NAME, provider_name=requested_provider.NAME) 
+                  + "<br/><br/>" + _("Use your {platform_name} username and password to log into {platform_name} below, "
+                  "and then link your {platform_name} account with {provider_name} from your dashboard.").format(
+                      platform_name=settings.PLATFORM_NAME, provider_name=requested_provider.NAME) 
+                  + "<br/><br/>" + _("If you don't have an {platform_name} account yet, click <strong>Register Now</strong> at the top of the page.").format(
+                      platform_name=settings.PLATFORM_NAME),
+                content_type="text/plain",
+                status=401
+            )
 
     else:
 
@@ -982,7 +986,7 @@ def login_user(request, error=""):  # pylint: disable-msg=too-many-statements,un
     # Track the user's sign in
     if settings.FEATURES.get('SEGMENT_IO_LMS') and hasattr(settings, 'SEGMENT_IO_LMS_KEY'):
         tracking_context = tracker.get_tracker().resolve_context()
-        analytics.identify(anonymous_id_for_user(user, None), {
+        analytics.identify(user.id, {
             'email': email,
             'username': username,
         })
@@ -1457,7 +1461,7 @@ def create_account(request, post_override=None):  # pylint: disable-msg=too-many
     # Track the user's registration
     if settings.FEATURES.get('SEGMENT_IO_LMS') and hasattr(settings, 'SEGMENT_IO_LMS_KEY'):
         tracking_context = tracker.get_tracker().resolve_context()
-        analytics.identify(anonymous_id_for_user(user, None), {
+        analytics.identify(user.id, {
             email: email,
             username: username,
         })

common/djangoapps/third_party_auth/tests/specs/base.py

@@ -220,10 +220,8 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
 
     def assert_json_failure_response_is_missing_social_auth(self, response):
         """Asserts failure on /login for missing social auth looks right."""
-        self.assertEqual(200, response.status_code)  # Yes, it's a 200 even though it's a failure.
-        payload = json.loads(response.content)
-        self.assertFalse(payload.get('success'))
-        self.assertIn('associated with your %s account' % self.PROVIDER_CLASS.NAME, payload.get('value'))
+        self.assertEqual(401, response.status_code)
+        self.assertIn("successfully logged into your %s account, but this account isn't linked" % self.PROVIDER_CLASS.NAME, response.content)
 
     def assert_json_failure_response_is_username_collision(self, response):
         """Asserts the json response indicates a username collision."""

lms/static/sass/discussion/elements/_navigation.scss

@@ -17,6 +17,7 @@
   @include box-sizing(border-box);
   display: table;
   border-bottom: 1px solid $gray-l2;
+  width: 100%;
   background-color: $gray-l3;
 }
 

lms/static/sass/discussion/views/_thread.scss

@@ -32,6 +32,10 @@ body.discussion, .discussion-module {
       @extend %t-weight5;
     }
 
+    .posted-details .username {
+      font-size: inherit;
+    }
+
     .response-header-content {
       display: inline-block;
       vertical-align: top;

lms/static/sass/multicourse/_account.scss

@@ -610,6 +610,14 @@
         display: block;
       }
     }
+
+    .third-party-signin.message {
+      display: none;
+
+      &.is-shown {
+        display: block;
+      }
+    }
   }
 }
 

lms/templates/emails/activation_email.txt

@@ -18,7 +18,7 @@ ${_("Activation ensures that you can register for {platform_name} courses and"
       " If you require assistance, please use our web form at"
       " {contact_us} or email {info_address}.").format(
              platform_name=settings.PLATFORM_NAME,
-             contact_us=settings.MKTG_URL_LINK_MAP['CONTACT'],
+             contact_us='https://www.edx.org/contact-us',
              info_address=settings.CONTACT_EMAIL
       )}
 

lms/templates/login.html

@@ -46,8 +46,10 @@
         toggleSubmitButton(false);
       });
 
-      $('#login-form').on('ajax:error', function() {
+      $('#login-form').on('ajax:error', function(event, request, status_string) {
         toggleSubmitButton(true);
+        $('.third-party-signin.message').addClass('is-shown').focus();
+        $('.third-party-signin.message .instructions').html(request.responseText);
       });
 
       $('#login-form').on('ajax:success', function(event, json, xhr) {
@@ -138,12 +140,16 @@
       </div>
 
       <div role="alert" class="status message submission-error" tabindex="-1">
-        <h3 class="message-title">${_("The following errors occurred while logging you in:")} </h3>
+        <h3 class="message-title">${_("We couldn't log you in.")} </h3>
         <ul class="message-copy">
           <li>${_("Your email or password is incorrect")}</li>
         </ul>
       </div>
 
+      <div role="alert" class="third-party-signin message" tabindex="-1">
+        <p class="instructions"> </p>
+      </div>
+
       <p class="instructions sr">
         ${_('Please provide the following information to log into your {platform_name} account. Required fields are noted by <strong class="indicator">bold text and an asterisk (*)</strong>.').format(platform_name=platform_name)}
       </p>

lms/templates/register.html

@@ -146,7 +146,7 @@
         <p class="instructions">
           ## Translators: selected_provider is the name of an external, third-party user authentication service (like Google or LinkedIn).
           ${_("You've successfully signed in with {selected_provider}.").format(selected_provider='<strong>%s</strong>' % selected_provider)}<br />
-          ${_("Finish your account registration below to start learning.")}
+          ${_("We just need a little more information before you start learning with edX.")}
         </p>
 
         % endif