Skip to content

glue #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2025
Merged

glue #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions conditional/blueprints/packet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def admin_packets(user_dict=None):
# Pre-calculate and store the return values of did_sign(), signatures_received(), and signatures_required()
for packet in open_packets:
packet.did_sign_result = packet.did_sign(
user_dict["username"], app.config["REALM"] == "csh"
user_dict["username"], session["provider"] == "csh"
)
packet.signatures_received_result = packet.signatures_received()
packet.signatures_required_result = packet.signatures_required()
Expand Down Expand Up @@ -306,7 +306,7 @@ def freshman_packet(packet_id, user_dict=None):
"packet.html",
info=user_dict,
packet=packet,
did_sign=packet.did_sign(user_dict["uid"], app.config["REALM"] == "csh"),
did_sign=packet.did_sign(user_dict["uid"], session["provider"] == "csh"),
required=packet.signatures_required(),
received=packet.signatures_received(),
upper=packet.upper_signatures,
Expand All @@ -333,7 +333,7 @@ def packets(user_dict=None):
# Pre-calculate and store the return values of did_sign(), signatures_received(), and signatures_required()
for packet in open_packets:
packet.did_sign_result = packet.did_sign(
user_dict["uid"], app.config["REALM"] == "csh"
user_dict["uid"], session["provider"] == "csh"
)
packet.signatures_received_result = packet.signatures_received()
packet.signatures_required_result = packet.signatures_required()
Expand All @@ -352,7 +352,7 @@ def index():
"""


@app.route("/upperclassmen/")
@packet_bp.route("/upperclassmen/")
@auth.oidc_auth("default")
@get_user
def upperclassmen_total(user_dict=None):
Expand Down Expand Up @@ -380,7 +380,7 @@ def upperclassmen_total(user_dict=None):
)


@app.route("/stats/packet/<packet_id>")
@packet_bp.route("/stats/packet/<packet_id>")
@auth.oidc_auth("default")
@get_user
def packet_graphs(packet_id, user_dict=None):
Expand Down Expand Up @@ -421,3 +421,17 @@ def agg(l, attr, date):
fresh=stats["freshman"],
packet=Packet.by_id(packet_id),
)


@packet_bp.route("/auth/csh")
@auth.oidc_auth("default")
def csh_login():
session["provider"] = "csh"
return redirect("/packet", code=301)


@packet_bp.route("/auth/frosh")
@auth.oidc_auth("frosh")
def frosh_login():
session["provider"] = "frosh"
return redirect("/packet", code=301)
16 changes: 1 addition & 15 deletions conditional/util/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from flask import request, session, redirect

from conditional import auth, app
from conditional import auth
from conditional.util.ldap import (
ldap_is_active,
ldap_is_alumni,
Expand Down Expand Up @@ -101,17 +101,3 @@ def csh_auth():
@auth.oidc_auth("frosh")
def frosh_auth():
return


@app.route("/auth/csh")
@auth.oidc_auth("default")
def csh_login():
session["provider"] = "csh"
return redirect("/packet", code=301)


@app.route("/auth/frosh")
@auth.oidc_auth("frosh")
def frosh_login():
session["provider"] = "frosh"
return redirect("/packet", code=301)