forked from rDrama/rDrama
ggffg
parent
131b2f05a1
commit
f85973ac82
|
@ -9,7 +9,26 @@ def get_logged_in_user(db=None):
|
|||
if not db:
|
||||
db=g.db
|
||||
|
||||
if "user_id" in session:
|
||||
if request.headers.get("Authorization"):
|
||||
token = request.headers.get("Authorization")
|
||||
if not token: return None, None
|
||||
|
||||
token = token.split()
|
||||
if len(token) < 2:
|
||||
return None, None
|
||||
|
||||
token = token[1]
|
||||
if not token:
|
||||
return None, None
|
||||
|
||||
client = db.query(ClientAuth).filter(
|
||||
ClientAuth.access_token == token).first()
|
||||
#ClientAuth.access_token_expire_utc > int(time.time()
|
||||
|
||||
x = (client.user, client) if client else (None, None)
|
||||
|
||||
|
||||
elif "user_id" in session:
|
||||
|
||||
uid = session.get("user_id")
|
||||
nonce = session.get("login_nonce", 0)
|
||||
|
@ -29,24 +48,6 @@ def get_logged_in_user(db=None):
|
|||
else:
|
||||
x=(v, None)
|
||||
|
||||
else:
|
||||
token = request.headers.get("Authorization")
|
||||
if not token: return None, None
|
||||
|
||||
token = token.split()
|
||||
if len(token) < 2:
|
||||
return None, None
|
||||
|
||||
token = token[1]
|
||||
if not token:
|
||||
return None, None
|
||||
|
||||
client = db.query(ClientAuth).filter(
|
||||
ClientAuth.access_token == token).first()
|
||||
#ClientAuth.access_token_expire_utc > int(time.time()
|
||||
|
||||
x = (client.user, client) if client else (None, None)
|
||||
|
||||
|
||||
if x[0]: x[0].client=x[1]
|
||||
|
||||
|
|
|
@ -215,8 +215,8 @@ def front_all(v):
|
|||
# check if ids exist
|
||||
posts = get_posts(ids, v=v)
|
||||
|
||||
if "user_id" in session: return render_template("home.html", v=v, listing=posts, next_exists=next_exists, sort=sort, t=t, page=page)
|
||||
else: return jsonify({"data": [x.json for x in posts], "next_exists": next_exists})
|
||||
if request.headers.get("Authorization"): return jsonify({"data": [x.json for x in posts], "next_exists": next_exists})
|
||||
else: return render_template("home.html", v=v, listing=posts, next_exists=next_exists, sort=sort, t=t, page=page)
|
||||
|
||||
@cache.memoize(timeout=1500)
|
||||
def changeloglist(v=None, sort="new", page=1 ,t="all", **kwargs):
|
||||
|
|
|
@ -78,10 +78,10 @@ def index():
|
|||
def favicon():
|
||||
return send_file("./assets/images/favicon.png")
|
||||
|
||||
@app.get("/oauthhelp")
|
||||
@app.get("/api")
|
||||
@auth_desired
|
||||
def oauthhelp(v):
|
||||
return render_template("oauthhelp.html", v=v)
|
||||
def api(v):
|
||||
return render_template("api.html", v=v)
|
||||
|
||||
@app.get("/contact")
|
||||
@auth_desired
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<div class="settings">
|
||||
|
||||
|
||||
<h2 class="h5"><a href="/oauthhelp">OAuth Guide</a></h2>
|
||||
<h2 class="h5"><a href="/api">API Guide</a></h2>
|
||||
|
||||
<pre></pre>
|
||||
|
||||
|
|
Loading…
Reference in New Issue