List accounts (#80)

gratipay · Sep 13, 2012 · e1dcd8d · e1dcd8d
1 parent a9f40c8
commit e1dcd8d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 57 deletions.
diff --git a/gittip/networks/twitter.py b/gittip/networks/twitter.py
@@ -1,5 +1,3 @@
-import requests
-from aspen import json, log, Response
 from gittip import db, networks
 
 
@@ -11,47 +9,6 @@ def upsert(user_info):
                            )
 
 
-def oauth_dance(website, qs):
-    """Given a querystring, return a dict of user_info.
-
-    The querystring should be the querystring that we get from Twitter when
-    we send the user to the return value of oauth_url above.
-
-    See also:
-
-        http://developer.twitter.com/v3/oauth/
-
-    """
-
-    log("Doing an OAuth dance with Twitter.")
-
-    if 'denied' in qs:
-        raise Response(500, str(qs['denied']))
-
-    data = { 'code': qs['code'].encode('US-ASCII')
-           , 'client_id': website.twitter_customer_key
-           , 'client_secret': website.twitter_customer_secret
-            }
-    r = requests.post("https://api.twitter.com/oauth/access_token", data=data)
-    assert r.status_code == 200, (r.status_code, r.text)
-
-    back = dict([pair.split('=') for pair in r.text.split('&')]) # XXX
-    if 'error' in back:
-        raise Response(400, back['error'].encode('utf-8'))
-    assert back.get('token_type', '') == 'bearer', back
-    access_token = back['access_token']
-
-    r = requests.get( "https://api.twitter.com/user"
-                    , headers={'Authorization': 'token %s' % access_token}
-                     )
-    assert r.status_code == 200, (r.status_code, r.text)
-    user_info = json.loads(r.text)
-    log("Done with OAuth dance with Twitter for %s (%s)."
-        % (user_info['login'], user_info['id']))
-
-    return user_info
-
-
 def resolve(user_id):
     """Given str, return a participant_id.
     """

diff --git a/templates/base.html b/templates/base.html
@@ -18,7 +18,7 @@ <h1>
                 alt="Gittip - Personal Funding" /></a>
         </h1>
         {% if user.ANON %}
-        <div id="you-are">Sign in using <a
+        <div id="you-are">Sign in using <a href="/on/twitter/redirect">Twitter</a> or <a
                 href="{{ github.oauth_url(website, u'opt-in') }}">GitHub</a>.</div>
         {% else %}
         <div id="you-are">

diff --git a/templates/participant.html b/templates/participant.html
@@ -5,7 +5,7 @@
     </div>
 
     {% if can_tip and user.ANON %}
-        <h2>Sign in using
+        <h2>Sign in using <a href="/on/twitter/redirect">Twitter</a> or 
             <a href="{{ github.oauth_url(website, u'opt-in', username) }}">
             GitHub</a> to tip {{ username }}.</h2>
     {% elif can_tip  %}

diff --git a/www/%participant_id/index.html b/www/%participant_id/index.html
@@ -27,13 +27,9 @@
 
 SELECT = """
 
-    SELECT p.*
-         , s.network
-         , s.user_info
-      FROM participants p
-      JOIN social_network_users s
-        ON p.id = s.participant_id
-     WHERE p.id = %s
+    SELECT *
+      FROM participants
+     WHERE id = %s
 
 """
 participant = db.fetchone(SELECT, (path['participant_id'],))
@@ -53,6 +49,13 @@
     request.redirect(to)
 
 
+ACCOUNTS = """
+    SELECT * FROM social_network_users WHERE participant_id=%s;
+"""
+accounts = db.fetchall(ACCOUNTS, (participant_id,))
+assert accounts is not None
+
+
 if not user.ANON:
     if user.id == participant_id:
         tips, total = get_tips_and_total(user.id)
@@ -61,7 +64,6 @@
     else:
         my_tip = get_tip(user.id, participant['id'])
 
-github_user_info = participant['user_info']
 can_tip = True
 backed_amount = get_backed_amount(participant['id'])
 tip_or_pledge = "tip"
@@ -565,13 +567,23 @@ <h3>Funding Goal</h3>
 
     <h3>Linked Accounts</h3>
     <ul id="accounts">
+        {% for account in accounts %}
         <li>
-        <img src="{{ github_user_info.get('avatar_url', '/assets/%s/no-avatar.png' % __version__) }}" />
-            {{ github_user_info.get('login') }} {% if github_user_info.get('name') %}({{ github_user_info.get('name') }}){% end %}<br />
-            <a href="{{ github_user_info.get('html_url', '') }}">
-                {{ github_user_info.get('html_url', '') }}
+        {% if account['network'] == 'github' %}
+        <img src="{{ account['user_info'].get('avatar_url', '/assets/%s/no-avatar.png' % __version__) }}" />
+            {{ account['user_info'].get('login') }} {% if account['user_info'].get('name') %}({{ account['user_info'].get('name') }}){% end %}<br />
+            <a href="{{ account['user_info'].get('html_url', '') }}">
+                {{ account['user_info'].get('html_url', '') }}
             </a>
+        {% elif account['network'] == 'twitter' %}
+        <img src="{{ account['user_info'].get('profile_image_url_https', '/assets/%s/no-avatar.png' % __version__) }}" />
+            {{ account['user_info'].get('screen_name') }} {% if account['user_info'].get('name') %}({{ account['user_info'].get('name') }}){% end %}<br />
+            <a href="{{ account['user_info'].get('html_url', '') }}">
+                {{ account['user_info'].get('html_url', '') }}
+            </a>
+        {% end %}
         </li>
+        {% end %}
     </ul>
 
     {% if user.ADMIN %}

diff --git a/www/on/twitter/associate b/www/on/twitter/associate
@@ -56,6 +56,7 @@ if screen_name is None:
     log(u"We got a user_info from Twitter with no screen_name [%s, %s]"
         % (action, then))
     raise Response(400)
+user_info['html_url'] = "https://twitter.com/" + screen_name
 
 # Do something.
 log(u"%s wants to %s" % (screen_name, action))