From 187c17249024984983c89817a4f514fa75c3cd53 Mon Sep 17 00:00:00 2001
From: Stas Kravets <skravets@internal-rfc1918.hn.nnov.stream.ru>
Date: Wed, 12 Jan 2011 14:09:01 +0300
Subject: [PATCH] LiveJournal backend added to social_auth and example.

---
 example/app/views.py               |  7 +++++++
 example/local_settings.py.template |  2 ++
 social_auth/auth.py                | 12 ++++++++++++
 social_auth/conf.py                | 14 ++++++++------
 social_auth/views.py               |  3 ++-
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/example/app/views.py b/example/app/views.py
index 57cf051..73c9618 100644
--- a/example/app/views.py
+++ b/example/app/views.py
@@ -27,6 +27,13 @@ def home(request):
             <ul>
               <li><a href="/login/google/">Google</a></li>
               <li><a href="/login/yahoo/">Yahoo</a></li>
+              <li>
+                <form action="/login/lj/" method="post">{% csrf_token %}
+                  <label for="openid_lj_user">LiveJournal user:</label>
+                  <input id="openid_lj_user" type="text" value="" name="openid_lj_user" />
+                  <input type="submit" />
+                </form>
+              </li>
               <li>
                 <form action="/login/openid/" method="post">{% csrf_token %}
                   <label for="openid_identifier">Other provider:</label>
diff --git a/example/local_settings.py.template b/example/local_settings.py.template
index e43eba8..8880d9e 100644
--- a/example/local_settings.py.template
+++ b/example/local_settings.py.template
@@ -9,4 +9,6 @@ SOCIAL_AUTH_FORCE_RANDOM_USERNAME = False
 SOCIAL_AUTH_DEFAULT_USERNAME      = 'socialauth_user'
 SOCIAL_AUTH_COMPLETE_URL_NAME     = 'social:complete'
 LOGIN_ERROR_URL                   = '/login/error/'
+
 #SOCIAL_AUTH_USER_MODEL            = 'app.CustomUser'
+
diff --git a/social_auth/auth.py b/social_auth/auth.py
index c3ea7a9..bceee3e 100644
--- a/social_auth/auth.py
+++ b/social_auth/auth.py
@@ -18,6 +18,7 @@ from .backends import TwitterBackend, OrkutBackend, FacebookBackend, \
                       OpenIDBackend
 from .conf import AX_ATTRS, SREG_ATTR, OPENID_ID_FIELD, SESSION_NAME, \
                   OPENID_GOOGLE_URL, OPENID_YAHOO_URL, TWITTER_SERVER, \
+                  OPENID_LJ_URL, OPENID_LJ_USER_FIELD, \
                   TWITTER_REQUEST_TOKEN_URL, TWITTER_ACCESS_TOKEN_URL, \
                   TWITTER_AUTHORIZATION_URL, TWITTER_CHECK_AUTH, \
                   FACEBOOK_CHECK_AUTH, FACEBOOK_AUTHORIZATION_URL, \
@@ -151,6 +152,17 @@ class YahooAuth(OpenIdAuth):
         """Return Yahoo OpenID service url"""
         return OPENID_YAHOO_URL
 
+class LiveJournalAuth(OpenIdAuth):
+    """LiveJournal OpenID authentication"""
+    def uses_redirect(self):
+        """LiveJournal uses redirect"""
+        return True
+    
+    def openid_url(self):
+        """Returns LJ authentication URL"""
+        if self.request.method != 'POST' or OPENID_LJ_USER_FIELD not in self.request.POST or len(self.request.POST[OPENID_LJ_USER_FIELD]) == 0:
+            raise ValueError, 'Missing LiveJournal user identifier'
+        return OPENID_LJ_URL % self.request.POST[OPENID_LJ_USER_FIELD]
 
 class BaseOAuth(BaseAuth):
     """OAuth base class"""
diff --git a/social_auth/conf.py b/social_auth/conf.py
index 91cf7a5..92cb895 100644
--- a/social_auth/conf.py
+++ b/social_auth/conf.py
@@ -36,9 +36,11 @@ AX_SCHEMA_ATTRS = [
     ('http://axschema.org/namePerson/last', 'last_name'),
     ('http://axschema.org/namePerson/friendly', 'nickname'),
 ]
-AX_ATTRS          = AX_SCHEMA_ATTRS + OLD_AX_ATTRS
-SREG_ATTR         = ['email', 'fullname', 'nickname']
-OPENID_ID_FIELD   = 'openid_identifier'
-SESSION_NAME      = 'openid'
-OPENID_GOOGLE_URL = 'https://www.google.com/accounts/o8/id'
-OPENID_YAHOO_URL  = 'http://yahoo.com'
+AX_ATTRS               = AX_SCHEMA_ATTRS + OLD_AX_ATTRS
+SREG_ATTR              = ['email', 'fullname', 'nickname']
+OPENID_ID_FIELD        = 'openid_identifier'
+SESSION_NAME           = 'openid'
+OPENID_GOOGLE_URL      = 'https://www.google.com/accounts/o8/id'
+OPENID_YAHOO_URL       = 'http://yahoo.com'
+OPENID_LJ_URL          = 'http://%s.livejournal.com'
+OPENID_LJ_USER_FIELD   = 'openid_lj_user'
\ No newline at end of file
diff --git a/social_auth/views.py b/social_auth/views.py
index bb47689..88178cd 100644
--- a/social_auth/views.py
+++ b/social_auth/views.py
@@ -7,7 +7,7 @@ from django.contrib.auth import login, REDIRECT_FIELD_NAME
 from django.contrib.auth.decorators import login_required
 
 from .auth import TwitterAuth, FacebookAuth, OpenIdAuth, GoogleAuth, \
-                  YahooAuth, OrkutAuth
+                  YahooAuth, LiveJournalAuth, OrkutAuth
 
 
 # Authentication backends
@@ -16,6 +16,7 @@ BACKENDS = {
     'facebook': FacebookAuth,
     'google': GoogleAuth,
     'yahoo': YahooAuth,
+    'lj': LiveJournalAuth,
     'openid': OpenIdAuth,
     'orkut': OrkutAuth,
 }
-- 
2.39.5