Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenRecords v3.5 - Develop #578

Open
wants to merge 60 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
e7a3395
Fixed open data compliance report missing referrer header error
johnyu95 Jan 27, 2023
a9daa6f
Updated google translate styles
johnyu95 Feb 22, 2023
78da8ff
Fixed super user toggle bug
johnyu95 Mar 2, 2023
7898277
Upgraded bootstrap and javascript dependencies
johnyu95 Mar 9, 2023
7a5a593
Updated FDNY agency instructions
johnyu95 Mar 14, 2023
3f18940
Updated jQuery to 3.6.4
johnyu95 Mar 15, 2023
cb921c4
QA fixes
johnyu95 Mar 20, 2023
3384e70
Merge pull request #562 from CityOfNewYork/johnyu95-dependencies-upgrade
johnyu95 Mar 20, 2023
c5aee6b
Updated FDNY custom forms
johnyu95 Mar 29, 2023
3ad8a64
Added Juneteenth to holiday calendar
johnyu95 Apr 7, 2023
1dc43cf
Removed noreferrer from open data report
johnyu95 Apr 12, 2023
6c5769c
Added Full Fire Marshal Report to FDNY custom forms
johnyu95 Jun 7, 2023
88e0bc5
Updated Open Data Compliance Report to filter on Response date instea…
johnyu95 Jun 7, 2023
ec9f38c
Merge pull request #564 from CityOfNewYork/johnyu95-full-fire-marshal…
johnyu95 Jun 12, 2023
3974fc0
Update _generate_signature method to use HMAC-SHA256
johnyu95 Jun 13, 2023
4987fd0
Disable submit button on submission for Contact the Agency form
johnyu95 Jun 27, 2023
faf17ff
Added validation for form name when submitting custom request forms
johnyu95 Aug 14, 2023
c070b49
Updated recaptcha implementation
johnyu95 Sep 15, 2023
05828c1
Added try/except to recaptcha response verification
johnyu95 Sep 19, 2023
6256f55
Merge pull request #566 from CityOfNewYork/johnyu95-recaptcha
johnyu95 Sep 20, 2023
3f82981
Merge pull request #565 from CityOfNewYork/johnyu95-update-generate-s…
johnyu95 Sep 20, 2023
516e251
Optimized update request statuses job
johnyu95 Oct 3, 2023
bf7124b
Updated sorting and exception handling for request statuses job
johnyu95 Oct 5, 2023
25db3be
Removed debugging code
johnyu95 Oct 5, 2023
c632d8c
Updated due soon requests queries to sort by id
johnyu95 Oct 6, 2023
6faf098
Additional logging for recaptcha errors
johnyu95 Oct 16, 2023
547020c
Merge pull request #567 from CityOfNewYork/johnyu95-fix-update-reques…
zgary Oct 16, 2023
9311867
Removed recaptcha for agency users
johnyu95 Oct 30, 2023
bde8d95
Merge pull request #568 from CityOfNewYork/johnyu95-remove-agency-rec…
johnyu95 Oct 31, 2023
481e1fc
Added is_active column to custom request forms table
johnyu95 Nov 8, 2023
970e9ae
Fixed issue with custom forms not loading consistently
johnyu95 Nov 8, 2023
8d8cd25
Merge pull request #569 from CityOfNewYork/johnyu95-fix-custom-forms-…
zgary Nov 8, 2023
a1c44e3
Updated FDNY agency instructions
johnyu95 Nov 13, 2023
092cf33
Fixed typos in FDNY agency instructions
johnyu95 Nov 13, 2023
5d5f765
Added validation to check that custom request form metadata exists
johnyu95 Nov 16, 2023
4a2f3fe
Updated backend validation for custom request forms on submission
johnyu95 Nov 20, 2023
3b107a0
Merge pull request #571 from CityOfNewYork/johnyu95-fix-custom-forms-…
johnyu95 Nov 20, 2023
9294c70
Added error logger for contact the agency functionality
johnyu95 Dec 15, 2023
646fcbd
Updated sender and reply to emails for Contact the Agency feature
johnyu95 Dec 22, 2023
ddb9ee0
Updated FDNY agency instructions and reverted custom request form names
johnyu95 Jan 16, 2024
eef921c
Updated footer year
johnyu95 Jan 17, 2024
1b75e0b
Updated es_update function for Requests
johnyu95 Jan 19, 2024
ea02b36
Fixed typo in FDNY custom request form name
johnyu95 Jan 19, 2024
74b09d1
Updates to FDNY agency instructions
johnyu95 Jan 22, 2024
976aa2f
Merge pull request #572 from CityOfNewYork/johnyu95-contact-the-agenc…
johnyu95 Jan 22, 2024
aa7bbae
Merge pull request #573 from CityOfNewYork/johnyu95-contact-the-agenc…
johnyu95 Jan 22, 2024
cd1bdf6
Merge pull request #570 from CityOfNewYork/johnyu95-fdny-updates
johnyu95 Jan 22, 2024
4e2b291
Added new denial and closing reasons
johnyu95 Jan 30, 2024
c3fbf09
Added missing citation to reason
johnyu95 Jan 30, 2024
b9f387c
Updated FDNY agency instructions
johnyu95 Jan 31, 2024
b17a859
Updated logic for contact emails
johnyu95 Feb 15, 2024
2eca4a1
Updated values for NYPD letter signature in agency JSON
johnyu95 Feb 26, 2024
a9ba3e9
Updated About page text
johnyu95 Mar 4, 2024
3a536fc
Merge pull request #574 from CityOfNewYork/johnyu95-new-reasons
zgary Mar 11, 2024
25c48de
Merge pull request #575 from CityOfNewYork/johnyu95-contact-the-agenc…
zgary Mar 11, 2024
634ffbd
Merge pull request #576 from CityOfNewYork/johnyu95-update-nypd-lette…
zgary Mar 11, 2024
9f6d077
Merge pull request #577 from CityOfNewYork/johnyu95-about-page-update
zgary Mar 11, 2024
7609acc
Merge branch 'develop' into main-merge
johnyu95 Apr 1, 2024
1eae68e
Merged with main
johnyu95 Apr 1, 2024
52f7b88
Fixed typo in models.py
johnyu95 Apr 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/auth/utils.py
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
abort, current_app, flash, redirect, request, session, url_for
)
from flask_login import current_user, login_user, logout_user
from hashlib import sha1
from hashlib import sha256
from ldap3 import Connection, Server, Tls
from requests.exceptions import SSLError

@@ -680,10 +680,10 @@ def _generate_signature(password, string):
"""
signature = None
try:
hmac_sha1 = hmac.new(key=password.encode(),
msg=string.encode(),
digestmod=sha1)
signature = hmac_sha1.hexdigest()
hmac_sha256 = hmac.new(key=password.encode(),
msg=string.encode(),
digestmod=sha256)
signature = hmac_sha256.hexdigest()
except Exception as e:
sentry.captureException()
current_app.logger.error("Failed to generate NYC ID.Web Services "
4 changes: 2 additions & 2 deletions data/agencies.csv
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"032A","032","Social Services","Commission to Combat Police Corruption","CCPC","00001","[email protected]","[email protected]","False"
"0054","054","Public Safety","Civilian Complaint Review Board","CCRB","00001","[email protected]","[email protected]","False"
"0312","312","Civic Services","Conflicts of Interest Board","COIB","00001","[email protected]","[email protected]","False"
"0866","866","Business","Department of Consumer Affairs","DCA","00001","dcafoil@dca.nyc.gov","dcafoil@dca.nyc.gov","False"
"0866","866","Business","Department of Consumer and Worker Protection","DCWP","00001","FOIL@dcwp.nyc.gov","FOILAPPEALS@dcwp.nyc.gov","False"
"0868","868","Civic Services","Department of Citywide Administrative Services","DCAS","00001","[email protected]","[email protected]","False"
"0126","126","Culture & Recreation","Department of Cultural Affairs","DCLA","00001","[email protected]","[email protected]","False"
"0030","030","Civic Services","Department of City Planning","DCP","00001","[email protected]","[email protected]","False"
@@ -33,7 +33,7 @@
"0836","836","Business","Department of Finance","DOF","00001","[email protected]","[email protected]","False"
"0816","816","Health","Department of Health and Mental Hygiene","DOHMH","00001","[email protected]","[email protected]","False"
"0032","032","Public Safety","Department of Investigation","DOI","00001","[email protected]","[email protected]","False"
"0858","858","Civic Services","Department of Information Technology and Telecommunications","DOITT","00001","foilrequest@doitt.nyc.gov","foilrequest@doitt.nyc.gov","True"
"0858","858","Civic Services","NYC Office of Technology and Innovation","OTI","00001","foilrequest@oti.nyc.gov","foilappeal@oti.nyc.gov","True"
"0781","781","Public Safety","Department of Probation","DOP","00001","[email protected]","[email protected]","False"
"0860","860","Culture & Recreation","Department of Records and Information Services","DORIS","00001","[email protected]","[email protected]","True"
"0841","841","Transportation","Department of Transportation","DOT","00001","[email protected]","[email protected]","False"
16 changes: 8 additions & 8 deletions data/agencies.json
Original file line number Diff line number Diff line change
@@ -163,10 +163,10 @@
"categories": [
"Business"
],
"name": "Department of Consumer Affairs",
"name": "Department of Consumer and Worker Protection",
"next_request_number": 1,
"default_email": "dcafoil@dca.nyc.gov",
"appeals_email": "DCAFOILAPPEALS@dca.nyc.gov",
"default_email": "FOIL@dcwp.nyc.gov",
"appeals_email": "FOILAPPEALS@dcwp.nyc.gov",
"is_active": true,
"agency_features": {
"letters": {
@@ -186,7 +186,7 @@
"text": ""
}
},
"acronym": "DCA"
"acronym": "DCWP"
},
{
"ein": "0059",
@@ -1003,10 +1003,10 @@
"categories": [
"Civic Services"
],
"name": "Department of Information Technology and Telecommunications",
"name": "NYC Office of Technology and Innovation",
"next_request_number": 1,
"default_email": "foilrequest@doitt.nyc.gov",
"appeals_email": "foilrequest@doitt.nyc.gov",
"default_email": "foilrequest@oti.nyc.gov",
"appeals_email": "foilappeal@oti.nyc.gov",
"is_active": true,
"agency_features": {
"letters": {
@@ -1026,7 +1026,7 @@
"text": ""
}
},
"acronym": "DOITT"
"acronym": "OTI"
},
{
"ein": "0134",
4 changes: 2 additions & 2 deletions data/agencies_test.csv
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"032A","032","Social Services","Commission to Combat Police Corruption","CCPC","00001","[email protected]","[email protected]","False"
"0054","054","Public Safety","Civilian Complaint Review Board","CCRB","00001","[email protected]","[email protected]","False"
"0312","312","Civic Services","Conflicts of Interest Board","COIB","00001","[email protected]","[email protected]","False"
"0866","866","Business","Department of Consumer Affairs","DCA","00001","[email protected]","[email protected]","False"
"0866","866","Business","Department of Consumer and Worker Protection","DCWP","00001","[email protected]","[email protected]","False"
"0868","868","Civic Services","Department of Citywide Administrative Services","DCAS","00001","[email protected]","[email protected]","False"
"0126","126","Culture & Recreation","Department of Cultural Affairs","DCLA","00001","[email protected]","[email protected]","False"
"0030","030","Civic Services","Department of City Planning","DCP","00001","[email protected]","[email protected]","False"
@@ -33,7 +33,7 @@
"0836","836","Business","Department of Finance","DOF","00001","[email protected]","[email protected]","False"
"0816","816","Health","Department of Health and Mental Hygiene","DOHMH","00001","[email protected]","[email protected]","False"
"0032","032","Public Safety","Department of Investigation","DOI","00001","[email protected]","[email protected]","False"
"0858","858","Civic Services","Department of Information Technology and Telecommunications","DOITT","00001","[email protected]","[email protected]","True"
"0858","858","Civic Services","NYC Office of Technology and Innovation","OTI","00001","[email protected]","[email protected]","True"
"0781","781","Public Safety","Department of Probation","DOP","00001","[email protected]","[email protected]","False"
"0860","860","Culture & Recreation","Department of Records and Information Services","DORIS","00001","[email protected]","[email protected]","True"
"0841","841","Transportation","Department of Transportation","DOT","00001","[email protected]","[email protected]","False"
8 changes: 4 additions & 4 deletions data/agencies_test.json
Original file line number Diff line number Diff line change
@@ -646,8 +646,8 @@
"categories": [
"Business"
],
"name": "Department of Consumer Affairs",
"acronym": "DCA",
"name": "Department of Consumer and Worker Protection",
"acronym": "DCWP",
"next_request_number": 1,
"default_email": "[email protected]",
"appeals_email": "[email protected]",
@@ -1094,8 +1094,8 @@
"categories": [
"Civic Services"
],
"name": "Department of Information Technology and Telecommunications",
"acronym": "DOITT",
"name": "NYC Office of Technology and Innovation",
"acronym": "OTI",
"next_request_number": 1,
"default_email": "[email protected]",
"appeals_email": "[email protected]",
6 changes: 3 additions & 3 deletions data/custom_request_forms.json
Original file line number Diff line number Diff line change
@@ -153,11 +153,11 @@
"name": "fdny-form1-field9",
"values": [
"Building",
"Transportation",
"Vehicle/Transportation",
"Outdoors",
"Non-Fire Emergency"
],
"help_text": "If transportation is selected, please provide the model, make, and license plate in the description below. For Building, Outdoors, and Non-Fire Emergency please provide a short description below.",
"help_text": "If Vehicle/Transportation is selected, please provide the model, make, and license plate in the description below. For Building, Outdoors, and Non-Fire Emergency please provide a short description below.",
"required": false
}
},
@@ -169,7 +169,7 @@
"error_message": "<span class=\"glyphicon glyphicon-exclamation-sign\"></span>&nbsp;<strong>Error, Description of Incident is required.</strong> Please provide a short description.",
"max_length": 5000,
"character_counter": true,
"help_text": "Please provide a short description of the incident. If Transportation was selected above, please make sure to provide the Type, Make, and Plate of the vehicle."
"help_text": "Please provide a short description of the incident. If Vehicle/Transportation was selected above, please make sure to provide the Type, Make, and Plate of the vehicle."
}
}
],