Skip to content

Commit bcd78f6

Browse files
goultergithub-actions[bot]
goulter
and
github-actions[bot]
authored
[GH-210, 212] Fix more DAI issues and broken link (#211)
* Fix multiple DAI issues * fix the docker compose command * update dockerfile * added setup-tools due to error, ModuleNotFoundError: No module named 'pkg_resources' * pinl setuptools to <=82 because newer versions do not include pkg_resources * explicitly install python3-saml as it is need by onelogin. the extra command is needed bc python3-saml is an optional install when installing uw-saml * added xmlsec1 to the dockerfile and other mods bc it's a system-level dependency required by the uw-saml package. * Add a note/toggle to use the production idp when needed for debugging. * [GH-212] Fix broken link to UW box numbers * Document where the certificates for connected to PWS are located. * [Bot] Update version to 2.4.7 --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent b7ca037 commit bcd78f6

10 files changed

Lines changed: 714 additions & 615 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ RUN apt-get update && apt-get install -y \
88
build-essential \
99
pkg-config \
1010
libxmlsec1-openssl \
11+
curl jq git \
12+
xmlsec1 \
1113
&& apt-get clean && rm -rf /var/lib/apt/lists/*
1214

1315
WORKDIR /app

‎docs/pws.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ For more information on enrolling and certificate requirements, follow the [PWS
1212
***Note: If you are a UW-IT IAM developer, you may already have access!***
1313

1414
[PWS Onboarding Guide]: https://wiki.cac.washington.edu/display/pws/Getting+Access+to+PWS
15+
16+
The certificate the application on dev/eva/prod instances to reach PWS is located at:
17+
https://mosler.s.uw.edu/ui/vault/secrets/iam%2Fkv/show/dev/uw-directory/certificates/uwca
18+
https://mosler.s.uw.edu/ui/vault/secrets/iam%2Fkv/show/eval/uw-directory/certificates/uwca
19+
https://mosler.s.uw.edu/ui/vault/secrets/iam%2Fkv/show/prod/uw-directory/certificates/uwca
20+

‎husky_directory/settings/compose-with-redis.dotenv‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ HOST=uw-directory.iamdev.s.uw.edu
66
SAML_ENTITY_ID=https://${HOST}/saml
77
SAML_ACS_URL=https://${HOST}/saml/login
88
USE_TEST_IDP=1
9+
# USE_TEST_IDP=False # use this one if you dont want the mock idp.
910

1011
FLASK_SESSION_TYPE=redis
1112
REDIS_HOST=redis

‎husky_directory/static/css/body.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ body {
204204
font-family: 'Open Sans', sans-serif;
205205
font-size: 17px;
206206
line-height: 1.72222;
207-
color: #595959;
207+
color: #8c8c8c;
208208
background-color: #ffffff;
209209
}
210210
input,
@@ -216,8 +216,8 @@ textarea {
216216
line-height: inherit;
217217
}
218218
a {
219-
color: #0052b3;
220-
text-decoration: none;
219+
color: #002966;
220+
text-decoration: underline;
221221
}
222222
a:hover,
223223
a:focus {
@@ -2896,16 +2896,16 @@ body {
28962896
background-color: #ffffff;
28972897
}
28982898
a {
2899-
color: #0088dd;
2900-
text-decoration: none;
2899+
color: #002966;
2900+
text-decoration: underline;
29012901
-o-transition: 0.25s;
29022902
-webkit-transition: 0.25s;
29032903
transition: 0.25s;
29042904
}
29052905
a:hover,
29062906
a:focus {
29072907
color: #c9c9c9;
2908-
text-decoration: none;
2908+
text-decoration: underline;
29092909
}
29102910
a:focus {
29112911
outline: none;

‎husky_directory/templates/base.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE html>
2-
<html lang="eng">
2+
<html lang="en">
33
<head>
44
<meta content="IE=edge" http-equiv="X-UA-Compatible"/>
55
<title>UW Faculty/Staff/Student Directory</title>
66
<meta http-equiv="content-type" content="text/html;charset=ISO-8859-1" />
7-
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0" />
7+
<meta name="viewport" content="initial-scale=1.0" />
88
<meta http-equiv="Cache-Control" content="no-cache" />
99
<meta http-equiv="Pragma" content="no-cache" />
1010
<meta http-equiv="Expires" content="0" />

‎husky_directory/templates/links.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h4>Postal Addresses and Box Numbers at the UW</h4>
2323
Find the postal address for a department.
2424
</li>
2525
<li>
26-
<a href="https://www.washington.edu/home/boxnumbers/">UW Box Numbers</a> - Box numbers for UW departments.
26+
<a href="https://c2.uw.edu/mailing-services/uw-box-numbers/">UW Box Numbers</a> - Box numbers for UW departments.
2727
</li>
2828
</ul>
2929
<h4>Change your address or release information</h4>

‎husky_directory/templates/search.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ <h3>Search by</h3>
1313
style="color:black; height:43px; z-index:0;" id="query"
1414
{{ 'autofocus' if search_value is blank }}
1515
name="query"
16+
label="Search Form Input"
17+
aria-label="Search query input"
1618
>
1719
<span class="input-group-btn">
1820
<button class="btn search"

‎poetry.lock‎

Lines changed: 690 additions & 603 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "uw-husky-directory"
3-
version = "2.4.6"
3+
version = "2.4.7"
44
description = "An updated version of the UW Directory"
55
authors = ["Thomas Thorogood <goodtom@uw.edu>"]
66
license = "MIT"
@@ -22,11 +22,12 @@ Flask-Injector = "^0.13.0"
2222
pydantic = {extras = ["email", "dotenv"], version = "^1.8.1"}
2323
inflection = "^0.5.1"
2424
gunicorn = {extras = ["gevent"], version = "^20.0.4"}
25+
setuptools = "<82.0"
2526
PyYAML = "^6"
2627
requests = "^2.25.1"
2728
devtools = "^0.8.0"
2829
python-dotenv = "^0.19.0"
29-
uw-saml = {version = "^1.1.0"}
30+
uw-saml = {version = "^1.1.0", extras = ["python3-saml"]}
3031
Flask-Session = "^0.3.2"
3132
redis = "^4.1.0"
3233
pytz = "^2022.1"

‎scripts/run-selenium-tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ export DEBUG="${DEBUG}"
4949
export pytest_args="${pytest_args}"
5050
export uw_directory_url="${uw_directory_url}"
5151

52-
docker-compose -f docker/docker-compose.selenium.yml up \
52+
docker compose -f docker/docker-compose.selenium.yml up \
5353
--exit-code-from test-runner

0 commit comments

Comments
 (0)