diff --git a/app-ajax.py b/app-ajax.py index 661f13f..f8c1ebe 100755 --- a/app-ajax.py +++ b/app-ajax.py @@ -6,13 +6,22 @@ import pprint import configparser import json import appdb, appsms -from flask import Flask, render_template, request +#from flask import Flask, render_template, request +import flask +from authlib.client import OAuth2Session +import google.oauth2.credentials +import googleapiclient.discovery + +import google_auth config = configparser.ConfigParser() config.read('config.ini') app_debug = config.get("app","debug") -app = Flask(__name__) +app = flask.Flask(__name__) +app.secret_key = config.get("auth","FN_FLASK_SECRET_KEY") + +app.register_blueprint(google_auth.app) if app_debug == '1': app.debug = True else: @@ -20,7 +29,10 @@ else: @app.route('/') def index(): - return render_template('index.html') + if google_auth.is_logged_in(): + user_info = google_auth.get_user_info() + return '
You are currently logged in as ' + user_info['given_name'] + '
' + json.dumps(user_info, indent=4) + "
" + return 'You are not currently logged in.' @app.route('/single/', methods=['GET']) def manageSingleSMS(number): diff --git a/apptest.py b/apptest.py new file mode 100644 index 0000000..b15e25f --- /dev/null +++ b/apptest.py @@ -0,0 +1,36 @@ +import functools +import json +import os +import configparser + +import flask + +from authlib.client import OAuth2Session +import google.oauth2.credentials +import googleapiclient.discovery + +import google_auth + +config = configparser.ConfigParser() +config.read('config.ini') +app_debug = config.get("app","debug") + + +app = flask.Flask(__name__) +app.secret_key = config.get("auth","FN_FLASK_SECRET_KEY") + +app.register_blueprint(google_auth.app) + +@app.route('/') +def index(): + if google_auth.is_logged_in(): + user_info = google_auth.get_user_info() + return '
You are currently logged in as ' + user_info['given_name'] + '
' + json.dumps(user_info, indent=4) + "
" + + return 'You are not currently logged in.' + +if __name__ == '__main__': + app.run( + host="0.0.0.0", + port=int("8020") + ) \ No newline at end of file diff --git a/google_auth.py b/google_auth.py index f31fac4..ca972e3 100755 --- a/google_auth.py +++ b/google_auth.py @@ -5,7 +5,8 @@ import functools import os -from flask import Flask, request, session, render_template, flash +#from flask import Flask, request, session, render_template, flash +import flask import configparser from authlib.client import OAuth2Session import google.oauth2.credentials @@ -25,21 +26,18 @@ BASE_URI = config.get("auth","FN_BASE_URI") CLIENT_ID = config.get("auth","FN_CLIENT_ID") CLIENT_SECRET = config.get("auth","FN_CLIENT_SECRET") +#FN_FLASK_SECRET_KEY AUTH_TOKEN_KEY = 'auth_token' AUTH_STATE_KEY = 'auth_state' -#app = Flask.Blueprint('google_auth', __name__) -app = flask.Flask(__name__) -if app_debug == '1': - app.debug = True -else: - app.debug = False +app = flask.Blueprint('google_auth', __name__) +#app = flask.Flask(__name__) +#if app_debug == '1': +app.debug = True +##else: +#app.debug = False + -if __name__ == '__main__': - app.run( - host="0.0.0.0", - port=int("8020") - ) def is_logged_in(): return True if AUTH_TOKEN_KEY in flask.session else False @@ -69,7 +67,7 @@ def get_user_info(): def no_cache(view): @functools.wraps(view) def no_cache_impl(*args, **kwargs): - response = app.make_response(view(*args, **kwargs)) + response = flask.make_response(view(*args, **kwargs)) response.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, max-age=0' response.headers['Pragma'] = 'no-cache' response.headers['Expires'] = '-1' @@ -120,3 +118,10 @@ def logout(): flask.session.pop(AUTH_STATE_KEY, None) return flask.redirect(BASE_URI, code=302) + + +if __name__ == '__main__': + app.run( + host="0.0.0.0", + port=int("8020") + ) \ No newline at end of file