恭喜您，您已经成功绑定您的邮箱，您可以使用{type}来直接免密码登录本网站.欢迎您继续关注本站，地址是
+ + {url} + 再次感谢您！ ++ 如果上面链接无法打开，请将此链接复制至浏览器。 + {url} + '''.format(type=oauthuser.type, url='http://' + site), [oauthuser.email, ]) + return HttpResponseRedirect('/') + + +class RequireEmailView(FormView): + form_class = RequireEmailForm + template_name = 'oauth/require_email.html' + + def get(self, request, *args, **kwargs): + oauthid = self.kwargs['oauthid'] + oauthuser = get_object_or_404(OAuthUser, pk=oauthid) + if oauthuser.email: + pass + # return HttpResponseRedirect('/') + + return super(RequireEmailView, self).get(request, *args, **kwargs) + + def get_initial(self): + oauthid = self.kwargs['oauthid'] + return { + 'email': '', + 'oauthid': oauthid + } + + def get_context_data(self, **kwargs): + oauthid = self.kwargs['oauthid'] + oauthuser = get_object_or_404(OAuthUser, pk=oauthid) + if oauthuser.picture: + kwargs['picture'] = oauthuser.picture + return super(RequireEmailView, self).get_context_data(**kwargs) + + def form_valid(self, form): + email = form.cleaned_data['email'] + oauthid = form.cleaned_data['oauthid'] + oauthuser = get_object_or_404(OAuthUser, pk=oauthid) + oauthuser.email = email + oauthuser.save() + sign = get_md5(settings.SECRET_KEY + str(oauthuser.id) + settings.SECRET_KEY) + site = Site.objects.get_current().domain + if settings.DEBUG: + site = '127.0.0.1:8000' + path = reverse('oauth:email_confirm', kwargs={ + 'id': oauthid, + 'sign': sign + }) + url = "http://{site}{path}".format(site=site, path=path) + print(url) + content = """ +
请点击下面链接绑定您的邮箱
+ + {url} + + 再次感谢您！ ++ 如果上面链接无法打开，请将此链接复制至浏览器。 + {url} + """.format(url=url) + send_email('绑定您的电子邮箱', content, [email, ]) + return HttpResponseRedirect('/') + + +""" def wbauthorize(request, sitename): manager = WBOauthManager(client_id=settings.OAHUTH['sina']['appkey'], client_secret=settings.OAHUTH['sina']['appsecret'], @@ -27,33 +173,34 @@ def wboauthurl(request): def googleoauthurl(request): - manager = GoogleOauthManager(client_id=settings.OAHUTH['google']['appkey'], - client_secret=settings.OAHUTH['google']['appsecret'], - callback_url=settings.OAHUTH['google']['callbackurl']) + manager = GoogleOauthManager() url = manager.get_authorization_url() return HttpResponse(url) def googleauthorize(request): - manager = GoogleOauthManager(client_id=settings.OAHUTH['google']['appkey'], - client_secret=settings.OAHUTH['google']['appsecret'], - callback_url=settings.OAHUTH['google']['callbackurl']) + manager = GoogleOauthManager() code = request.GET.get('code', None) rsp = manager.get_access_token_by_code(code) - print(rsp) + if not rsp: + return HttpResponseRedirect(manager.get_authorization_url()) user = manager.get_oauth_userinfo() if user: email = user['email'] - author = get_user_model().objects.get(email=email) - if not author: - author = get_user_model().objects.create_user(username=user["name"], email=email, password=None, - nikename=user["name"]) - if not GoogleUserInfo.objects.filter(author_id=author.pk): - userinfo = GoogleUserInfo() - userinfo.author = author - userinfo.picture = user["picture"] - userinfo.token = manager.access_token - userinfo.openid = manager.openid - userinfo.nikename = user["name"] - userinfo.save() - return HttpResponse(rsp) + if email: + author = get_user_model().objects.get(email=email) + if not author: + author = get_user_model().objects.create_user(username=user["name"], email=email) + if not GoogleUserInfo.objects.filter(author_id=author.pk): + userinfo = GoogleUserInfo() + userinfo.author = author + userinfo.picture = user["picture"] + userinfo.token = manager.access_token + userinfo.openid = manager.openid + userinfo.nikename = user["name"] + userinfo.save() + login(request, author) + else: + pass + return HttpResponseRedirect('/') +""" diff --git a/templates/account/login.html b/templates/account/login.html index 10800ba..57c55a3 100644 --- a/templates/account/login.html +++ b/templates/account/login.html @@ -28,7 +28,8 @@ Stay signed in - + {% load oauth_tags %} + {% load_oauth_applications %} diff --git a/templates/blog/article_detail.html b/templates/blog/article_detail.html index 653eaa3..65049b2 100755 --- a/templates/blog/article_detail.html +++ b/templates/blog/article_detail.html @@ -45,7 +45,17 @@ {% comment %}{% load comments_tags %} {% load_post_comment article from %}{% endcomment %} {% include 'comments/tags/comment_list.html' %} - {% include 'comments/tags/post_comment.html' %} + {% if user.is_authenticated %} + {% include 'comments/tags/post_comment.html' %} + {% else %} + diff --git a/templates/oauth/require_email.html b/templates/oauth/require_email.html new file mode 100644 index 0000000..a8ebb95 --- /dev/null +++ b/templates/oauth/require_email.html @@ -0,0 +1,46 @@ +{% extends 'share_layout/base_account.html' %} + +{% load static %} +{% block content %} +
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/share_layout/base.html b/templates/share_layout/base.html
index 7eff3d5..0d19bf6 100644
--- a/templates/share_layout/base.html
+++ b/templates/share_layout/base.html
@@ -17,7 +17,7 @@
{% block header %}
{% endblock %}
- {% comment %}{% endcomment %}
+
@@ -32,11 +32,13 @@
{% compress css %}
+
{% comment %}{% endcomment %}
+
{% block compress_css %}
{% endblock %}
{% endcompress %}
@@ -44,6 +46,7 @@
{% endcomment %}
{% compress js %}
+
{% endcompress %}
diff --git a/templates/share_layout/base_account.html b/templates/share_layout/base_account.html
index d95a1ad..6457260 100644
--- a/templates/share_layout/base_account.html
+++ b/templates/share_layout/base_account.html
@@ -15,7 +15,7 @@
{% compress css %}
-
+
Binding E-mail account
+ +
+ {% if picture %}
+ 
+ {% else %}
+ 
+ {% endif %}
+
+
+
+
+ {% endif %}
+
+ + Sign In +
+ +
您还没有登录，请您登录后发表评论。
+ + {% load oauth_tags %} + {% load_oauth_applications %} + +