support OAuth 2.0 in command login

Author: Linusp

inoreader/consts.py

@@ -1,3 +1,10 @@
 # coding: utf-8
+import os
+
 BASE_URL = 'https://www.inoreader.com/reader/api/0/'
 LOGIN_URL = 'https://www.inoreader.com/accounts/ClientLogin'
+
+DEFAULT_APPID = '1000000337'
+DEFAULT_APPKEY = 'Bp1UxqT8KbbhNe5lmJUS6bpJ0EKow9Ze'
+
+CONFIG_FILE = os.path.join(os.environ.get('HOME'), '.inoreader')

inoreader/main.py

@@ -7,15 +7,24 @@
 import json
 import codecs
 import logging
+import threading
+from queue import Queue
+from uuid import uuid4
+from functools import partial
 from logging.config import dictConfig
 from collections import defaultdict, Counter
-from configparser import ConfigParser
 
 import yaml
 import click
+from flask import Flask, request
+from requests_oauthlib import OAuth2Session
+
 from inoreader import InoreaderClient
 from inoreader.filter import get_filter
 from inoreader.sim import sim_of, InvIndex
+from inoreader.exception import NotLoginError
+from inoreader.config import InoreaderConfigManager
+from inoreader.consts import DEFAULT_APPID, DEFAULT_APPKEY
 
 
 APPID_ENV_NAME = 'INOREADER_APP_ID'
@@ -57,46 +66,16 @@
 })
 
 
-def read_config():
-    config = ConfigParser()
-    if os.path.exists(CONFIG_FILE):
-        config.read(CONFIG_FILE)
-
-    return config
-
-
-def get_appid_key(config):
-    # 先尝试从配置文件中读取 appid 和 appkey
-    appid = config.get('auth', 'appid') if config.has_section('auth') else None
-    appkey = config.get('auth', 'appkey') if config.has_section('auth') else None
-    if not appid:
-        appid = os.environ.get(APPID_ENV_NAME)
-    if not appkey:
-        appkey = os.environ.get(APPKEY_ENV_NAME)
-
-    return appid, appkey
-
-
 def get_client():
-    config = read_config()
-    appid, appkey = get_appid_key(config)
-    if not appid or not appkey:
-        LOGGER.error("'appid' or 'appkey' is missing")
-        sys.exit(1)
-
-    token = None
-    if config.has_section('auth'):
-        token = config.get('auth', 'token')
-        token = token or os.environ.get(TOKEN_ENV_NAME)
-    if not token:
+    config = InoreaderConfigManager(CONFIG_FILE)
+    if not config.data:
         LOGGER.error("Please login first")
         sys.exit(1)
 
-    userid = None
-    if config.has_section('user'):
-        userid = config.get('user', 'id')
-
-    client = InoreaderClient(appid, appkey, userid=userid, auth_token=token)
+    client = InoreaderClient(
+        config.app_id, config.app_key, config.access_token, config.refresh_token,
+        config.expires_at, userid=config.user_id, config_manager=config
+    )
     return client
 
 
@@ -107,29 +86,65 @@ def main():
 
 @main.command()
 def login():
-    """Login to your inoreader account"""
-    client = InoreaderClient(None, None)
-
-    username = input("EMAIL: ").strip()
-    password = input("PASSWORD: ").strip()
-    status = client.login(username, password)
-    if status:
-        LOGGER.info("Login as '%s'", username)
-        auth_token = client.auth_token
-        config = read_config()
-        if 'auth' in config:
-            config['auth']['token'] = auth_token
-        else:
-            config['auth'] = {'token': auth_token}
-
-        appid, appkey = get_appid_key(config)
-        client = InoreaderClient(appid, appkey, auth_token=auth_token)
-        config['user'] = {'email': username, 'id': client.userinfo()['userId']}
-        with codecs.open(CONFIG_FILE, mode='w', encoding='utf-8') as fconfig:
-            config.write(fconfig)
-        LOGGER.info("save token in config file '%s'", CONFIG_FILE)
+    """Login to your inoreader account with OAuth 2.0"""
+    # run simple daemon http server to handle callback
+    app = Flask(__name__)
+
+    # disable flask output
+    app.logger.disabled = True
+    logger = logging.getLogger('werkzeug')
+    logger.setLevel(logging.ERROR)
+    logger.disabled = True
+    sys.modules['flask.cli'].show_server_banner = lambda *x: None
+
+    # use queue to pass data between threads
+    queue = Queue()
+
+    config = InoreaderConfigManager(CONFIG_FILE)
+    app_id = config.app_id or DEFAULT_APPID
+    app_key = config.app_key or DEFAULT_APPKEY
+    state = str(uuid4())
+    oauth = OAuth2Session(app_id,
+                          redirect_uri='http://localhost:8080/oauth/redirect',
+                          scope='read write',
+                          state=state)
+
+    @app.route('/oauth/redirect')
+    def redirect():
+        token = oauth.fetch_token('https://www.inoreader.com/oauth2/token',
+                                  authorization_response=request.url,
+                                  client_secret=app_key)
+        queue.put(token)
+        queue.task_done()
+        return 'Done.'
+
+    func = partial(app.run, port=8080, debug=False)
+    threading.Thread(target=func, daemon=True).start()
+
+    os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
+    authorization_url, ret_state = oauth.authorization_url('https://www.inoreader.com/oauth2/auth')
+    if state != ret_state:
+        LOGGER.error("Server return bad state")
+        sys.exit(1)
+
+    token = None
+    print('Open the link to authorize access:', authorization_url)
+    while True:
+        token = queue.get()
+        if token:
+            break
+
+    queue.join()
+    if token:
+        config.app_id = app_id
+        config.app_key = app_key
+        config.access_token = token['access_token']
+        config.refresh_token = token['refresh_token']
+        config.expires_at = token['expires_at']
+        config.save()
+        print("Login successfully, tokens are saved in config file %s" % config.config_file)
     else:
-        LOGGER.info("Login failed: Wrong username or password")
+        print("Login failed, please check your environment or try again later.")
         sys.exit(1)