Refactoring, docs, and removed dead code

Author: JoelEager

config.env.py

@@ -14,9 +14,6 @@
 OIDC_CLIENT_ID = environ.get("PACKET_OIDC_CLIENT_ID", "packet")
 OIDC_CLIENT_SECRET = environ.get("PACKET_OIDC_CLIENT_SECRET", "PLEASE_REPLACE_ME")
 
-# SAML config
-SAML_METADATA_URL = environ.get("PACKET_SAML_METADATA_URL", "https://shibboleth.main.ad.rit.edu/rit-metadata.xml")
-
 # SQLAlchemy config
 SQLALCHEMY_DATABASE_URI = environ.get("PACKET_DATABASE_URI", None)
 SQLALCHEMY_TRACK_MODIFICATIONS = False

packet/__init__.py

@@ -33,16 +33,15 @@
 })
 
 # LDAP
-_ldap = csh_ldap.CSHLDAP(app.config['LDAP_BIND_DN'], app.config['LDAP_BIND_PASS'])
+_ldap = csh_ldap.CSHLDAP(app.config["LDAP_BIND_DN"], app.config["LDAP_BIND_PASS"])
 
 # pylint: disable=wrong-import-position
+from . import models
 from . import context_processors
+from . import commands
+from .routes import api, shared
 
 if app.config["REALM"] == "csh":
     from .routes import upperclassmen
 else:
     from .routes import freshmen
-
-from .routes import api, shared
-from . import commands
-from . import models

packet/models.py

@@ -103,6 +103,10 @@ def did_sign(self, username, is_csh):
         # The user must be a misc CSHer that hasn't signed this packet or an off-floor freshmen
         return False
 
+    @classmethod
+    def open_packets(cls):
+        return cls.query.filter(cls.start < datetime.now(), cls.end > datetime.now()).all()
+
 class UpperSignature(db.Model):
     __tablename__ = "signature_upper"
     packet_id = Column(Integer, ForeignKey("packet.id"), primary_key=True)

packet/routes/shared.py

@@ -2,18 +2,17 @@
 Routes available to both freshmen and CSH users
 """
 
-from datetime import datetime
 from flask import render_template, redirect
 
 from packet import auth, app
 from packet.utils import before_request
 from packet.models import Packet
 
 
-@app.route('/logout')
+@app.route("/logout/")
 @auth.oidc_logout
 def logout():
-    return redirect("/")
+    return redirect("http://csh.rit.edu")
 
 
 @app.route("/packet/<freshman_username>/<packet_id>/")
@@ -47,7 +46,7 @@ def freshman_packet(freshman_username, packet_id, info=None):
 @auth.oidc_auth
 @before_request
 def packets(info=None):
-    open_packets = Packet.query.filter(Packet.start < datetime.now(), Packet.end > datetime.now()).all()
+    open_packets = Packet.open_packets()
 
     # Pre-calculate and store the return values of did_sign(), signatures_received(), and signatures_required()
     for packet in open_packets:

packet/templates/include/nav.html

@@ -1,6 +1,6 @@
 <nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary">
     <div class="container">
-        <a class="navbar-brand" href="/">Packet</a>
+        <a class="navbar-brand" href="{{ url_for("index") }}">Packet</a>
 
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01"
                 aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
@@ -11,16 +11,16 @@
             <ul class="navbar-nav mr-auto">
 
                 <li class="nav-item">
-                    <a class="nav-link" href="/packets">Active Packets</a>
+                    <a class="nav-link" href="{{ url_for("packets") }}">Active Packets</a>
                 </li>
 
                 {% if info.realm == "csh" %}
                     <li class="nav-item">
-                        <a class="nav-link" href="/upperclassmen">Signatures</a>
+                        <a class="nav-link" href="{{ url_for("upperclassmen_total") }}">Signatures</a>
                     </li>
                 {% else %}
                      <li class="nav-item">
-                        <a class="nav-link" href="/essays">Essays</a>
+                        <a class="nav-link" href="{{ url_for("essays") }}">Essays</a>
                     </li>
                 {% endif %}
 
@@ -41,7 +41,7 @@
                             <a class="dropdown-item" href="https://themeswitcher.csh.rit.edu/">Theme</a>
                             <div class="dropdown-divider"></div>
                         {% endif %}
-                        <a class="dropdown-item" href="/logout">Logout</a>
+                        <a class="dropdown-item" href="{{ url_for("logout") }}">Logout</a>
                     </div>
 
                 </li>