Revert "s/username/uid/g (#234)"

devinmatte · web-flow · commit 902464a6927a · 2019-09-19T21:38:29.000-04:00
This reverts commit a4f0c51.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-6.3.1
+6.3.1
diff --git a/conditional/__init__.py b/conditional/__init__.py
@@ -147,7 +147,7 @@ def route_errors(error, user_dict=None):
     data = dict()
 
     # Handle the case where the header isn't present
-    if user_dict['uid'] is not None:
+    if user_dict['username'] is not None:
         data['username'] = user_dict['account'].uid
         data['name'] = user_dict['account'].cn
     else:
diff --git a/conditional/blueprints/attendance.py b/conditional/blueprints/attendance.py
@@ -137,7 +137,7 @@ def display_attendance_cm(user_dict=None):
     log.info('Display Committee Meeting Attendance Page')
 
     return render_template('attendance_cm.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"))
 
 
@@ -149,7 +149,7 @@ def display_attendance_ts(user_dict=None):
     log.info('Display Technical Seminar Attendance Page')
 
     return render_template('attendance_ts.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"))
 
 
@@ -164,7 +164,7 @@ def display_attendance_hm(user_dict=None):
         return redirect("/dashboard")
 
     return render_template('attendance_hm.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"),
                            members=get_non_alumni_non_coop(internal=True))
 
@@ -435,7 +435,7 @@ def get_seminar_attendees(meeting_id):
     else:
         total_pages = (int(len(all_cm) / 10))
     return render_template('attendance_history.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            history=all_meetings,
                            pending_cm=pend_cm,
                            pending_ts=pend_ts,
diff --git a/conditional/blueprints/co_op.py b/conditional/blueprints/co_op.py
@@ -24,10 +24,10 @@ def display_co_op_form(user_dict=None):
     log.info('Display Co-Op Submission Page')
 
     co_op = CurrentCoops.query.filter(
-        CurrentCoops.uid == user_dict['uid'], CurrentCoops.date_created > start_of_year()).first()
+        CurrentCoops.uid == user_dict['username'], CurrentCoops.date_created > start_of_year()).first()
 
     return render_template('co_op.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            year=start_of_year().year,
                            on_coop=co_op)
 
@@ -48,14 +48,14 @@ def submit_co_op_form(user_dict=None):
 
     log.info('Submit {} Co-Op'.format(semester))
 
-    if CurrentCoops.query.filter(CurrentCoops.uid == user_dict['uid'],
+    if CurrentCoops.query.filter(CurrentCoops.uid == user_dict['username'],
                                  CurrentCoops.date_created > start_of_year()).first():
         return "User has already submitted this form!", 403
 
     # Add to corresponding co-op ldap group
     ldap_add_member_to_group(user_dict['account'], semester.lower() + '_coop')
 
-    co_op = CurrentCoops(uid=user_dict['uid'], semester=semester)
+    co_op = CurrentCoops(uid=user_dict['username'], semester=semester)
     db.session.add(co_op)
     db.session.flush()
     db.session.commit()
@@ -106,6 +106,6 @@ def display_co_op_management(user_dict=None):
             CurrentCoops.semester != "Neither")]
 
     return render_template("co_op_management.html",
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            co_op=co_op_list,
                            )
diff --git a/conditional/blueprints/conditional.py b/conditional/blueprints/conditional.py
@@ -33,7 +33,7 @@ def display_conditionals(user_dict=None):
             Conditional.status == "Pending")]
 
     return render_template('conditional.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            conditionals=conditionals,
                            conditionals_len=len(conditionals))
 
diff --git a/conditional/blueprints/housing.py b/conditional/blueprints/housing.py
@@ -53,9 +53,9 @@ def display_housing(user_dict=None):
             housing[room] = [name]
             room_list.add(room)
 
-    # return names in 'first last (uid)' format
+    # return names in 'first last (username)' format
     return render_template('housing.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            queue=get_housing_queue(ldap_is_eval_director(user_dict['account'])),
                            housing=housing,
                            room_list=sorted(list(room_list)))
diff --git a/conditional/blueprints/intro_evals.py b/conditional/blueprints/intro_evals.py
@@ -154,7 +154,7 @@ def get_fid_cm_count(member_id):
     if internal:
         return ie_members
 
-    # return names in 'first last (uid)' format
+    # return names in 'first last (username)' format
     return render_template('intro_evals.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            members=ie_members)
diff --git a/conditional/blueprints/intro_evals_form.py b/conditional/blueprints/intro_evals_form.py
@@ -24,12 +24,12 @@ def display_intro_evals_form(user_dict=None):
     if not ldap_is_intromember(user_dict['account']):
         return redirect("/dashboard")
     eval_data = FreshmanEvalData.query.filter(
-        FreshmanEvalData.uid == user_dict['uid']).first()
+        FreshmanEvalData.uid == user_dict['username']).first()
 
     is_open = EvalSettings.query.first().intro_form_active
-    # return names in 'first last (uid)' format
+    # return names in 'first last (username)' format
     return render_template('intro_evals_form.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            social_events=eval_data.social_events,
                            other_notes=eval_data.other_notes,
                            is_open=is_open)
@@ -47,7 +47,7 @@ def submit_intro_evals(user_dict=None):
     comments = post_data['comments']
 
     FreshmanEvalData.query.filter(
-        FreshmanEvalData.uid == user_dict['uid']). \
+        FreshmanEvalData.uid == user_dict['username']). \
         update(
         {
             'social_events': social_events,
diff --git a/conditional/blueprints/logs.py b/conditional/blueprints/logs.py
@@ -27,4 +27,4 @@ def display_logs(user_dict=None):
 
     logs = UserLog.query.all()
 
-    return render_template("logs.html", logs=logs, username=user_dict['uid'])
+    return render_template("logs.html", logs=logs, username=user_dict['username'])
diff --git a/conditional/blueprints/major_project_submission.py b/conditional/blueprints/major_project_submission.py
@@ -32,18 +32,18 @@ def display_major_project(user_dict=None):
             'status': p.status,
             'description': p.description,
             'id': p.id,
-            'is_owner': bool(user_dict['uid'] == p.uid)
+            'is_owner': bool(user_dict['username'] == p.uid)
         } for p in
         MajorProject.query.filter(
             MajorProject.date > start_of_year()).order_by(
                 desc(MajorProject.id))]
 
     major_projects_len = len(major_projects)
-    # return names in 'first last (uid)' format
+    # return names in 'first last (username)' format
     return render_template('major_project_submission.html',
                            major_projects=major_projects,
                            major_projects_len=major_projects_len,
-                           username=user_dict['uid'])
+                           username=user_dict['username'])
 
 
 @major_project_bp.route('/major_project/submit', methods=['POST'])
@@ -59,7 +59,7 @@ def submit_major_project(user_dict=None):
 
     if name == "" or description == "":
         return jsonify({"success": False}), 400
-    project = MajorProject(user_dict['uid'], name, description)
+    project = MajorProject(user_dict['username'], name, description)
 
     db.session.add(project)
     db.session.commit()
@@ -105,7 +105,7 @@ def major_project_delete(pid, user_dict=None):
     ).first()
     creator = major_project.uid
 
-    if creator == user_dict['uid'] or ldap_is_eval_director(user_dict['account']):
+    if creator == user_dict['username'] or ldap_is_eval_director(user_dict['account']):
         MajorProject.query.filter(
             MajorProject.id == pid
         ).delete()
diff --git a/conditional/blueprints/member_management.py b/conditional/blueprints/member_management.py
@@ -87,7 +87,7 @@ def display_member_management(user_dict=None):
         accept_dues_until = datetime.now()
 
     return render_template("member_management.html",
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            active=member_list,
                            num_current=len(member_list),
                            num_active=len(ldap_get_active_members()),
@@ -228,7 +228,7 @@ def member_management_edituser(uid, user_dict=None):
         return "must be eval director", 403
 
     if not uid.isdigit():
-        edit_uid(uid, request, user_dict['uid'])
+        edit_uid(uid, request, user_dict['username'])
     else:
         edit_fid(uid, request)
 
@@ -375,7 +375,7 @@ def get_hm_date(hm_id):
 
     account = ldap_get_member(uid)
 
-    if ldap_is_eval_director(ldap_get_member(user_dict['uid'])):
+    if ldap_is_eval_director(ldap_get_member(user_dict['username'])):
         missed_hm = [
             {
                 'date': get_hm_date(hma.meeting_id),
@@ -519,7 +519,7 @@ def member_management_make_user_active(user_dict=None):
         return "must be current student, not in bad standing and not active", 403
 
     ldap_set_active(user_dict['account'])
-    log.info("Make user {} active".format(user_dict['uid']))
+    log.info("Make user {} active".format(user_dict['username']))
 
     clear_members_cache()
     return jsonify({"success": True}), 200
@@ -558,7 +558,7 @@ def clear_active_members(user_dict=None):
 
     # Clear the active group.
     for account in members:
-        if account.uid != user_dict['uid']:
+        if account.uid != user_dict['username']:
             log.info('Remove {} from Active Status'.format(account.uid))
             ldap_set_inactive(account)
     return jsonify({"success": True}), 200
@@ -623,5 +623,5 @@ def new_year(user_dict=None):
     current_students = ldap_get_current_students()
 
     return render_template('new_year.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            current_students=current_students)
diff --git a/conditional/blueprints/slideshow.py b/conditional/blueprints/slideshow.py
@@ -30,7 +30,7 @@ def slideshow_intro_display(user_dict=None):
         return redirect("/dashboard")
 
     return render_template('intro_eval_slideshow.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"),
                            members=display_intro_evals(internal=True))
 
@@ -86,7 +86,7 @@ def slideshow_spring_display(user_dict=None):
         return redirect("/dashboard")
 
     return render_template('spring_eval_slideshow.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            date=datetime.now().strftime("%Y-%m-%d"),
                            members=display_spring_evals(internal=True))
 
diff --git a/conditional/blueprints/spring_evals.py b/conditional/blueprints/spring_evals.py
@@ -96,10 +96,10 @@ def display_spring_evals(internal=False, user_dict=None):
     sp_members.sort(key=lambda x: x['committee_meetings'], reverse=True)
     sp_members.sort(key=lambda x: len(x['house_meetings_missed']))
     sp_members.sort(key=lambda x: len([p for p in x['major_projects'] if p['status'] == "Passed"]), reverse=True)
-    # return names in 'first last (uid)' format
+    # return names in 'first last (username)' format
     if internal:
         return sp_members
 
     return render_template('spring_evals.html',
-                           username=user_dict['uid'],
+                           username=user_dict['username'],
                            members=sp_members)
diff --git a/conditional/util/auth.py b/conditional/util/auth.py
@@ -31,12 +31,12 @@ def wrapped_func(*args, **kwargs):
 def get_user(func):
     @wraps(func)
     def wrapped_function(*args, **kwargs):
-        uid = str(session["userinfo"].get("preferred_username", ""))
-        account = ldap_get_member(uid)
+        username = str(session["userinfo"].get("preferred_username", ""))
+        account = ldap_get_member(username)
         current_student = ldap_is_current_student(account)
 
         user_dict = {
-            'uid': uid,
+            'username': username,
             'account': account,
             'student': current_student
         }
diff --git a/conditional/util/context_processors.py b/conditional/util/context_processors.py
@@ -14,8 +14,8 @@ def get_member_name(uid):
 
 
 @service_cache(maxsize=256)
-def get_csh_name(uid):
-    member = ldap_get_member(uid)
+def get_csh_name(username):
+    member = ldap_get_member(username)
     return member.cn
 
 
@@ -26,8 +26,8 @@ def get_freshman_name(uid):
 
 
 @service_cache(maxsize=256)
-def check_current_student(uid):
-    member = ldap_get_member(uid)
+def check_current_student(username):
+    member = ldap_get_member(username)
     return ldap_is_current_student(member)
 
 
diff --git a/conditional/util/housing.py b/conditional/util/housing.py
@@ -18,9 +18,9 @@ def get_housing_queue(is_eval_director=False):
     .with_entities(InHousingQueue.uid, OnFloorStatusAssigned.onfloor_granted)\
     .all()}
 
-    # Populate a list of dictionaries containing the name, uid, and
-    # on-floor datetime for each member who has on-floor status, is
-    # not already assigned to a room and is in the above query.
+    # Populate a list of dictionaries containing the name, username,
+    # and on-floor datetime for each member who has on-floor status,
+    # is not already assigned to a room and is in the above query.
     queue = [{"uid": account.uid,
               "name": account.cn,
               "points": account.housingPoints,
@@ -37,11 +37,11 @@ def get_housing_queue(is_eval_director=False):
     return queue
 
 
-def get_queue_position(uid):
+def get_queue_position(username):
     queue = get_housing_queue()
     try:
         index = next(index for (index, d) in enumerate(get_housing_queue())
-                     if d["uid"] == uid) + 1
+                     if d["uid"] == username) + 1
     except (KeyError, StopIteration):
         index = None
     return index, len(queue)
diff --git a/conditional/util/ldap.py b/conditional/util/ldap.py
@@ -34,8 +34,8 @@ def _ldap_is_member_of_directorship(account, directorship):
 
 
 @service_cache(maxsize=1024)
-def ldap_get_member(uid):
-    return ldap.get_member(uid, uid=True)
+def ldap_get_member(username):
+    return ldap.get_member(username, uid=True)
 
 
 @service_cache(maxsize=1024)

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,4 @@ def display_logs(user_dict=None):`
`27`	`27`
`28`	`28`	`logs = UserLog.query.all()`
`29`	`29`
`30`		`- return render_template("logs.html", logs=logs, username=user_dict['uid'])`
	`30`	`+ return render_template("logs.html", logs=logs, username=user_dict['username'])`