diff --git a/.gitignore b/.gitignore index 2f4242f..99eb5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ run.bat +run.sh # See https://help.github.com/ignore-files/ for more about ignoring files. diff --git a/app.py b/app.py index b596cfb..3555b35 100644 --- a/app.py +++ b/app.py @@ -4,7 +4,9 @@ import flask -from authlib.client import OAuth2Session +#authlib==0.11#from authlib.client import OAuth2Session +from authlib.integrations.requests_client import OAuth2Session + import google.oauth2.credentials import googleapiclient.discovery @@ -29,4 +31,6 @@ def index(): return flask.render_template('list.html', files=items['files'], user_info=google_auth.get_user_info()) - return 'You are not currently logged in.' \ No newline at end of file + #return 'You are not currently logged in.' + #return 'login' + return flask.render_template('login.html') diff --git a/google_auth.py b/google_auth.py index bbdc832..1d5fcde 100644 --- a/google_auth.py +++ b/google_auth.py @@ -3,7 +3,9 @@ import flask -from authlib.client import OAuth2Session +#authlib==0.11#from authlib.client import OAuth2Session +from authlib.integrations.requests_client import OAuth2Session + import google.oauth2.credentials import googleapiclient.discovery @@ -65,7 +67,8 @@ def login(): scope=AUTHORIZATION_SCOPE, redirect_uri=AUTH_REDIRECT_URI) - uri, state = session.authorization_url(AUTHORIZATION_URL) +#authlib==0.11 uri, state = session.authorization_url(AUTHORIZATION_URL) + uri, state = session.create_authorization_url(AUTHORIZATION_URL) flask.session[AUTH_STATE_KEY] = state flask.session.permanent = True diff --git a/requirements.txt b/requirements.txt index 437eb34..330b2ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ -authlib==0.11 +#authlib==0.11 +authlib==0.15 flask==1.0.2 google-api-python-client google-auth -virtualenv \ No newline at end of file +virtualenv +testresources \ No newline at end of file diff --git a/templates/login.html b/templates/login.html new file mode 100644 index 0000000..2b469d5 --- /dev/null +++ b/templates/login.html @@ -0,0 +1,28 @@ + + +
+ + + +