From: Stas Kravets <skravets@internal-rfc1918.hn.nnov.stream.ru>
Date: Thu, 13 Jan 2011 15:09:24 +0000 (+0300)
Subject: Minor style updates.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d4f58d33942f26d721944ad69d86882f7084765a;p=django-social-auth.git

Minor style updates.
---

diff --git a/example/app/views.py b/example/app/views.py
index edc1062..74d2cff 100644
--- a/example/app/views.py
+++ b/example/app/views.py
@@ -11,13 +11,6 @@ def home(request):
         return HttpResponseRedirect('done')
     else:
         return render_to_response('home.html', None, RequestContext(request))
-                <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>
 
 @login_required
 def done(request):
diff --git a/example/settings.py b/example/settings.py
index 84716d2..952a25e 100644
--- a/example/settings.py
+++ b/example/settings.py
@@ -70,6 +70,7 @@ AUTHENTICATION_BACKENDS = (
     'social_auth.backends.GoogleBackend',
     'social_auth.backends.YahooBackend',
     'social_auth.backends.OpenIDBackend',
+    'social_auth.backends.LiveJournalBackend',
     'django.contrib.auth.backends.ModelBackend',
 )
 
diff --git a/example/templates/home.html b/example/templates/home.html
index aae415a..6b513ee 100644
--- a/example/templates/home.html
+++ b/example/templates/home.html
@@ -17,6 +17,15 @@
   <ul>
     <li><a rel="nofollow" href="/login/google/">Google</a></li>
     <li><a rel="nofollow" href="/login/yahoo/">Yahoo</a></li>
+	<li>
+	  <form action="/login/livejournal/" method="post">{% csrf_token %}
+	    <div>
+          <label for="openid_lj_user">LiveJournal user:</label>
+          <input id="openid_lj_user" type="text" value="" name="openid_lj_user" />
+          <input type="submit" value="Login"/>
+		</div>
+      </form>
+    </li>
     <li>
       <form action="/login/openid/" method="post">{% csrf_token %}
         <div>
diff --git a/social_auth/auth.py b/social_auth/auth.py
index bd055cc..132e1d1 100644
--- a/social_auth/auth.py
+++ b/social_auth/auth.py
@@ -15,10 +15,10 @@ from django.contrib.auth import authenticate
 
 from .store import DjangoOpenIDStore
 from .backends import TwitterBackend, OrkutBackend, FacebookBackend, \
-                      OpenIDBackend, GoogleBackend, YahooBackend
+                      OpenIDBackend, GoogleBackend, YahooBackend, LiveJournalBackend
 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, \
+                  OPENID_LIVEJOURNAL_URL, OPENID_LIVEJOURNAL_USER_FIELD, \
                   TWITTER_REQUEST_TOKEN_URL, TWITTER_ACCESS_TOKEN_URL, \
                   TWITTER_AUTHORIZATION_URL, TWITTER_CHECK_AUTH, \
                   FACEBOOK_CHECK_AUTH, FACEBOOK_AUTHORIZATION_URL, \
@@ -168,15 +168,16 @@ class YahooAuth(OpenIdAuth):
 
 class LiveJournalAuth(OpenIdAuth):
     """LiveJournal OpenID authentication"""
+    AUTH_BACKEND = LiveJournalBackend
     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:
+        if self.request.method != 'POST' or not self.request.POST.get(OPENID_LIVEJOURNAL_USER_FIELD):
             raise ValueError, 'Missing LiveJournal user identifier'
-        return OPENID_LJ_URL % self.request.POST[OPENID_LJ_USER_FIELD]
+        return OPENID_LIVEJOURNAL_URL % self.request.POST[OPENID_LIVEJOURNAL_USER_FIELD]
 
 class BaseOAuth(BaseAuth):
     """OAuth base class"""
@@ -397,6 +398,7 @@ BACKENDS = {
     'facebook': FacebookAuth,
     'google': GoogleAuth,
     'yahoo': YahooAuth,
+    'livejournal': LiveJournalAuth,
     'orkut': OrkutAuth,
     'openid': OpenIdAuth,
 }
diff --git a/social_auth/backends.py b/social_auth/backends.py
index 3c8eade..17da956 100644
--- a/social_auth/backends.py
+++ b/social_auth/backends.py
@@ -111,9 +111,9 @@ class SocialAuthBackend(ModelBackend):
         
         if not getattr(settings, 'SOCIAL_AUTH_CHANGE_SIGNAL_ONLY', False):
             for name, value in details.iteritems():
-            # not update username if user already exists
-            if not new_user and name == USERNAME:
-                continue
+                # not update username if user already exists
+                if not new_user and name == USERNAME:
+                    continue
                 if value and value != getattr(user, name, value):
                     setattr(user, name, value)
                     changed = True
@@ -258,3 +258,7 @@ class GoogleBackend(OpenIDBackend):
 class YahooBackend(OpenIDBackend):
     """Yahoo OpenID authentication backend"""
     name = 'yahoo'
+
+class LiveJournalBackend(OpenIDBackend):
+    """LJ OpenID authentication backend"""
+    name = 'livejournal'
\ No newline at end of file
diff --git a/social_auth/conf.py b/social_auth/conf.py
index a2cec51..2fa337b 100644
--- a/social_auth/conf.py
+++ b/social_auth/conf.py
@@ -45,5 +45,5 @@ 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
+OPENID_LIVEJOURNAL_URL = 'http://%s.livejournal.com'
+OPENID_LIVEJOURNAL_USER_FIELD = 'openid_lj_user'
\ No newline at end of file