Update django-browserid, fix authentication

adamzap · Mar 5, 2013 · a69a74f · a69a74f
1 parent bf5a96d
commit a69a74f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 74 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -6,6 +6,7 @@ requests
 markdown
 south
 eadred
+django-browserid>=0.8
 
 # Jingo never really does releases.
 -e git://github.com/jbalogh/jingo.git#egg=jingo
@@ -17,6 +18,3 @@ eadred
 # We're using a specific version here because we need the MultiAuthentication
 # feature, but newer commits break tests.
 -e git://github.com/toastdriven/django-tastypie.git@5e8850434ef1c8672b0a22953bd7cc0def6347f8#egg=django-tastypie
-
-# Using django-browserid master tip to pick up improvements
--e git://github.com/mozilla/django-browserid.git@0ed6fef4#egg=django-browserid
diff --git a/richard/static/js/browserid.js b/richard/static/js/browserid.js
diff --git a/richard/templates/base.html b/richard/templates/base.html
@@ -30,7 +30,7 @@
   {% block additional_head %}{% endblock %}
 </head>
 <body>
-  {{ browserid_info|safe }}
+  {{ browserid_info()|safe }}
   <div class="navbar navbar-inverse">
     <div class="navbar-inner">
       <div class="container">
@@ -66,11 +66,11 @@
                 {% if user.is_superuser %}
                   <li><a href="{{ url('admin:index') }}">Admin</a></li>
                 {% endif %}
-                <li>{{ browserid_button(sign_in='Sign in', sign_out='Sign out')|safe }}</li>
+                <li>{{ browserid_logout(text='Sign out')|safe }}</li>
               </ul>
             </li>
           {% else %}
-            <li>{{ browserid_button(sign_in='Sign in', sign_out='Sign out')|safe }}</li>
+            <li>{{ browserid_login(text='Sign in')|safe }}</li>
 
           {% endif %}
         </ul>
@@ -110,7 +110,7 @@
   {% block site_js %}
   <script type="text/javascript" src="{{ settings.STATIC_URL }}js/jquery-1.7.2.min.js"></script>
   <script type="text/javascript" src="{{ settings.STATIC_URL }}bootstrap/js/bootstrap.min.js"></script>
-  <script type="text/javascript" src="{{ settings.STATIC_URL }}js/browserid.js"></script>
+  <script type="text/javascript" src="{{ settings.STATIC_URL }}browserid/browserid.js"></script>
   <script type="text/javascript" src="https://login.persona.org/include.js"></script>
   {% endblock %}
 </body>