From 8fb93b622a224530a656b283b64db3fdcb7f767c Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Tue, 1 May 2012 12:33:13 -0700
Subject: [PATCH] Suggest a fallback method when the fancy login fails.

If the CORS/hoisted front page login fails for any reason, suggest
logging in via the https endpoint's login page.
---
 r2/r2/lib/strings.py            |  2 ++
 r2/r2/public/static/js/login.js | 16 ++++++++++++++--
 r2/r2/public/static/js/ui.js    |  6 +++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/r2/r2/lib/strings.py b/r2/r2/lib/strings.py
index acab0db9c..79ab054ea 100644
--- a/r2/r2/lib/strings.py
+++ b/r2/r2/lib/strings.py
@@ -75,6 +75,8 @@ string_dict = dict(
 
     oauth_login_msg = _("Log in or register to connect your reddit account with [%(app_name)s](%(app_about_url)s)."),
 
+    login_fallback_msg = _("try using our secure login form."),
+
     legal = _("I understand and agree that registration on or use of this site constitutes agreement to its %(user_agreement)s and %(privacy_policy)s."),
 
     friends = _('to view reddit with only submissions from your friends, use [reddit.com/r/friends](%s)'),
diff --git a/r2/r2/public/static/js/login.js b/r2/r2/public/static/js/login.js
index 92d98ed4c..53b0552c3 100644
--- a/r2/r2/public/static/js/login.js
+++ b/r2/r2/public/static/js/login.js
@@ -1,4 +1,6 @@
 r.login = {
+    currentOrigin: location.protocol+'//'+location.host,
+
     post: function(form, action, callback) {
         if (r.config.cnameframe && !r.config.https_endpoint) {
             form.$el.unbind()
@@ -8,10 +10,9 @@ r.login = {
 
         var username = $('input[name="user"]', form.$el).val(),
             endpoint = r.config.https_endpoint || ('http://'+r.config.ajax_domain),
-            sameOrigin = location.protocol+'//'+location.host == endpoint,
             apiTarget = endpoint+'/api/'+action+'/'+username
 
-        if (sameOrigin || $.support.cors) {
+        if (this.currentOrigin == endpoint || $.support.cors) {
             var params = form.serialize()
             params.push({name:'api_type', value:'json'})
             $.ajax({
@@ -189,6 +190,17 @@ r.ui.LoginForm.prototype = $.extend(new r.ui.Form(), {
         }
     },
 
+    _handleNetError: function(result, err, xhr) {
+        r.ui.Form.prototype._handleNetError.apply(this, arguments)
+        if (xhr.status == 0 && r.login.currentOrigin != r.config.https_endpoint) {
+            $('<p>').append(
+                $('<a>')
+                    .text(r.strings.login_fallback_msg)
+                    .attr('href', r.config.https_endpoint + '/login')
+            ).appendTo(this.$el.find('.status'))
+        }
+    },
+
     focus: function() {
         this.$el.find('input[name="user"]').focus()
     }
diff --git a/r2/r2/public/static/js/ui.js b/r2/r2/public/static/js/ui.js
index 428ce335c..0c8d60b8e 100644
--- a/r2/r2/public/static/js/ui.js
+++ b/r2/r2/public/static/js/ui.js
@@ -131,12 +131,16 @@ r.ui.Form.prototype = $.extend(new r.ui.Base(), {
             this._handleResult(result)
         } else {
             this.setWorking(false)
-            this.showStatus('an error occurred (' + xhr.status + ')', true)
+            this._handleNetError(result, err, xhr)
         }
     },
 
     _handleResult: function(result) {
         this.showErrors(result.json.errors)
         this.setWorking(false)
+    },
+
+    _handleNetError: function(result, err, xhr) {
+        this.showStatus('an error occurred (' + xhr.status + ')', true)
     }
 })