From c4a68e9e5a59ea6542e4087576c285d99dc92858 Mon Sep 17 00:00:00 2001
From: petergovers <peter@formatics.nl>
Date: Fri, 20 Dec 2013 20:33:29 +0100
Subject: [PATCH 1/3] Changed rpxAccount login_form due to end-of-life for
 Janrain IFRAME/embedded widget

---
 gluon/contrib/login_methods/rpx_account.py | 47 ++++++++++++----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/gluon/contrib/login_methods/rpx_account.py b/gluon/contrib/login_methods/rpx_account.py
index 0cd1c56a..0116f4a1 100644
--- a/gluon/contrib/login_methods/rpx_account.py
+++ b/gluon/contrib/login_methods/rpx_account.py
@@ -98,27 +98,32 @@ class RPXAccount(object):
     def login_form(self):
         request = self.request
         args = request.args
-        if self.embed:
-            JANRAIN_URL = \
-                "https://%s.rpxnow.com/openid/embed?token_url=%s&language_preference=%s"
-            rpxform = IFRAME(
-                _src=JANRAIN_URL % (
-                    self.domain, self.token_url, self.language),
-                _scrolling="no",
-                _frameborder="no",
-                             _style="width:400px;height:240px;")
-        else:
-            JANRAIN_URL = \
-                "https://%s.rpxnow.com/openid/v2/signin?token_url=%s"
-            rpxform = DIV(SCRIPT(_src="https://rpxnow.com/openid/v2/widget",
-                                 _type="text/javascript"),
-                          SCRIPT("RPXNOW.overlay = true;",
-                                 "RPXNOW.language_preference = '%s';" % self.language,
-                                 "RPXNOW.realm = '%s';" % self.domain,
-                                 "RPXNOW.token_url = '%s';" % self.token_url,
-                                 "RPXNOW.show();",
-                                 _type="text/javascript"))
-        return rpxform
+        rpxform = """
+        <script type="text/javascript">
+        (function() {
+            if (typeof window.janrain !== 'object') window.janrain = {};
+            if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
+            janrain.settings.tokenUrl = '%(token_url)s';
+            function isReady() { janrain.ready = true; };
+            if (document.addEventListener) {
+                document.addEventListener("DOMContentLoaded", isReady, false);
+            } else {
+                window.attachEvent('onload', isReady);
+            }
+            var e = document.createElement('script');
+            e.type = 'text/javascript';
+            e.id = 'janrainAuthWidget';
+            if (document.location.protocol === 'https:') {
+                e.src = 'https://rpxnow.com/js/lib/%(domain)s/engage.js';
+            } else {
+                e.src = 'http://widget-cdn.rpxnow.com/js/lib/%(domain)/engage.js';
+            }
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(e, s);
+        })();
+        </script>
+        <div id="janrainEngageEmbed"></div>""" % dict(token_url=self.token_url, domain=self.domain)
+        return XML(rpxform)
 
 
 def use_janrain(auth, filename='private/janrain.key', **kwargs):

From afe3f306e723f6b0bc90d8831e0aa6efb9a515f3 Mon Sep 17 00:00:00 2001
From: petergovers <peter@formatics.nl>
Date: Fri, 20 Dec 2013 21:27:56 +0100
Subject: [PATCH 2/3] Revert "Changed rpxAccount login_form due to end-of-life
 for Janrain IFRAME/embedded widget"

This reverts commit c4a68e9e5a59ea6542e4087576c285d99dc92858.
---
 gluon/contrib/login_methods/rpx_account.py | 47 ++++++++++------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/gluon/contrib/login_methods/rpx_account.py b/gluon/contrib/login_methods/rpx_account.py
index 0116f4a1..0cd1c56a 100644
--- a/gluon/contrib/login_methods/rpx_account.py
+++ b/gluon/contrib/login_methods/rpx_account.py
@@ -98,32 +98,27 @@ class RPXAccount(object):
     def login_form(self):
         request = self.request
         args = request.args
-        rpxform = """
-        <script type="text/javascript">
-        (function() {
-            if (typeof window.janrain !== 'object') window.janrain = {};
-            if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
-            janrain.settings.tokenUrl = '%(token_url)s';
-            function isReady() { janrain.ready = true; };
-            if (document.addEventListener) {
-                document.addEventListener("DOMContentLoaded", isReady, false);
-            } else {
-                window.attachEvent('onload', isReady);
-            }
-            var e = document.createElement('script');
-            e.type = 'text/javascript';
-            e.id = 'janrainAuthWidget';
-            if (document.location.protocol === 'https:') {
-                e.src = 'https://rpxnow.com/js/lib/%(domain)s/engage.js';
-            } else {
-                e.src = 'http://widget-cdn.rpxnow.com/js/lib/%(domain)/engage.js';
-            }
-            var s = document.getElementsByTagName('script')[0];
-            s.parentNode.insertBefore(e, s);
-        })();
-        </script>
-        <div id="janrainEngageEmbed"></div>""" % dict(token_url=self.token_url, domain=self.domain)
-        return XML(rpxform)
+        if self.embed:
+            JANRAIN_URL = \
+                "https://%s.rpxnow.com/openid/embed?token_url=%s&language_preference=%s"
+            rpxform = IFRAME(
+                _src=JANRAIN_URL % (
+                    self.domain, self.token_url, self.language),
+                _scrolling="no",
+                _frameborder="no",
+                             _style="width:400px;height:240px;")
+        else:
+            JANRAIN_URL = \
+                "https://%s.rpxnow.com/openid/v2/signin?token_url=%s"
+            rpxform = DIV(SCRIPT(_src="https://rpxnow.com/openid/v2/widget",
+                                 _type="text/javascript"),
+                          SCRIPT("RPXNOW.overlay = true;",
+                                 "RPXNOW.language_preference = '%s';" % self.language,
+                                 "RPXNOW.realm = '%s';" % self.domain,
+                                 "RPXNOW.token_url = '%s';" % self.token_url,
+                                 "RPXNOW.show();",
+                                 _type="text/javascript"))
+        return rpxform
 
 
 def use_janrain(auth, filename='private/janrain.key', **kwargs):

From 24283e7eeb289456b2fc17453b84fe79bce234ac Mon Sep 17 00:00:00 2001
From: petergovers <peter@formatics.nl>
Date: Fri, 20 Dec 2013 21:28:47 +0100
Subject: [PATCH 3/3] Modified RPXAccount to be backward compatible with older
 Web2py versions

---
 gluon/contrib/login_methods/rpx_account.py | 47 ++++++++++++----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/gluon/contrib/login_methods/rpx_account.py b/gluon/contrib/login_methods/rpx_account.py
index 0cd1c56a..d8c47eb6 100644
--- a/gluon/contrib/login_methods/rpx_account.py
+++ b/gluon/contrib/login_methods/rpx_account.py
@@ -98,27 +98,32 @@ class RPXAccount(object):
     def login_form(self):
         request = self.request
         args = request.args
-        if self.embed:
-            JANRAIN_URL = \
-                "https://%s.rpxnow.com/openid/embed?token_url=%s&language_preference=%s"
-            rpxform = IFRAME(
-                _src=JANRAIN_URL % (
-                    self.domain, self.token_url, self.language),
-                _scrolling="no",
-                _frameborder="no",
-                             _style="width:400px;height:240px;")
-        else:
-            JANRAIN_URL = \
-                "https://%s.rpxnow.com/openid/v2/signin?token_url=%s"
-            rpxform = DIV(SCRIPT(_src="https://rpxnow.com/openid/v2/widget",
-                                 _type="text/javascript"),
-                          SCRIPT("RPXNOW.overlay = true;",
-                                 "RPXNOW.language_preference = '%s';" % self.language,
-                                 "RPXNOW.realm = '%s';" % self.domain,
-                                 "RPXNOW.token_url = '%s';" % self.token_url,
-                                 "RPXNOW.show();",
-                                 _type="text/javascript"))
-        return rpxform
+        rpxform = """
+        <script type="text/javascript">
+        (function() {
+            if (typeof window.janrain !== 'object') window.janrain = {};
+            if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
+            janrain.settings.tokenUrl = '%s';
+            function isReady() { janrain.ready = true; };
+            if (document.addEventListener) {
+                document.addEventListener("DOMContentLoaded", isReady, false);
+            } else {
+                window.attachEvent('onload', isReady);
+            }
+            var e = document.createElement('script');
+            e.type = 'text/javascript';
+            e.id = 'janrainAuthWidget';
+            if (document.location.protocol === 'https:') {
+                e.src = 'https://rpxnow.com/js/lib/%s/engage.js';
+            } else {
+                e.src = 'http://widget-cdn.rpxnow.com/js/lib/%s/engage.js';
+            }
+            var s = document.getElementsByTagName('script')[0];
+            s.parentNode.insertBefore(e, s);
+        })();
+        </script>
+        <div id="janrainEngageEmbed"></div>""" % (self.token_url, self.domain, self.domain)
+        return XML(rpxform)
 
 
 def use_janrain(auth, filename='private/janrain.key', **kwargs):