重构Token

Author: smallcode

chinaapi/douban/open.py

@@ -1,16 +1,6 @@
 # coding=utf-8
 from chinaapi.exceptions import ApiResponseError
-from chinaapi.open import OAuth2Base, Token as TokenBase, App
-
-
-class Token(TokenBase):
-    """
-    douban_user_id：豆瓣用户ID
-    """
-
-    def __init__(self, access_token=None, expires_in=None, refresh_token=None, **kwargs):
-        super(Token, self).__init__(access_token, expires_in, refresh_token, **kwargs)
-        self.douban_user_id = kwargs.pop('douban_user_id', None)
+from chinaapi.open import OAuth2Base, Token, App
 
 
 class OAuth2(OAuth2Base):

chinaapi/qq/weibo/open.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from chinaapi.open import ClientBase, Method, OAuth2Base, Token as TokenBase, App
+from chinaapi.open import ClientBase, Method, OAuth2Base, Token, App
 from chinaapi.exceptions import InvalidApi, ApiResponseError
 from chinaapi.utils import parse_querystring
 
@@ -37,19 +37,6 @@ def parse(response):
     return r
 
 
-class Token(TokenBase):
-    """
-    openid：用户统一标识，可以唯一标识一个用户
-    openkey：与openid对应的用户key，是验证openid身份的验证密钥
-    """
-
-    def __init__(self, access_token=None, expires_in=None, refresh_token=None, **kwargs):
-        super(Token, self).__init__(access_token, expires_in, refresh_token, **kwargs)
-        self.openid = kwargs.pop('openid', None)
-        self.openkey = kwargs.pop('openkey', None)
-        self.name = kwargs.pop('name', None)
-
-
 class Client(ClientBase):
     #写接口
     _post_methods = ['add', 'del', 'create', 'delete', 'update', 'upload']

chinaapi/renren/open.py

@@ -1,5 +1,5 @@
 # coding=utf-8
-from chinaapi.open import ClientBase, Method, OAuth2Base, Token as TokenBase, App
+from chinaapi.open import ClientBase, Method, OAuth2Base, Token, App
 from chinaapi.exceptions import ApiResponseError
 
 
@@ -29,31 +29,6 @@ def _parse_response(self, response):
         return r
 
 
-class Token(TokenBase):
-    """
-    token_type：Token类型，bearer或者mac
-    scope：Access Token最终的访问范围，既用户实际授予的权限列表
-    user：用户的个人信息，包含用户id，名称“name”，头像“avatar”（
-          包含四种大小不同的尺寸“type”，大小依次为：“tiny”，“avatar”，“main”，“large”）
-    mac_algorithm：当token_type参数为mac时返回该值
-    mac_key：当token_type参数为mac时返回该值
-    """
-
-    class User(object):
-        def __init__(self, id=None, name=None, avatar=None):
-            self.id = id
-            self.name = name
-            self.avatar = avatar
-
-    def __init__(self, access_token=None, expires_in=None, refresh_token=None, **kwargs):
-        super(Token, self).__init__(access_token, expires_in, refresh_token, **kwargs)
-        self.token_type = kwargs.pop('token_type', None)
-        self.scope = kwargs.pop('scope', None)
-        self.user = kwargs.pop('user', None)
-        self.mac_algorithm = kwargs.pop('mac_algorithm', None)
-        self.mac_key = kwargs.pop('mac_key', None)
-
-
 class OAuth2(OAuth2Base):
     AUTH_URL = 'https://graph.renren.com/oauth/authorize'
     TOKEN_URL = 'https://graph.renren.com/oauth/token'
@@ -65,7 +40,6 @@ def _parse_token(self, response):
         r = response.json_dict()
         if 'error_code' in r:
             raise ApiResponseError(response, r.error_code, r.get('error_description', r.get('error', '')))
-        r['user'] = Token.User(**r.pop('user'))
         return Token(**r)
 
 

chinaapi/sina/weibo/open.py

@@ -3,7 +3,7 @@
 import hashlib
 import hmac
 from chinaapi.utils import parse_querystring
-from chinaapi.open import ClientBase, Method, OAuth2Base, Token as TokenBase, App
+from chinaapi.open import ClientBase, Method, OAuth2Base, Token, App
 from chinaapi.exceptions import ApiResponseError
 from chinaapi.jsonDict import loads
 
@@ -71,18 +71,6 @@ def _is_retry_error(self, e):
         return e.code in RETRY_CODES
 
 
-class Token(TokenBase):
-    """
-    uid：授权用户的uid
-    created_at：令牌创建日期，为timestamp格式
-    """
-
-    def __init__(self, access_token=None, expires_in=None, refresh_token=None, **kwargs):
-        super(Token, self).__init__(access_token, expires_in, refresh_token, **kwargs)
-        self.uid = kwargs.pop('uid', None)
-        self.created_at = kwargs.pop('created_at', None)
-
-
 class OAuth2(OAuth2Base):
     BASE_URL = 'https://api.weibo.com/oauth2/'
     AUTH_URL = BASE_URL + 'authorize'
@@ -93,9 +81,9 @@ def __init__(self, app):
 
     def _parse_token(self, response):
         data = parse(response)
-        data['created_at'] = data.pop('create_at', None)
+        data['created_at'] = data.get('create_at', None)
         if 'expires_in' not in data:
-            data['expires_in'] = data.pop('expire_in', None)
+            data['expires_in'] = data.get('expire_in', None)
         return Token(**data)
 
     def revoke(self, access_token):
@@ -127,7 +115,7 @@ def base64decode(s):
         encoded_sign, encoded_data = signed_request.split('.', 1)
         sign = base64decode(encoded_sign)
         data = loads(base64decode(encoded_data))
-        token = Token(data.oauth_token, data.expires, uid=data.user_id, created_at=data.issued_at)
+        token = Token(data.oauth_token, data.expires, uid=data.user_id, created_at=data.issued_at, **data)
         is_valid = data.algorithm == u'HMAC-SHA256' and hmac.new(self.app.key, encoded_data,
                                                                  hashlib.sha256).digest() == sign
         return token, is_valid

chinaapi/taobao/open.py

@@ -4,7 +4,7 @@
 from hashlib import md5
 from datetime import datetime
 from urllib import unquote
-from chinaapi.open import ClientBase, OAuthBase, OAuth2Base, App, Token as TokenBase
+from chinaapi.open import ClientBase, OAuthBase, OAuth2Base, App, Token
 from chinaapi.exceptions import ApiResponseError
 from chinaapi.utils import parse_querystring
 
@@ -94,34 +94,6 @@ def _is_retry_error(self, e):
         return e.sub_code in RETRY_SUB_CODES
 
 
-class Token(TokenBase):
-    """
-    taobao_user_nick：淘宝账号
-    taobao_user_id：淘宝帐号对应id
-    sub_taobao_user_nick：淘宝子账号
-    sub_taobao_user_id：淘宝子账号对应id
-    token_type：Access token的类型目前只支持bearer
-    re_expires_in：Refresh token过期时间
-    r1_expires_in：r1级别API或字段的访问过期时间
-    r2_expires_in：r2级别API或字段的访问过期时间
-    w1_expires_in：w1级别API或字段的访问过期时间
-    w2_expires_in：w2级别API或字段的访问过期时间
-    """
-
-    def __init__(self, access_token=None, expires_in=None, refresh_token=None, **kwargs):
-        super(Token, self).__init__(access_token, expires_in, refresh_token, **kwargs)
-        self.taobao_user_nick = kwargs.pop('taobao_user_nick', None)
-        self.taobao_user_id = kwargs.pop('taobao_user_id', None)
-        self.sub_taobao_user_nick = kwargs.pop('sub_taobao_user_nick', None)
-        self.sub_taobao_user_id = kwargs.pop('sub_taobao_user_id', None)
-        self.token_type = kwargs.pop('token_type', None)
-        self.re_expires_in = kwargs.pop('re_expires_in', None)
-        self.r1_expires_in = kwargs.pop('r1_expires_in', None)
-        self.r2_expires_in = kwargs.pop('r2_expires_in', None)
-        self.w1_expires_in = kwargs.pop('w1_expires_in', None)
-        self.w2_expires_in = kwargs.pop('w2_expires_in', None)
-
-
 def parse(response):
     r = response.json_dict()
     if 'error' in r: