Skip to content

Commit eb73d12

Browse files
author
shaeespring
committed
testing Joe's idea
1 parent c0b12cb commit eb73d12

File tree

1 file changed

+39
-23
lines changed

1 file changed

+39
-23
lines changed

profiles/__init__.py

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
from werkzeug.exceptions import NotFound
88
from flask import Flask, flash, jsonify, redirect, render_template, request
99
from flask_pyoidc.flask_pyoidc import OIDCAuthentication
10-
from flask_pyoidc.provider_configuration import ProviderConfiguration, ClientRegistrationInfo
10+
from flask_pyoidc.provider_configuration import (
11+
ProviderConfiguration,
12+
ClientRegistrationInfo,
13+
)
1114
from flask_sqlalchemy import SQLAlchemy
1215
from flask_uploads import IMAGES, UploadSet, configure_uploads
1316
from sentry_sdk.integrations.flask import FlaskIntegration
@@ -24,11 +27,11 @@
2427

2528
auth = OIDCAuthentication(
2629
{
27-
'default': ProviderConfiguration(
30+
"default": ProviderConfiguration(
2831
issuer=app.config["OIDC_ISSUER"],
29-
client_registration_info=ClientRegistrationInfo(
30-
**app.config["OIDC_CLIENT_CONFIG"]
31-
)
32+
client_metadata=ClientMetadata(
33+
app.config["OIDC_CLIENT_ID"], app.config["OIDC_CLIENT_SECRET"]
34+
),
3235
)
3336
},
3437
app,
@@ -51,43 +54,56 @@
5154

5255
# Import ldap model after instantiating object
5356
# pylint: disable=wrong-import-position
54-
from profiles.ldap import (BadQueryError, _ldap_get_group_members,
55-
get_gravatar, get_image, ldap_get_active_members,
56-
ldap_get_all_members, ldap_get_current_students,
57-
ldap_get_eboard, ldap_get_group_desc,
58-
ldap_get_groups, ldap_get_intro_members,
59-
ldap_get_member, ldap_get_onfloor_members,
60-
ldap_get_year, ldap_is_active, ldap_is_rtp,
61-
ldap_search_members, ldap_update_profile,
62-
proxy_image)
57+
from profiles.ldap import (
58+
BadQueryError,
59+
_ldap_get_group_members,
60+
get_gravatar,
61+
get_image,
62+
ldap_get_active_members,
63+
ldap_get_all_members,
64+
ldap_get_current_students,
65+
ldap_get_eboard,
66+
ldap_get_group_desc,
67+
ldap_get_groups,
68+
ldap_get_intro_members,
69+
ldap_get_member,
70+
ldap_get_onfloor_members,
71+
ldap_get_year,
72+
ldap_is_active,
73+
ldap_is_rtp,
74+
ldap_search_members,
75+
ldap_update_profile,
76+
proxy_image,
77+
)
6378
from profiles.utils import before_request, get_member_info, process_image
79+
6480
# pylint: enable=wrong-import-position
6581

6682

6783
@app.route("/", methods=["GET"])
68-
@auth.oidc_auth('default')
84+
@auth.oidc_auth("default")
6985
@before_request
7086
def home(info=None):
7187
return redirect("/user/" + info["uid"], code=302)
7288

7389

7490
@app.route("/user/<uid>", methods=["GET"])
75-
@auth.oidc_auth('default')
91+
@auth.oidc_auth("default")
7692
@before_request
7793
def user(uid=None, info=None):
7894
return render_template("profile.html", info=info, member_info=get_member_info(uid))
7995

8096

8197
@app.route("/results", methods=["POST"])
82-
@auth.oidc_auth('default')
98+
@auth.oidc_auth("default")
8399
@before_request
84100
def results():
85101
searched = request.form["query"]
86102
return redirect(f"/search/{searched}", 302)
87103

88104

89105
@app.route("/search", methods=["GET"])
90-
@auth.oidc_auth('default')
106+
@auth.oidc_auth("default")
91107
@before_request
92108
def search(searched=None, info=None):
93109
# return jsonify(ldap_search_members(searched))
@@ -101,7 +117,7 @@ def search(searched=None, info=None):
101117

102118

103119
@app.route("/group/<_group>", methods=["GET"])
104-
@auth.oidc_auth('default')
120+
@auth.oidc_auth("default")
105121
@before_request
106122
def group(_group=None, info=None):
107123
group_desc = ldap_get_group_desc(_group)
@@ -120,7 +136,7 @@ def group(_group=None, info=None):
120136

121137

122138
@app.route("/year/<_year>", methods=["GET"])
123-
@auth.oidc_auth('default')
139+
@auth.oidc_auth("default")
124140
@before_request
125141
def year(_year=None, info=None):
126142
return render_template(
@@ -129,7 +145,7 @@ def year(_year=None, info=None):
129145

130146

131147
@app.route("/update", methods=["POST"])
132-
@auth.oidc_auth('default')
148+
@auth.oidc_auth("default")
133149
@before_request
134150
def update(info=None):
135151
if "photo" in request.form:
@@ -141,7 +157,7 @@ def update(info=None):
141157

142158

143159
@app.route("/upload", methods=["POST"])
144-
@auth.oidc_auth('default')
160+
@auth.oidc_auth("default")
145161
@before_request
146162
def upload(info=None):
147163
if "photo" in request.form:
@@ -162,7 +178,7 @@ def image(uid):
162178

163179

164180
@app.route("/clearcache")
165-
@auth.oidc_auth('default')
181+
@auth.oidc_auth("default")
166182
@before_request
167183
def clear_cache(info=None):
168184
if not ldap_is_rtp(info["user_obj"]):

0 commit comments

Comments
 (0)