further work

sydney-linux-user-group · Jun 12, 2011 · 6b04361 · 6b04361
1 parent 0c30a83
commit 6b04361
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 10 deletions.
diff --git a/do_openid_login.py b/do_openid_login.py
@@ -9,10 +9,12 @@
 config.setup()
 
 # Python imports
+import logging
 import os
 
 # AppEngine Imports
 from google.appengine.ext import webapp
+from google.appengine.ext.webapp import template
 
 # Our App imports
 import events
@@ -22,19 +24,27 @@
 from google.appengine.ext.webapp.util import run_wsgi_app
 
 class MainHandler(webapp.RequestHandler):
-    def get(self):
-        continue_url = self.request.GET.get('continue')
-        openid_url = self.request.GET.get('openid')
+    def handle_openid(self, continue_url=None, openid_url=None):
         if not openid_url:
             logging.debug("Serving login page for %s", continue_url)
-            self.response.out.write(r(
-                'third_party/jQueryOpenIdPlugin/Login.xhtml',
-                {'continue': continue_url}))
+            self.response.out.write(template.render(
+                'templates/login.html', {'continue': continue_url}))
         else:
             self.redirect(users.create_login_url(continue_url, None, openid_url))
 
+    def get(self):
+        continue_url = self.request.GET.get('continue')
+        openid_url = self.request.GET.get('openid')
+        self.handle_openid()
+
+    def post(self):
+        continue_url = self.request.GET.get('continue')
+        openid_url = self.request.GET.get('openid')
+        self.handle_openid()
+
+
 application = webapp.WSGIApplication([
-    ('/', MainHandler),
+    ('.*', MainHandler),
 ], debug=True)
 
 def main():

diff --git a/templates/login.html b/templates/login.html
diff --git a/templates/login.html b/templates/login.html
@@ -0,0 +1,97 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
+  <title>Log In</title>
+
+
+  <link rel="stylesheet" type="text/css" media="screen" href="/third_party/jQueryOpenIdPlugin/openid.css">
+
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js"></script>
+  <script type="text/javascript" src="/third_party/jQueryOpenIdPlugin/jquery.openid.js"></script>
+  <script type="text/javascript">  $(function() { $("form.openid").openid(); });</script>
+
+</head>
+<body>
+
+  <form class="openid" method="post" action="/_ah/login_required"> 
+    <input type="hidden" name="continue" value="/refresh">
+    <div>
+      <ul class="providers">
+        <li class="openid highlight" title="OpenID" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/openidW.png">
+          <span style="display: none; "><strong>http://{your-openid-url}</strong></span>
+        </li>
+        <li class="direct" title="Google" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/googleW.png">
+          <span style="display: none; ">https://www.google.com/accounts/o8/id</span>
+        </li>
+        <li class="direct" title="Yahoo" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/yahooW.png">
+          <span style="display: none; ">http://yahoo.com/</span>
+        </li>
+        <li class="username" title="AOL screen name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/aolW.png">
+          <span style="display: none; ">http://openid.aol.com/<strong>username</strong></span>
+        </li>
+        <li class="username" title="MySpace user name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/myspaceW.png">
+          <span style="display: none; ">http://www.myspace.com/<strong>username</strong></span>
+        </li>
+        <li class="username" title="MyOpenID user name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/myopenid.png">
+          <span style="display: none; ">http://<strong>username</strong>.myopenid.com/</span>
+        </li>
+        <li class="username" title="Flickr user name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/flickr.png">
+          <span style="display: none; ">http://flickr.com/<strong>username</strong>/</span>
+        </li>
+        <li class="username" title="Technorati user name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/technorati.png">
+          <span style="display: none; ">http://technorati.com/people/technorati/<strong>username</strong>/</span>
+        </li>
+        <li class="username" title="Wordpress blog name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/wordpress.png">
+          <span style="display: none; ">http://<strong>username</strong>.wordpress.com</span>
+        </li>
+        <li class="username" title="Blogger blog name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/blogger.png">
+          <span style="display: none; ">http://<strong>username</strong>.blogspot.com/</span>
+        </li>
+        <li class="username" title="LiveJournal blog name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/livejournal.png">
+          <span style="display: none; ">http://<strong>username</strong>.livejournal.com</span>
+        </li>
+        <li class="username" title="ClaimID user name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/claimid.png">
+          <span style="display: none; ">http://claimid.com/<strong>username</strong></span>
+        </li>
+        <li class="username" title="Vidoop user name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/vidoop.png">
+          <span style="display: none; ">http://<strong>username</strong>.myvidoop.com/</span>
+        </li>
+        <li class="username" title="Verisign user name" style="line-height: 0; cursor: pointer; ">
+          <img alt="icon" src="/third_party/jQueryOpenIdPlugin/images/verisign.png">
+          <span style="display: none; ">http://<strong>username</strong>.pip.verisignlabs.com/</span>
+        </li>
+      </ul>
+    </div>
+    <fieldset style="display: none; "> 
+      <label for="openid_username">Enter your <span>Provider user name</span></label> 
+      <div>
+        <span></span><input type="text" name="openid_username"><span></span> 
+        <input type="submit" value="Log In">
+      </div> 
+    </fieldset> 
+    <fieldset> 
+      <label for="openid_identifier">Enter your <a class="openid_logo" href="http://openid.net">OpenID</a></label> 
+      <div>
+        <input type="text" name="openid_url"> 
+        <input type="submit" value="Log In">
+      </div> 
+    </fieldset> 
+  </form>
+  <!--
+    Includes code from Jarret Vance's JQuery OpenID selector (http://jvance.com/)
+   -->
+
+
+
+</body></html>
diff --git a/third_party/aeoid b/third_party/aeoid
diff --git a/utils/render.py b/utils/render.py
@@ -17,7 +17,7 @@ def render(t, kw):
       'req': req,
       'config': config,
       'user': users.get_current_user(),
-      'login_jsurl': 'users.create_login_url('')',
+      'login_jsurl': '/login',
       'login_url': users.create_login_url(req.path),
       'logout_url': users.create_logout_url(req.path),
       'appengine_user': users.get_current_user(),
@@ -32,3 +32,4 @@ def render(t, kw):
 
   kw.update(extra)
   return template.render(t, kw)
+  kkk