Merge pull request #334 from PeterQ2/master

Changed RPXAccount login_form due to end-of-life for Janrain legacy widget

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:
+        rpxform = """
-            JANRAIN_URL = \
+        <script type="text/javascript">
-                "https://%s.rpxnow.com/openid/embed?token_url=%s&language_preference=%s"
+        (function() {
-            rpxform = IFRAME(
+            if (typeof window.janrain !== 'object') window.janrain = {};
-                _src=JANRAIN_URL % (
+            if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
-                    self.domain, self.token_url, self.language),
+            janrain.settings.tokenUrl = '%s';
-                _scrolling="no",
+            function isReady() { janrain.ready = true; };
-                _frameborder="no",
+            if (document.addEventListener) {
-                             _style="width:400px;height:240px;")
+                document.addEventListener("DOMContentLoaded", isReady, false);
-        else:
+            } else {
-            JANRAIN_URL = \
+                window.attachEvent('onload', isReady);
-                "https://%s.rpxnow.com/openid/v2/signin?token_url=%s"
+            }
-            rpxform = DIV(SCRIPT(_src="https://rpxnow.com/openid/v2/widget",
+            var e = document.createElement('script');
-                                 _type="text/javascript"),
+            e.type = 'text/javascript';
-                          SCRIPT("RPXNOW.overlay = true;",
+            e.id = 'janrainAuthWidget';
-                                 "RPXNOW.language_preference = '%s';" % self.language,
+            if (document.location.protocol === 'https:') {
-                                 "RPXNOW.realm = '%s';" % self.domain,
+                e.src = 'https://rpxnow.com/js/lib/%s/engage.js';
-                                 "RPXNOW.token_url = '%s';" % self.token_url,
+            } else {
-                                 "RPXNOW.show();",
+                e.src = 'http://widget-cdn.rpxnow.com/js/lib/%s/engage.js';
-                                 _type="text/javascript"))
+            }
-        return rpxform
+            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):