Merge pull request #9 from devinmatte/master

Setting up multiple realms for freshmen login

Author: devinmatte

config.env.py

@@ -6,6 +6,7 @@
 PORT = environ.get("PACKET_PORT", "8000")
 SERVER_NAME = environ.get("PACKET_SERVER_NAME", IP + ":" + PORT)
 SECRET_KEY = environ.get("PACKET_SECRET_KEY", "PLEASE_REPLACE_ME")
+REALM = environ.get("PACKET_REALM", "intro")
 
 # OpenID Connect SSO config
 OIDC_ISSUER = environ.get("PACKET_OIDC_ISSUER", "https://sso.csh.rit.edu/auth/realms/csh")

packet/__init__.py

@@ -35,6 +35,9 @@
 flask_saml.FlaskSAML(app)
 
 # pylint: disable=wrong-import-position
-from . import routes
+if app.config["REALM"] == "csh":
+    from .routes import upperclassmen
+else:
+    from .routes import freshmen
 from . import commands
 from . import models

packet/routes.py

@@ -0,0 +1,39 @@
+from flask import render_template, redirect
+
+from packet import auth, app
+from packet.ldap import ldap_get_live_onfloor, ldap_get_eboard
+from packet.utils import before_request
+
+
+@app.route("/")
+@before_request
+def index(info=None):
+    return redirect("/packet/" + info['uid'], 302)
+
+
+@app.route("/packet/<uid>")
+@auth.oidc_auth
+@before_request
+def freshman_packet(uid, info=None):
+    onfloor = ldap_get_live_onfloor()
+    eboard = ldap_get_eboard()
+    return render_template("packet.html", info=info, eboard=eboard, onfloor=onfloor, uid=uid)
+
+
+@app.route("/packets")
+@auth.oidc_auth
+@before_request
+def packets(info=None):
+    freshmen = [
+        {
+            "name": "Testiboi",
+            "signatures": 12,
+            "uid": 111
+        },
+        {
+            "name": "Ram Zallllllan",
+            "signatures": 69,
+            "uid": 420
+        }
+    ]
+    return render_template("active_packets.html", info=info, freshmen=freshmen)

packet/routes/freshmen.py

@@ -0,0 +1,38 @@
+from flask import render_template, redirect
+
+from packet import auth, app
+from packet.ldap import ldap_get_live_onfloor, ldap_get_eboard
+from packet.utils import before_request
+
+
+@app.route("/")
+def index():
+    return redirect("/packets", 302)
+
+
+@app.route("/packet/<uid>")
+@auth.oidc_auth
+@before_request
+def freshman_packet(uid, info=None):
+    onfloor = ldap_get_live_onfloor()
+    eboard = ldap_get_eboard()
+    return render_template("packet.html", info=info, eboard=eboard, onfloor=onfloor, uid=uid)
+
+
+@app.route("/packets")
+@auth.oidc_auth
+@before_request
+def packets(info=None):
+    freshmen = [
+        {
+            "name": "Testiboi",
+            "signatures": 12,
+            "uid": 111
+        },
+        {
+            "name": "Ram Zallllllan",
+            "signatures": 69,
+            "uid": 420
+        }
+    ]
+    return render_template("active_packets.html", info=info, freshmen=freshmen)

packet/routes/upperclassmen.py

@@ -11,7 +11,7 @@
             <ul class="navbar-nav mr-auto">
 
                 <li class="nav-item">
-                    <a class="nav-link" href="/">Active Packets</a>
+                    <a class="nav-link" href="/packets">Active Packets</a>
                 </li>
 
             </ul>
@@ -25,9 +25,11 @@
                     </a>
 
                     <div class="dropdown-menu" aria-labelledby="user01">
-                        <a class="dropdown-item" href="/">Profile</a>
-                        <a class="dropdown-item" href="https://themeswitcher.csh.rit.edu/">Theme</a>
-                        <div class="dropdown-divider"></div>
+                        {% if info.realm == "csh" %}
+                            <a class="dropdown-item" href="/">Profile</a>
+                            <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>
                     </div>
 

packet/templates/include/nav.html

@@ -9,8 +9,6 @@
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
 
-<script src="/static/js/adaptive-background.js"></script>
-
 <script type="text/javascript">
   $(document).ready(function(){
   	$('[data-toggle="tooltip"]').tooltip()

packet/templates/include/scripts.html

@@ -13,21 +13,33 @@
                          ldap_get_roomnumber,
                          ldap_get_groups)
 
+INTRO_REALM = "https://sso.csh.rit.edu/auth/realms/intro"
+
 
 def before_request(func):
     @wraps(func)
     def wrapped_function(*args, **kwargs):
-        uuid = str(session["userinfo"].get("sub", ""))
         uid = str(session["userinfo"].get("preferred_username", ""))
-        user_obj = _ldap.get_member(uid, uid=True)
-        info = {
-            "uuid": uuid,
-            "uid": uid,
-            "user_obj": user_obj,
-            "member_info": get_member_info(uid),
-            "color": requests.get('https://themeswitcher.csh.rit.edu/api/colour').content,
-            "current_year": parse_account_year(str(datetime.datetime.now().strftime("%Y%m")))
-        }
+
+        if session["id_token"]["iss"] == INTRO_REALM:
+            info = {
+                "realm": "intro",
+                "uid": uid,
+                "current_year": parse_account_year(str(datetime.datetime.now().strftime("%Y%m")))
+            }
+        else:
+            uuid = str(session["userinfo"].get("sub", ""))
+            user_obj = _ldap.get_member(uid, uid=True)
+            info = {
+                "realm": "csh",
+                "uuid": uuid,
+                "uid": uid,
+                "user_obj": user_obj,
+                "member_info": get_member_info(uid),
+                "color": requests.get('https://themeswitcher.csh.rit.edu/api/colour').content,
+                "current_year": parse_account_year(str(datetime.datetime.now().strftime("%Y%m")))
+            }
+
         kwargs["info"] = info
         return func(*args, **kwargs)
 

packet/utils.py

@@ -1,9 +1,9 @@
 Flask==1.0.2
-Flask-pyoidc==1.3.0
+Flask-pyoidc>=1.3.0
 flask_sqlalchemy==2.3.2
 psycopg2==2.7.5
 Flask-Migrate==2.2.1
-pylint==2.0.1
+pylint==2.1.1
 flask_saml==0.4.3
 gunicorn==19.7.1
-csh_ldap
+csh_ldap>=2.1.0