From 285f0c0761acc07f1b1ccdddafc1c6ffe467b1b4 Mon Sep 17 00:00:00 2001 From: Brandyn Friedly Date: Tue, 27 Oct 2020 09:55:37 -0500 Subject: [PATCH 001/243] Authorize dockerhub to prevent anonymous pulls (avoid rate limiting) This commit adds authorizes circleci with dockerhub to adapt to Dockerhub's Nov. 1st change in policy, which will rate limit anonymous pulls. --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ff87b60..36edbe20 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,6 +4,9 @@ jobs: working_directory: /app docker: - image: docker + auth: + username: ttcircleci + password: $DOCKERHUB_TTCIRCLECI_PASSWORD steps: - checkout - setup_remote_docker From af38bb6f86e412a2fa86004eeec8b0f69ce953fe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2020 11:13:14 +0000 Subject: [PATCH 002/243] Bump pytz from 2020.1 to 2020.4 Bumps [pytz](https://github.com/stub42/pytz) from 2020.1 to 2020.4. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](https://github.com/stub42/pytz/compare/release_2020.1...release_2020.4) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 50840efc..836d3a77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Flask==1.0.2 gunicorn==19.9.0 -pytz==2020.1 +pytz==2020.4 Flask-WTF==0.14.3 WTForms==2.2.1 stripe==2.54.0 From 4ae656e6ca81bf34948589a4cc4b335f4cc252fb Mon Sep 17 00:00:00 2001 From: ashley-hebler Date: Thu, 5 Nov 2020 15:08:20 -0600 Subject: [PATCH 003/243] Try adding a version to fix ci --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 36edbe20..56d6dda3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ jobs: steps: - checkout - setup_remote_docker + version: 19.03.13 - run: | docker info docker build -f Dockerfile -t texastribune/checkout:dev . From fb577457d4b2426815e9791d1efdf4652b9d6869 Mon Sep 17 00:00:00 2001 From: ashley-hebler Date: Thu, 5 Nov 2020 15:11:44 -0600 Subject: [PATCH 004/243] Fix syntax error --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 56d6dda3..f2280bb8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: password: $DOCKERHUB_TTCIRCLECI_PASSWORD steps: - checkout - - setup_remote_docker + - setup_remote_docker: version: 19.03.13 - run: | docker info From 6c0acc89c28378d04118068714c8c9277499d181 Mon Sep 17 00:00:00 2001 From: ashley-hebler Date: Thu, 5 Nov 2020 14:14:54 -0600 Subject: [PATCH 005/243] Revert 10 year anniversary logo --- static/sass/6-components/_footer.scss | 6 ++---- templates/includes/footer.html | 2 +- templates/includes/logo.html | 2 +- templates/includes/logo_bu.html | 5 ----- 4 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 templates/includes/logo_bu.html diff --git a/static/sass/6-components/_footer.scss b/static/sass/6-components/_footer.scss index 7aaed398..4a64458e 100644 --- a/static/sass/6-components/_footer.scss +++ b/static/sass/6-components/_footer.scss @@ -5,10 +5,8 @@ &__links { list-style: none; } - - // remove after 10yr treatment &__logo { - // hack: nudge 10yr bug left for alignment of square - margin-left: -$size-xxs; + // hack: nudge bug left for alignment of square + margin-left: -$size-tiny; } } diff --git a/templates/includes/footer.html b/templates/includes/footer.html index 62d5fc71..35fe17b6 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -4,7 +4,7 @@
    diff --git a/templates/includes/logo.html b/templates/includes/logo.html index 2638225f..26d71a3e 100644 --- a/templates/includes/logo.html +++ b/templates/includes/logo.html @@ -1 +1 @@ - + diff --git a/templates/includes/logo_bu.html b/templates/includes/logo_bu.html deleted file mode 100644 index 92d15523..00000000 --- a/templates/includes/logo_bu.html +++ /dev/null @@ -1,5 +0,0 @@ -{# -This logo file isn't used. -We're storing it for safe keeping for after 10 year anniversary assets come down. -#} - From f695530e157eb4d3ada781afb30ce609ec6433de Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 13 Nov 2020 11:12:42 +0000 Subject: [PATCH 006/243] Bump sentry-sdk from 0.18.0 to 0.19.3 Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 0.18.0 to 0.19.3. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGES.md) - [Commits](https://github.com/getsentry/sentry-python/compare/0.18.0...0.19.3) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 50840efc..19136a76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ fuzzywuzzy==0.17.0 python-Levenshtein==0.12.0 flask-talisman==0.5.1 flask-limiter==1.4 -sentry-sdk==0.18.0 +sentry-sdk==0.19.3 blinker==1.4 amazon-pay==2.6.0 nameparser==1.0.6 From 969ea951f8b6f18bac0e26109166a04edb48ae87 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2020 03:11:28 +0000 Subject: [PATCH 007/243] Bump fuzzywuzzy from 0.17.0 to 0.18.0 Bumps [fuzzywuzzy](https://github.com/seatgeek/fuzzywuzzy) from 0.17.0 to 0.18.0. - [Release notes](https://github.com/seatgeek/fuzzywuzzy/releases) - [Changelog](https://github.com/seatgeek/fuzzywuzzy/blob/master/CHANGES.rst) - [Commits](https://github.com/seatgeek/fuzzywuzzy/compare/0.17.0...0.18.0) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 19136a76..633f01cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ celery==4.2.1 redis==2.10.6 validate_email==1.3 docopt==0.6.2 -fuzzywuzzy==0.17.0 +fuzzywuzzy==0.18.0 python-Levenshtein==0.12.0 flask-talisman==0.5.1 flask-limiter==1.4 From d23f4f5c9d66a0920df31fe07ddcd7e39de757d7 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Thu, 19 Nov 2020 21:16:43 -0600 Subject: [PATCH 008/243] upgrade python runtime --- .pre-commit-config.yaml | 5 +++++ runtime.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8cef1873..f821869c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -13,3 +13,8 @@ repos: - id: black types: [python] + - + repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.5.0 + hooks: + - id: trailing-whitespace diff --git a/runtime.txt b/runtime.txt index 34b35b71..4252f106 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.6.7 +python-3.6.12 From 88679c071a89f2dcfe52cedc3560f53b53388a57 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2020 03:17:18 +0000 Subject: [PATCH 009/243] Bump stripe from 2.54.0 to 2.55.0 Bumps [stripe](https://github.com/stripe/stripe-python) from 2.54.0 to 2.55.0. - [Release notes](https://github.com/stripe/stripe-python/releases) - [Changelog](https://github.com/stripe/stripe-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/stripe/stripe-python/compare/v2.54.0...v2.55.0) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e31b9843..9d3ec046 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ gunicorn==19.9.0 pytz==2020.4 Flask-WTF==0.14.3 WTForms==2.2.1 -stripe==2.54.0 +stripe==2.55.0 celery==4.2.1 redis==2.10.6 validate_email==1.3 From 46fbe8ce63f8dc985cb0a680b636e3a79c8f7c13 Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Wed, 25 Nov 2020 14:10:47 -0600 Subject: [PATCH 010/243] update browserslist --- package.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index de38acf0..855950f0 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,12 @@ "url": "https://github.com/texastribune/donations/issues" }, "browserslist": [ - "> 1%", "last 2 versions", - "Firefox ESR", - "iOS >= 11", - "Safari >= 12", + "firefox ESR", + "iOS >= 12", + "safari >= 12", + "samsung >= 12", + "not ie 11", "not dead" ], "engines": { From fd7c905663880d5cacf631cdfb17a35e65168e40 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Fri, 27 Nov 2020 19:03:52 -0600 Subject: [PATCH 011/243] reformat --- app.py | 65 +++++++++++++++++++++++++++++------------------------- charges.py | 27 +++++++++++------------ 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/app.py b/app.py index 46321fe3..39b9cb63 100644 --- a/app.py +++ b/app.py @@ -9,61 +9,66 @@ import logging import os import re -from config import ( - FLASK_SECRET_KEY, - LOG_LEVEL, - TIMEZONE, - STRIPE_WEBHOOK_SECRET, - SENTRY_DSN, - SENTRY_ENVIRONMENT, - ENABLE_SENTRY, - ENABLE_PORTAL, - REPORT_URI, - MWS_ACCESS_KEY, - MWS_SECRET_KEY, - AMAZON_MERCHANT_ID, - AMAZON_SANDBOX, - AMAZON_CAMPAIGN_ID, -) from datetime import datetime from pprint import pformat -from pytz import timezone - import celery import stripe -from app_celery import make_celery -from flask_talisman import Talisman +from amazon_pay.client import AmazonPayClient +from amazon_pay.ipn_handler import IpnHandler +from flask import Flask, redirect, render_template, request, send_from_directory from flask_limiter import Limiter from flask_limiter.util import get_remote_address -from flask import Flask, redirect, render_template, request, send_from_directory +from flask_talisman import Talisman +from nameparser import HumanName +from pytz import timezone +from validate_email import validate_email + +from app_celery import make_celery +from bad_actor import ( + BadActorJudgmentType, + BadActorResponse, + call_bad_actor_api, + create_bad_actor_request, +) +from charges import ChargeException, QuarantinedException, charge +from config import ( + AMAZON_CAMPAIGN_ID, + AMAZON_MERCHANT_ID, + AMAZON_SANDBOX, + ENABLE_PORTAL, + ENABLE_SENTRY, + FLASK_SECRET_KEY, + LOG_LEVEL, + MWS_ACCESS_KEY, + MWS_SECRET_KEY, + REPORT_URI, + SENTRY_DSN, + SENTRY_ENVIRONMENT, + STRIPE_WEBHOOK_SECRET, + TIMEZONE, +) from forms import ( BlastForm, BlastPromoForm, - DonateForm, BusinessMembershipForm, CircleForm, + DonateForm, ) -from npsp import RDO, Contact, Opportunity, Affiliation, Account -from amazon_pay.ipn_handler import IpnHandler -from amazon_pay.client import AmazonPayClient -from nameparser import HumanName +from npsp import RDO, Account, Affiliation, Contact, Opportunity from util import ( clean, notify_slack, send_email_new_business_membership, send_multiple_account_warning, - send_slack_message, ) -from validate_email import validate_email -from charges import charge, ChargeException ZONE = timezone(TIMEZONE) if ENABLE_SENTRY: import sentry_sdk - from sentry_sdk.integrations.flask import FlaskIntegration from sentry_sdk.integrations.celery import CeleryIntegration + from sentry_sdk.integrations.flask import FlaskIntegration sentry_sdk.init( dsn=SENTRY_DSN, diff --git a/charges.py b/charges.py index ef0f0412..4d91c29a 100644 --- a/charges.py +++ b/charges.py @@ -1,12 +1,12 @@ -import calendar import logging from decimal import Decimal -from config import STRIPE_KEYS, CIRCLE_FAILURE_RECIPIENT -from npsp import User, Task -from util import send_slack_message import stripe +from config import CIRCLE_FAILURE_RECIPIENT, STRIPE_KEYS +from npsp import Task, User +from util import send_slack_message + stripe.api_key = STRIPE_KEYS["secret_key"] TWOPLACES = Decimal(10) ** -2 # same as Decimal('0.01') @@ -50,12 +50,12 @@ def quantize(amount): def generate_stripe_description(opportunity) -> str: """ - Our current code populates the Description field of recurring donations - and opportunities when those are created. Those descriptions get passed - on to Stripe when the card is charged. But we have at least two cases - where the Description field could be blank: when someone manually enters - a donation or when it's a donation that's been migrated from our legacy - (Tinypass) system. But in those cases we know the opportunity type and + Our current code populates the Description field of recurring donations + and opportunities when those are created. Those descriptions get passed + on to Stripe when the card is charged. But we have at least two cases + where the Description field could be blank: when someone manually enters + a donation or when it's a donation that's been migrated from our legacy + (Tinypass) system. But in those cases we know the opportunity type and it's a direct relationship to the description so we can populate it anyway. """ # remove leading "The " from descriptions for better Stripe @@ -103,20 +103,20 @@ def charge(opportunity): except Exception as e: logging.info(f"Error charging card: {type(e)}") if isinstance(e, stripe.error.StripeError): - message = e.user_message or '' + message = e.user_message or "" logging.info(f"Message: {message}") reason = e.user_message if isinstance(e, stripe.error.CardError): - logging.info(f"The card has been declined") + logging.info("The card has been declined") logging.info(f"Decline code: {e.json_body.get('decline_code', '')}") if reason is None: reason = "card declined for unknown reason" if reason is None: - reason = "unknown failure" + reason = "unknown failure" else: reason = "unknown failure" @@ -141,7 +141,6 @@ def charge(opportunity): raise ChargeException(opportunity, reason) - if card_charge.status != "succeeded": logging.error("Charge failed. Check Stripe logs.") raise ChargeException(opportunity, "charge failed") From 9c73aaf24bef90194e2507ce8f2a786e48a28cf6 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sat, 28 Nov 2020 16:57:53 -0600 Subject: [PATCH 012/243] bad actor changes and documenting new variables --- README.md | 5 + app.py | 97 +++++++++++++------ bad_actor.py | 236 +++++++++++++++++++++++++++++++++++++++++++++++ batch.py | 12 ++- charges.py | 7 ++ config.py | 15 +++ npsp.py | 10 +- requirements.txt | 2 + tests.py | 120 ++++++++++++++++++++++++ 9 files changed, 473 insertions(+), 31 deletions(-) create mode 100644 bad_actor.py diff --git a/README.md b/README.md index 15dc9092..11640e35 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,11 @@ Environment | `PORTAL_CAMPAIGN_ID` | stringstringstring | | `RECAPTCHA_SECRET_KEY` | stringstringstring | | `RECAPTCHA_SITE_KEY` | stringstringstring | +| `BAD_ACTOR_API_URL` | https://foo.bar.api | +| `BAD_ACTOR_NOTIFICATION_URL`| https://foo.bar.api | +| `AUTH0_AUDIENCE` | https://foo.bar.api | +| `AUTH0_PORTAL_M2M_CLIENT_ID`| string | +| `AUTH0_PORTAL_M2M_CLIENT_SECRET`| string | Running the Project ------------------- diff --git a/app.py b/app.py index 39b9cb63..2a6ab760 100644 --- a/app.py +++ b/app.py @@ -25,12 +25,7 @@ from validate_email import validate_email from app_celery import make_celery -from bad_actor import ( - BadActorJudgmentType, - BadActorResponse, - call_bad_actor_api, - create_bad_actor_request, -) +from bad_actor import BadActor from charges import ChargeException, QuarantinedException, charge from config import ( AMAZON_CAMPAIGN_ID, @@ -281,12 +276,14 @@ def apply_card_details(rdo=None, customer=None): @celery.task(name="app.add_donation") -def add_donation(form=None, customer=None, donation_type=None): +def add_donation(form=None, customer=None, donation_type=None, bad_actor_request=None): """ Add a contact and their donation into SF. This is done in the background because there are a lot of API calls and there's no point in making the payer wait for them. It sends a notification about the donation to Slack (if configured). """ + bad_actor_response = BadActor(bad_actor_request=bad_actor_request) + quarantine = bad_actor_response.quarantine form = clean(form) first_name = form["first_name"] @@ -322,21 +319,31 @@ def add_donation(form=None, customer=None, donation_type=None): if period is None: logging.info("----Creating one time payment...") - opportunity = add_opportunity(contact=contact, form=form, customer=customer) + opportunity = add_opportunity( + contact=contact, form=form, customer=customer, quarantine=quarantine + ) try: charge(opportunity) logging.info(opportunity) notify_slack(contact=contact, opportunity=opportunity) except ChargeException as e: e.send_slack_notification() + except QuarantinedException: + bad_actor_response.notify_bad_actor( + transaction_type="Opportunity", transaction=opportunity + ) return True elif donation_type == "circle": logging.info("----Creating circle payment...") - rdo = add_circle_membership(contact=contact, form=form, customer=customer) + rdo = add_circle_membership( + contact=contact, form=form, customer=customer, quarantine=quarantine + ) else: logging.info("----Creating recurring payment...") - rdo = add_recurring_donation(contact=contact, form=form, customer=customer) + rdo = add_recurring_donation( + contact=contact, form=form, customer=customer, quarantine=quarantine + ) # get opportunities opportunities = rdo.opportunities() @@ -352,6 +359,8 @@ def add_donation(form=None, customer=None, donation_type=None): notify_slack(contact=contact, rdo=rdo) except ChargeException as e: e.send_slack_notification() + except QuarantinedException: + bad_actor_response.notify_bad_actor(transaction_type="RDO", transaction=rdo) return True @@ -383,7 +392,29 @@ def do_charge_or_show_errors(form_data, template, bundles, function, donation_ty form_data=form_data, ) app.logger.info(f"Customer id: {customer.id}") - function(customer=customer, form=clean(form_data), donation_type=donation_type) + bad_actor_request = None + try: + bad_actor_request = BadActor.create_bad_actor_request( + headers=request.headers, + captcha_token=form_data["recaptchaToken"], + email=email, + amount=amount, + zipcode=form_data["zipcode"], + first_name=form_data["first_name"], + last_name=form_data["last_name"], + remote_addr=request.remote_addr, + reason=form_data["reason"], + ) + app.logger.info(bad_actor_request) + except Exception as error: + app.logger.warning("Unable to check for bad actor: %s", error) + + function( + customer=customer, + form=clean(form_data), + donation_type=donation_type, + bad_actor_request=bad_actor_request, + ) gtm = { "event_value": amount, "event_label": "once" if installment_period == "None" else installment_period, @@ -816,7 +847,7 @@ def stripehook(): return "", 200 -def add_opportunity(contact=None, form=None, customer=None): +def add_opportunity(contact=None, form=None, customer=None, quarantine=False): """ This will add a single donation to Salesforce. """ @@ -832,6 +863,7 @@ def add_opportunity(contact=None, form=None, customer=None): opportunity.agreed_to_pay_fees = form["pay_fees_value"] opportunity.encouraged_by = form["reason"] opportunity.lead_source = "Stripe" + opportunity.quarantined = quarantine customer = stripe.Customer.retrieve(customer["id"]) card = customer.sources.retrieve(customer.sources.data[0].id) @@ -847,7 +879,7 @@ def add_opportunity(contact=None, form=None, customer=None): return opportunity -def add_circle_membership(contact=None, form=None, customer=None): +def add_circle_membership(contact=None, form=None, customer=None, quarantine=False): """ This will add Circle membership to Salesforce. @@ -875,6 +907,7 @@ def add_circle_membership(contact=None, form=None, customer=None): rdo.installment_period = installment_period rdo.open_ended_status = "None" + rdo.quarantined = quarantine apply_card_details(rdo=rdo, customer=customer) rdo.save() @@ -882,7 +915,7 @@ def add_circle_membership(contact=None, form=None, customer=None): return rdo -def add_recurring_donation(contact=None, form=None, customer=None): +def add_recurring_donation(contact=None, form=None, customer=None, quarantine=False): """ This will add a recurring donation to Salesforce. """ @@ -903,6 +936,7 @@ def add_recurring_donation(contact=None, form=None, customer=None): rdo.installments = None rdo.installment_period = form["installment_period"] rdo.open_ended_status = "Open" + rdo.quarantined = quarantine apply_card_details(rdo=rdo, customer=customer) rdo.save() @@ -910,7 +944,7 @@ def add_recurring_donation(contact=None, form=None, customer=None): return rdo -def add_business_rdo(account=None, form=None, customer=None): +def add_business_rdo(account=None, form=None, customer=None, quarantine=False): """ Adds a recurring business membership to Salesforce. """ @@ -935,6 +969,7 @@ def add_business_rdo(account=None, form=None, customer=None): rdo.installments = None rdo.open_ended_status = "Open" rdo.installment_period = form["installment_period"] + rdo.quarantined = quarantine apply_card_details(rdo=rdo, customer=customer) rdo.save() @@ -944,7 +979,10 @@ def add_business_rdo(account=None, form=None, customer=None): @celery.task(name="app.add_business_membership") def add_business_membership( - form=None, customer=None, donation_type="business_membership" + form=None, + customer=None, + donation_type="business_membership", + bad_actor_request=None, ): """ Adds a business membership. Both single and recurring. @@ -956,6 +994,8 @@ def add_business_membership( notification about the new membership. """ + bad_actor_response = BadActor(bad_actor_request=bad_actor_request) + quarantine = bad_actor_response.quarantine form = clean(form) @@ -1007,8 +1047,20 @@ def add_business_membership( raise Exception("Business membership must be either yearly or monthly") logging.info("----Creating recurring business membership...") - rdo = add_business_rdo(account=account, form=form, customer=customer) + rdo = add_business_rdo( + account=account, form=form, customer=customer, quarantine=quarantine + ) logging.info(rdo) + + logging.info("----Getting affiliation...") + + affiliation = Affiliation.get_or_create( + account=account, contact=contact, role="Business Member Donor" + ) + logging.info(affiliation) + + send_email_new_business_membership(account=account, contact=contact) + # get opportunities opportunities = rdo.opportunities() today = datetime.now(tz=ZONE).strftime("%Y-%m-%d") @@ -1022,15 +1074,8 @@ def add_business_membership( notify_slack(account=account, contact=contact, rdo=rdo) except ChargeException as e: e.send_slack_notification() - - logging.info("----Getting affiliation...") - - affiliation = Affiliation.get_or_create( - account=account, contact=contact, role="Business Member Donor" - ) - logging.info(affiliation) - - send_email_new_business_membership(account=account, contact=contact) + except QuarantinedException: + bad_actor_response.notify_bad_actor(transaction_type="RDO", transaction=rdo) if contact.duplicate_found: send_multiple_account_warning(contact) diff --git a/bad_actor.py b/bad_actor.py new file mode 100644 index 00000000..76434bb3 --- /dev/null +++ b/bad_actor.py @@ -0,0 +1,236 @@ +from enum import Enum +from celery.contrib import rdb + +from typing import List, Union + +import requests +from pydantic import BaseModel +from slack_sdk.webhook import WebhookClient + +from config import ( + AUTH0_DOMAIN, + AUTH0_PORTAL_AUDIENCE, + AUTH0_PORTAL_M2M_CLIENT_ID, + AUTH0_PORTAL_M2M_CLIENT_SECRET, + BAD_ACTOR_API_URL, + BAD_ACTOR_NOTIFICATION_URL, +) +from logs import logger + + +class BadActorJudgmentType(int, Enum): + information = 0 + unknown = 1 + good = 2 + suspect = 3 + bad = 4 + + +class BadActorResponseItem(BaseModel): + label: str + value: Union[str, None] + judgment: BadActorJudgmentType + + +class BadActorResponse(BaseModel): + overall_judgment: BadActorJudgmentType + items: List[BadActorResponseItem] + + +EMOJI_MAP = { + BadActorJudgmentType.good: ":white_check_mark: ", + BadActorJudgmentType.bad: ":x: ", + BadActorJudgmentType.suspect: ":eyes: ", + BadActorJudgmentType.unknown: ":grey_question: ", + BadActorJudgmentType.information: "", +} + + +class ConfigurationException(Exception): + pass + + +class BadActor: + def __init__(self, bad_actor_request): + self.bad_actor_request = bad_actor_request + self.transaction = None + self.transaction_type = None + + try: + self.bad_actor_api_response = self._call_bad_actor_api(bad_actor_request) + except Exception as error: + logger.warning("Unable to call bad actor API: %s", error) + self.bad_actor_api_response = None + + @property + def quarantine(self): + if not self.bad_actor_api_response: + return False + if self.bad_actor_api_response.overall_judgment >= BadActorJudgmentType.suspect: + return True + return False + + @staticmethod + def _slackify_items(bad_actor_items) -> list: + fields = [] + for bad_actor_item in sorted(bad_actor_items, key=lambda k: k.label): + emoji = EMOJI_MAP[bad_actor_item.judgment] + label = f"*{bad_actor_item.label}*: " if bad_actor_item.label else "" + string = f"{emoji}{label}{bad_actor_item.value}" + field = {"type": "mrkdwn", "text": string} + fields.append(field) + return fields + + def _slackify_all(self) -> list: + + rdb.set_trace() + + # add another item for the Salesforce link + txn_url = f"{self.transaction.sf.instance_url}/{self.transaction.id}" + slackified_txn_link = f"<{txn_url}|Salesforce>" + sf_link_item = BadActorResponseItem( + label="", + value=slackified_txn_link, + judgment=BadActorJudgmentType.information, + ) + self.bad_actor_api_response.items.append(sf_link_item) + + info_items = [ + x + for x in self.bad_actor_api_response.items + if x.judgment == BadActorJudgmentType.information + ] + judgment_items = [ + x + for x in self.bad_actor_api_response.items + if x.judgment != BadActorJudgmentType.information + ] + + info_items = self._slackify_items(info_items) + judgment_items = self._slackify_items(judgment_items) + + return [ + {"type": "section", "fields": info_items,}, + {"type": "section", "fields": judgment_items,}, + { + "type": "actions", + "block_id": "choices", + "elements": [ + { + "action_id": "approve", + "type": "button", + "text": { + "type": "plain_text", + "emoji": True, + "text": "Approve", + }, + "style": "primary", + "value": f"{self.transaction_type}:{self.transaction.id}", + }, + { + "action_id": "reject", + "type": "button", + "text": {"type": "plain_text", "emoji": True, "text": "Reject"}, + "style": "danger", + "value": f"{self.transaction_type}:{self.transaction.id}", + }, + ], + }, + ] + + def _send_to_slack(self): + + if not BAD_ACTOR_NOTIFICATION_URL: + raise ConfigurationException("BAD_ACTOR_NOTIFICATION_URL unset") + + blocks = self._slackify_all() + + webhook = WebhookClient(BAD_ACTOR_NOTIFICATION_URL) + response = webhook.send(blocks=blocks) + logger.info(response) + + def notify_bad_actor(self, transaction_type, transaction): + self.transaction_type = transaction_type + self.transaction = transaction + + if self.bad_actor_api_response.overall_judgment < BadActorJudgmentType.suspect: + logger.info("not a bad actor; returning") + return + + logger.debug(self) + self._send_to_slack() + + return + + @staticmethod + def create_bad_actor_request( + headers, + captcha_token, + email, + amount, + zipcode, + first_name, + last_name, + remote_addr, + reason, + ) -> dict: + + referer = headers.get("Referer", None) + + x_forwarded_for = headers.get("X-Forwarded-For", None) + cf_ip_country = headers.get("Cf-Ipcountry", None) + + ip = remote_addr + if x_forwarded_for: + ip = x_forwarded_for.split(",")[0] + + return { + "email": email, + "ip": ip, + "country_code": cf_ip_country, + "zipcode": zipcode, + "given_name": first_name, + "family_name": last_name, + "referer": referer, + "captcha_token": captcha_token, + "reason": reason, + "amount": amount, + } + + @staticmethod + def _call_bad_actor_api(request) -> Union[BadActorResponse, None]: + + if not BAD_ACTOR_API_URL: + raise ConfigurationException("BAD_ACTOR_API_URL unset") + + if not all( + [ + AUTH0_DOMAIN, + AUTH0_PORTAL_AUDIENCE, + AUTH0_PORTAL_M2M_CLIENT_ID, + AUTH0_PORTAL_M2M_CLIENT_SECRET, + ] + ): + raise ConfigurationException("AUTH0 variable unset") + + payload = { + "client_id": AUTH0_PORTAL_M2M_CLIENT_ID, + "client_secret": AUTH0_PORTAL_M2M_CLIENT_SECRET, + "audience": AUTH0_PORTAL_AUDIENCE, + "grant_type": "client_credentials", + } + + auth0_response = requests.post( + url=f"https://{AUTH0_DOMAIN}/oauth/token", json=payload + ).json() + access_token = auth0_response["access_token"] + + headers = { + "Authorization": f"Bearer {access_token}", + } + logger.info(request) + response = requests.post(url=BAD_ACTOR_API_URL, headers=headers, json=request) + response = response.json() + logger.info(response) + + return BadActorResponse.parse_obj(response) diff --git a/batch.py b/batch.py index e315e930..e716c409 100644 --- a/batch.py +++ b/batch.py @@ -1,12 +1,12 @@ import logging -from config import ACCOUNTING_MAIL_RECIPIENT, LOG_LEVEL, REDIS_URL, TIMEZONE from datetime import datetime, timedelta -from pytz import timezone - import celery import redis -from charges import amount_to_charge, charge, ChargeException +from pytz import timezone + +from charges import ChargeException, QuarantinedException, amount_to_charge, charge +from config import ACCOUNTING_MAIL_RECIPIENT, LOG_LEVEL, REDIS_URL, TIMEZONE from npsp import Opportunity from util import send_email @@ -105,6 +105,10 @@ def charge_cards(): except ChargeException as e: logging.info("Batch charge error") e.send_slack_notification() + except QuarantinedException: + logging.info( + "Failed to charge because Opportunity %s is quarantined", opportunity + ) log.send() diff --git a/charges.py b/charges.py index 4d91c29a..5fd57b2f 100644 --- a/charges.py +++ b/charges.py @@ -28,6 +28,10 @@ def send_slack_notification(self): ) +class QuarantinedException(Exception): + pass + + def amount_to_charge(opportunity): """ Determine the amount to charge. This depends on whether the payer agreed @@ -85,6 +89,9 @@ def charge(opportunity): ) if opportunity.stage_name != "Pledged": raise Exception(f"Opportunity {opportunity.id} is not Pledged") + if opportunity.quarantined: + logging.info("---- Skipping because it's quarantined") + raise QuarantinedException(f"Opportunity {opportunity.id} is quarantined") opportunity.stage_name = "In Process" opportunity.save() diff --git a/config.py b/config.py index 8ca0c528..4edcc0bf 100644 --- a/config.py +++ b/config.py @@ -107,3 +107,18 @@ def bool_env(val): CELERYD_LOG_FORMAT = "%(levelname)s %(name)s/%(module)s:%(lineno)d - %(message)s" CELERYD_TASK_LOG_FORMAT = "%(levelname)s %(name)s/%(module)s:%(lineno)d - %(message)s" + +######## +# Auth0 +# +AUTH0_DOMAIN = os.getenv("AUTH0_DOMAIN", "auth.texastribune.org") +AUTH0_PORTAL_M2M_CLIENT_ID = os.getenv("AUTH0_PORTAL_M2M_CLIENT_ID", None) +AUTH0_PORTAL_M2M_CLIENT_SECRET = os.getenv("AUTH0_PORTAL_M2M_CLIENT_SECRET", None) +AUTH0_PORTAL_AUDIENCE = os.getenv( + "AUTH0_PORTAL_AUDIENCE", "https://texastribune.org/portal" +) +######## +# Bad Actor +# +BAD_ACTOR_API_URL = os.getenv("BAD_ACTOR_API_URL", None) +BAD_ACTOR_NOTIFICATION_URL = os.getenv("BAD_ACTOR_NOTIFICATION_URL", None) diff --git a/npsp.py b/npsp.py index bc5c935e..c707c00d 100644 --- a/npsp.py +++ b/npsp.py @@ -303,6 +303,7 @@ def __init__( self.closed_lost_reason = None self.amazon_order_id = None self.created = False + self.quarantined = False @classmethod def list( @@ -357,6 +358,7 @@ def list( Stripe_Card_Expiration__c, Stripe_Card_Last_4__c, Amazon_Order_Id__c + Quarantined__c, FROM Opportunity {where} """ @@ -392,6 +394,7 @@ def list( y.stripe_card_expiration = item["Stripe_Card_Expiration__c"] y.stripe_card_last_4 = item["Stripe_Card_Last_4__c"] y.amazon_order_id = item["Amazon_Order_Id__c"] + y.quarantined = item["Quarantined__c"] y.created = False results.append(y) @@ -441,6 +444,7 @@ def _format(self): "Stripe_Card_Expiration__c": self.stripe_card_expiration, "Stripe_Card_Last_4__c": self.stripe_card_last_4, "Amazon_Order_Id__c": self.amazon_order_id, + "Quarantined__c": self.quarantined, } @classmethod @@ -533,6 +537,8 @@ def __init__(self, id=None, contact=None, account=None, sf_connection=None): self.stripe_card_expiration = None self.stripe_card_last_4 = None + self.quarantined = False + self.created = False def _format(self): @@ -566,6 +572,7 @@ def _format(self): "Stripe_Card_Brand__c": self.stripe_card_brand, "Stripe_Card_Expiration__c": self.stripe_card_expiration, "Stripe_Card_Last_4__c": self.stripe_card_last_4, + "Quarantined__c": self.quarantined, } return recurring_donation @@ -584,7 +591,7 @@ def opportunities(self): Encouraged_to_contribute_by__c, Stripe_Transaction_ID__c, Stripe_Card__c, AccountId, npsp__Closed_Lost_Reason__c, Expected_Giving_Date__c, Stripe_Card_Brand__c, - Stripe_Card_Expiration__c, Stripe_Card_Last_4__c + Stripe_Card_Expiration__c, Stripe_Card_Last_4__c, Quarantined__c FROM Opportunity WHERE npe03__Recurring_Donation__c = '{self.id}' """ @@ -615,6 +622,7 @@ def opportunities(self): y.stripe_card = item["Stripe_Card__c"] y.account_id = item["AccountId"] y.closed_lost_reason = item["npsp__Closed_Lost_Reason__c"] + y.quarantined = item["Quarantined__c"] y.created = False results.append(y) return results diff --git a/requirements.txt b/requirements.txt index e31b9843..485f9ca2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,3 +16,5 @@ sentry-sdk==0.19.3 blinker==1.4 amazon-pay==2.6.0 nameparser==1.0.6 +slack-sdk==3.0.0 +pydantic==1.7.2 \ No newline at end of file diff --git a/tests.py b/tests.py index b99a54d6..76c34395 100644 --- a/tests.py +++ b/tests.py @@ -1,3 +1,4 @@ +from config import BAD_ACTOR_NOTIFICATION_URL from datetime import datetime from decimal import Decimal @@ -10,16 +11,126 @@ from util import clean, construct_slack_message from forms import format_amount, validate_amount from charges import generate_stripe_description +from bad_actor import ( + BadActor, + BadActorJudgmentType, + BadActorResponse, + BadActorResponseItem, +) class SalesforceConnectionSubClass(SalesforceConnection): def __init__(self): pass + @property + def instance_url(self): + return "quux" + sf = SalesforceConnectionSubClass() +bad_actor_request = { + "email": "foo@bar.org", + "ip": "127.0.0.1", + "country_code": "US", + "zipcode": "78701", + "given_name": "nick", + "family_name": "cage", + "referer": "https://foo.com/foobar?foobar=baz", + "captcha_token": "captcha_token", + "reason": "because I care", + "amount": 1.34, +} + + +def test_bad_actor_init(): + bad_actor_response_suspect = BadActorResponse( + overall_judgment=BadActorJudgmentType.suspect, items=[] + ) + bad_actor_response_good = BadActorResponse( + overall_judgment=BadActorJudgmentType.good, items=[] + ) + bad_actor = BadActor(bad_actor_request=bad_actor_request) + + assert bad_actor.quarantine is False + bad_actor.bad_actor_api_response = bad_actor_response_suspect + assert bad_actor.quarantine is True + bad_actor.bad_actor_api_response = bad_actor_response_good + assert bad_actor.quarantine is False + + +def test_bad_actor_slackify_items(): + bad_actor_item1 = BadActorResponseItem( + label="foo", value="bar", judgment=BadActorJudgmentType.suspect + ) + bad_actor_item2 = BadActorResponseItem( + label="foo", value="bar", judgment=BadActorJudgmentType.good + ) + actual = BadActor._slackify_items([bad_actor_item1, bad_actor_item2]) + expected = [ + {"type": "mrkdwn", "text": ":eyes: *foo*: bar"}, + {"type": "mrkdwn", "text": ":white_check_mark: *foo*: bar"}, + ] + assert actual == expected + + +def test_slackify_all(): + bad_actor_item1 = BadActorResponseItem( + label="foo", value="bar", judgment=BadActorJudgmentType.suspect + ) + bad_actor_item2 = BadActorResponseItem( + label="foo", value="bar", judgment=BadActorJudgmentType.good + ) + bad_actor_response = BadActorResponse( + overall_judgment=BadActorJudgmentType.suspect, + items=[bad_actor_item1, bad_actor_item2], + ) + opportunity = Opportunity(sf_connection=sf) + opportunity.id_ = "baz" + bad_actor = BadActor(bad_actor_request=None) + bad_actor.bad_actor_api_response = bad_actor_response + bad_actor.transaction = opportunity + bad_actor.transaction_type = "Opportunity" + expected = [ + { + "fields": [{"text": "", "type": "mrkdwn"}], + "type": "section", + }, + { + "fields": [ + {"text": ":eyes: *foo*: bar", "type": "mrkdwn"}, + {"text": ":white_check_mark: *foo*: bar", "type": "mrkdwn"}, + ], + "type": "section", + }, + { + "block_id": "choices", + "elements": [ + { + "action_id": "approve", + "style": "primary", + "text": {"emoji": True, "text": "Approve", "type": "plain_text"}, + "type": "button", + "value": "Opportunity:baz", + }, + { + "action_id": "reject", + "style": "danger", + "text": {"emoji": True, "text": "Reject", "type": "plain_text"}, + "type": "button", + "value": "Opportunity:baz", + }, + ], + "type": "actions", + }, + ] + + actual = bad_actor._slackify_all() + assert actual == expected + + def test_generate_stripe_description(): # if description is blank use type opp = Opportunity(sf_connection=sf) @@ -252,6 +363,7 @@ def test__format_opportunity(): "Amazon_Order_Id__c": None, "Net_Amount__c": "8.00", "Donor_Selected_Amount__c": 0, + "Quarantined__c": False, } assert response == expected @@ -272,6 +384,7 @@ def test__format_circle_donation(): rdo.description = "Texas Tribune Circle Membership" rdo.agreed_to_pay_fees = True rdo.type = "Giving Circle" + rdo.quarantined = True response = rdo._format() expected_response = { @@ -296,6 +409,7 @@ def test__format_circle_donation(): "Stripe_Card_Brand__c": None, "Stripe_Card_Expiration__c": None, "Stripe_Card_Last_4__c": None, + "Quarantined__c": True, } assert response == expected_response @@ -340,6 +454,7 @@ def test__format_cent_circle_donation(): "Stripe_Card_Brand__c": None, "Stripe_Card_Expiration__c": None, "Stripe_Card_Last_4__c": None, + "Quarantined__c": False, } response["Name"] = "foo" assert response == expected_response @@ -385,6 +500,7 @@ def test__format_recurring_donation(): "Stripe_Card_Brand__c": None, "Stripe_Card_Expiration__c": None, "Stripe_Card_Last_4__c": None, + "Quarantined__c": False, } response["Name"] = "foo" assert response == expected_response @@ -405,6 +521,7 @@ def test__format_recurring_donation_decimal(): rdo.open_ended_status = None rdo.description = "Texas Tribune Membership" rdo.agreed_to_pay_fees = True + rdo.quarantined = True response = rdo._format() @@ -430,6 +547,7 @@ def test__format_recurring_donation_decimal(): "Stripe_Card_Brand__c": None, "Stripe_Card_Expiration__c": None, "Stripe_Card_Last_4__c": None, + "Quarantined__c": True, } response["Name"] = "foo" assert response == expected_response @@ -452,6 +570,7 @@ def test__format_blast_rdo(): rdo.type = "The Blast" rdo.billing_email = "dcraigmile+test6@texastribune.org" rdo.blast_subscription_email = "subscriber@foo.bar" + rdo.quarantined = True response = rdo._format() @@ -477,6 +596,7 @@ def test__format_blast_rdo(): "Stripe_Card_Brand__c": None, "Stripe_Card_Last_4__c": None, "Stripe_Card_Expiration__c": None, + "Quarantined__c": True, } response["Name"] = "foo" From 88d6e5a7550af7df944ff6e9147dd1eacab090b1 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sat, 28 Nov 2020 17:25:57 -0600 Subject: [PATCH 013/243] remove debugging --- bad_actor.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/bad_actor.py b/bad_actor.py index 76434bb3..24594075 100644 --- a/bad_actor.py +++ b/bad_actor.py @@ -1,5 +1,4 @@ from enum import Enum -from celery.contrib import rdb from typing import List, Union @@ -83,8 +82,6 @@ def _slackify_items(bad_actor_items) -> list: def _slackify_all(self) -> list: - rdb.set_trace() - # add another item for the Salesforce link txn_url = f"{self.transaction.sf.instance_url}/{self.transaction.id}" slackified_txn_link = f"<{txn_url}|Salesforce>" From c57becf7a6c049f26d755739d7bf6e6075c60642 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sat, 28 Nov 2020 17:33:05 -0600 Subject: [PATCH 014/243] add new variables to app.json --- README.md | 1 - app.json | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 11640e35..458e28c3 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,6 @@ Environment | `RECAPTCHA_SITE_KEY` | stringstringstring | | `BAD_ACTOR_API_URL` | https://foo.bar.api | | `BAD_ACTOR_NOTIFICATION_URL`| https://foo.bar.api | -| `AUTH0_AUDIENCE` | https://foo.bar.api | | `AUTH0_PORTAL_M2M_CLIENT_ID`| string | | `AUTH0_PORTAL_M2M_CLIENT_SECRET`| string | diff --git a/app.json b/app.json index 4f42c07d..5ec90cca 100644 --- a/app.json +++ b/app.json @@ -180,6 +180,24 @@ "STRIPE_WEBHOOK_SECRET": { "required": true }, + "AUTH0_DOMAIN": { + "required": true + }, + "AUTH0_PORTAL_M2M_CLIENT_ID": { + "required": true + }, + "AUTH0_PORTAL_M2M_CLIENT_SECRET": { + "required": true + }, + "AUTH0_PORTAL_AUDIENCE": { + "required": true + }, + "BAD_ACTOR_API_URL": { + "required": true + }, + "BAD_ACTOR_NOTIFICATION_URL": { + "required": true + }, "TZ": { "required": true } From 37bafbe920980c119b6f21020382f790d81f820c Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sat, 28 Nov 2020 18:12:11 -0600 Subject: [PATCH 015/243] fix logging --- bad_actor.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bad_actor.py b/bad_actor.py index 24594075..1e08a5ee 100644 --- a/bad_actor.py +++ b/bad_actor.py @@ -1,5 +1,5 @@ from enum import Enum - +import logging from typing import List, Union import requests @@ -14,7 +14,6 @@ BAD_ACTOR_API_URL, BAD_ACTOR_NOTIFICATION_URL, ) -from logs import logger class BadActorJudgmentType(int, Enum): @@ -58,7 +57,7 @@ def __init__(self, bad_actor_request): try: self.bad_actor_api_response = self._call_bad_actor_api(bad_actor_request) except Exception as error: - logger.warning("Unable to call bad actor API: %s", error) + logging.warning("Unable to call bad actor API: %s", error) self.bad_actor_api_response = None @property @@ -144,17 +143,17 @@ def _send_to_slack(self): webhook = WebhookClient(BAD_ACTOR_NOTIFICATION_URL) response = webhook.send(blocks=blocks) - logger.info(response) + logging.info(response) def notify_bad_actor(self, transaction_type, transaction): self.transaction_type = transaction_type self.transaction = transaction if self.bad_actor_api_response.overall_judgment < BadActorJudgmentType.suspect: - logger.info("not a bad actor; returning") + logging.info("not a bad actor; returning") return - logger.debug(self) + logging.debug(self) self._send_to_slack() return @@ -225,9 +224,9 @@ def _call_bad_actor_api(request) -> Union[BadActorResponse, None]: headers = { "Authorization": f"Bearer {access_token}", } - logger.info(request) + logging.info(request) response = requests.post(url=BAD_ACTOR_API_URL, headers=headers, json=request) response = response.json() - logger.info(response) + logging.info(response) return BadActorResponse.parse_obj(response) From 018da683cdd1f34eb8016c3f662679d6c3dcf41d Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sat, 28 Nov 2020 18:51:52 -0600 Subject: [PATCH 016/243] fix zip for business membership --- app.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index 2a6ab760..5ccd2002 100644 --- a/app.py +++ b/app.py @@ -994,8 +994,6 @@ def add_business_membership( notification about the new membership. """ - bad_actor_response = BadActor(bad_actor_request=bad_actor_request) - quarantine = bad_actor_response.quarantine form = clean(form) @@ -1010,6 +1008,11 @@ def add_business_membership( shipping_state = form["shipping_state"] shipping_postalcode = form["shipping_postalcode"] + bad_actor_request["zipcode"] = shipping_postalcode + + bad_actor_response = BadActor(bad_actor_request=bad_actor_request) + quarantine = bad_actor_response.quarantine + logging.info("----Getting contact....") contact = Contact.get_or_create( email=email, first_name=first_name, last_name=last_name From fd1ac08eaaf0492211b72b842886c99fce99e567 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sat, 28 Nov 2020 23:38:03 -0600 Subject: [PATCH 017/243] get zip code for business membership --- app.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app.py b/app.py index 5ccd2002..67b84c2f 100644 --- a/app.py +++ b/app.py @@ -394,12 +394,16 @@ def do_charge_or_show_errors(form_data, template, bundles, function, donation_ty app.logger.info(f"Customer id: {customer.id}") bad_actor_request = None try: + if "zipcode" in form_data: + zipcode = form_data["zipcode"] + else: + zipcode = form_data["shipping_postalcode"] bad_actor_request = BadActor.create_bad_actor_request( headers=request.headers, captcha_token=form_data["recaptchaToken"], email=email, amount=amount, - zipcode=form_data["zipcode"], + zipcode=zipcode, first_name=form_data["first_name"], last_name=form_data["last_name"], remote_addr=request.remote_addr, From 13134c306672667606738e5f7f22c19355d0b0f5 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sun, 29 Nov 2020 00:27:38 -0600 Subject: [PATCH 018/243] rm unnecessary code --- app.json | 3 --- app.py | 2 -- 2 files changed, 5 deletions(-) diff --git a/app.json b/app.json index 5ec90cca..7cd56e02 100644 --- a/app.json +++ b/app.json @@ -180,9 +180,6 @@ "STRIPE_WEBHOOK_SECRET": { "required": true }, - "AUTH0_DOMAIN": { - "required": true - }, "AUTH0_PORTAL_M2M_CLIENT_ID": { "required": true }, diff --git a/app.py b/app.py index 67b84c2f..a5259be8 100644 --- a/app.py +++ b/app.py @@ -1012,8 +1012,6 @@ def add_business_membership( shipping_state = form["shipping_state"] shipping_postalcode = form["shipping_postalcode"] - bad_actor_request["zipcode"] = shipping_postalcode - bad_actor_response = BadActor(bad_actor_request=bad_actor_request) quarantine = bad_actor_response.quarantine From b27dcec514153027f9eae193bac375a12edd2813 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Sun, 29 Nov 2020 00:33:24 -0600 Subject: [PATCH 019/243] fix test --- tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.py b/tests.py index 76c34395..d6085306 100644 --- a/tests.py +++ b/tests.py @@ -88,7 +88,7 @@ def test_slackify_all(): items=[bad_actor_item1, bad_actor_item2], ) opportunity = Opportunity(sf_connection=sf) - opportunity.id_ = "baz" + opportunity.id = "baz" bad_actor = BadActor(bad_actor_request=None) bad_actor.bad_actor_api_response = bad_actor_response bad_actor.transaction = opportunity From a0ee80f0070e91253e9efb7a11b5d50f235961d4 Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Mon, 30 Nov 2020 13:35:41 -0600 Subject: [PATCH 020/243] add clearbit JS lib --- templates/business-form.html | 9 +++++++++ templates/circle-form.html | 9 +++++++++ templates/donate-form.html | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/templates/business-form.html b/templates/business-form.html index 956e521f..df9453b9 100644 --- a/templates/business-form.html +++ b/templates/business-form.html @@ -66,6 +66,15 @@ + {% for script in bundles['js'] %} diff --git a/templates/circle-form.html b/templates/circle-form.html index 371c1385..774d5af7 100644 --- a/templates/circle-form.html +++ b/templates/circle-form.html @@ -134,6 +134,15 @@

    Questions?

    + {% for script in bundles['js'] %} diff --git a/templates/donate-form.html b/templates/donate-form.html index 15dc9f80..cb26113d 100644 --- a/templates/donate-form.html +++ b/templates/donate-form.html @@ -67,6 +67,15 @@

    Become a Texas Tribune Member today

    + {% for script in bundles['js'] %} From e93feca69a2284cf64a6b9279b4ba1cdfc2a4713 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 11:12:48 +0000 Subject: [PATCH 021/243] Bump stripe from 2.55.0 to 2.55.1 Bumps [stripe](https://github.com/stripe/stripe-python) from 2.55.0 to 2.55.1. - [Release notes](https://github.com/stripe/stripe-python/releases) - [Changelog](https://github.com/stripe/stripe-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/stripe/stripe-python/compare/v2.55.0...v2.55.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 42e35c5d..c8150a1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ gunicorn==19.9.0 pytz==2020.4 Flask-WTF==0.14.3 WTForms==2.2.1 -stripe==2.55.0 +stripe==2.55.1 celery==4.2.1 redis==2.10.6 validate_email==1.3 From 3898f5ac9897f6aa6b2efeba874542e4ae095ab3 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Wed, 2 Dec 2020 23:08:34 -0600 Subject: [PATCH 022/243] pin flake8 and unpin pytest-cov because of whatever's happening with pip --- dev-requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index cf4c617a..ac28e1b4 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ pytest==3.8.1 -pytest-cov==2.10.1 +pytest-cov ipdb==0.13.4 -black -mypy -flake8 +black==20.8b1 +mypy==0.790 +flake8==3.8.4 From cc980a7de60077dc51641a4bdb698e7e3187b08c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 11:12:55 +0000 Subject: [PATCH 023/243] Bump slack-sdk from 3.0.0 to 3.1.0 Bumps [slack-sdk](https://github.com/slackapi/python-slack-sdk) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/slackapi/python-slack-sdk/releases) - [Commits](https://github.com/slackapi/python-slack-sdk/compare/v3.0.0...v3.1.0) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4ae43ed7..49d0edd0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,5 +16,5 @@ sentry-sdk==0.19.3 blinker==1.4 amazon-pay==2.6.0 nameparser==1.0.6 -slack-sdk==3.0.0 +slack-sdk==3.1.0 pydantic==1.7.2 \ No newline at end of file From 4fc79b71448d0522b4f3590bb1eba7bf04544898 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Fri, 11 Dec 2020 10:13:58 -0600 Subject: [PATCH 024/243] move comma to fix query --- npsp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npsp.py b/npsp.py index c707c00d..f296167e 100644 --- a/npsp.py +++ b/npsp.py @@ -357,8 +357,8 @@ def list( Stripe_Card_Brand__c, Stripe_Card_Expiration__c, Stripe_Card_Last_4__c, - Amazon_Order_Id__c - Quarantined__c, + Amazon_Order_Id__c, + Quarantined__c FROM Opportunity {where} """ From f2bd3dae79fcf0220537551ac1b06deccd63fb88 Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Fri, 11 Dec 2020 14:40:59 -0600 Subject: [PATCH 025/243] disable quarantine for Circle and Business Memberships --- app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index a5259be8..962928c5 100644 --- a/app.py +++ b/app.py @@ -337,7 +337,7 @@ def add_donation(form=None, customer=None, donation_type=None, bad_actor_request elif donation_type == "circle": logging.info("----Creating circle payment...") rdo = add_circle_membership( - contact=contact, form=form, customer=customer, quarantine=quarantine + contact=contact, form=form, customer=customer, quarantine=False ) else: logging.info("----Creating recurring payment...") @@ -1053,7 +1053,7 @@ def add_business_membership( logging.info("----Creating recurring business membership...") rdo = add_business_rdo( - account=account, form=form, customer=customer, quarantine=quarantine + account=account, form=form, customer=customer, quarantine=False ) logging.info(rdo) From 828ec57d7a0011a3acf374a763d1f0623ff4f18f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 18 Dec 2020 22:54:15 +0000 Subject: [PATCH 026/243] [Security] Bump dompurify from 2.0.8 to 2.0.17 Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.8 to 2.0.17. **This update includes a security fix.** - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.0.8...2.0.17) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f223fa2..05b3f5f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2872,9 +2872,9 @@ } }, "dompurify": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.0.8.tgz", - "integrity": "sha512-vIOSyOXkMx81ghEalh4MLBtDHMx1bhKlaqHDMqM2yeitJ996SLOk5mGdDpI9ifJAgokred8Rmu219fX4OltqXw==" + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.0.17.tgz", + "integrity": "sha512-nNwwJfW55r8akD8MSFz6k75bzyT2y6JEa1O3JrZFBf+Y5R9JXXU4OsRl0B9hKoPgHTw2b7ER5yJ5Md97MMUJPg==" }, "domutils": { "version": "1.7.0", diff --git a/package.json b/package.json index 855950f0..2242b658 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "clean-webpack-plugin": "^2.0.2", "css-loader": "^1.0.0", "date-fns": "^1.30.1", - "dompurify": "^2.0.8", + "dompurify": "^2.0.17", "es6-promise": "^4.2.4", "fast-async": "7", "file-loader": "^1.1.11", From 0df7f9794f55623fdd49a22e838d0d50ef2de6c3 Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Mon, 21 Dec 2020 16:26:34 -0700 Subject: [PATCH 027/243] update ini --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 05b3f5f1..8b65d623 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5065,9 +5065,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "inquirer": { "version": "6.5.2", From 670131f146347265dc27e7039a83d2db475ea72f Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Mon, 21 Dec 2020 16:27:16 -0700 Subject: [PATCH 028/243] run npm audit fix --- package-lock.json | 133 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 127 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b65d623..a6e02ef9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,19 +4,120 @@ "lockfileVersion": 1, "dependencies": { "@babel/cli": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.8.4.tgz", - "integrity": "sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==", + "version": "7.12.10", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.12.10.tgz", + "integrity": "sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==", "requires": { - "chokidar": "^2.1.8", + "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents", + "chokidar": "^3.4.0", "commander": "^4.0.1", "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", "glob": "^7.0.0", - "lodash": "^4.17.13", + "lodash": "^4.17.19", "make-dir": "^2.1.0", "slash": "^2.0.0", "source-map": "^0.5.0" + }, + "dependencies": { + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "optional": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", + "optional": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "optional": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "optional": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "optional": true + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "optional": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "optional": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "optional": true + }, + "readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "optional": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "optional": true, + "requires": { + "is-number": "^7.0.0" + } + } } }, "@babel/code-frame": { @@ -851,6 +952,25 @@ "to-fast-properties": "^2.0.0" } }, + "@nicolo-ribaudo/chokidar-2": { + "version": "2.1.8-no-fsevents", + "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.tgz", + "integrity": "sha512-+nb9vWloHNNMFHjGofEam3wopE3m1yuambrrd/fnPc+lFOMB9ROTqQlche9ByFWNkdNqfSgR/kkQtQ8DzEWt2w==", + "optional": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, "@nodelib/fs.scandir": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", @@ -3393,8 +3513,7 @@ "dependencies": { "acorn": { "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", + "resolved": "", "dev": true }, "debug": { diff --git a/package.json b/package.json index 2242b658..5b8ed1f0 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "lint": "eslint --ext .js,.vue static/js/src config" }, "dependencies": { - "@babel/cli": "^7.0.0", + "@babel/cli": "^7.12.10", "@babel/core": "^7.0.0", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-transform-runtime": "^7.4.3", From c5e46f7e434fe5c29b1f83c8e029a96ca7b5ed07 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 21:13:24 +0000 Subject: [PATCH 029/243] [Security] Bump axios from 0.19.2 to 0.21.1 Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1. **This update includes a security fix.** - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 30 +++++++++--------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index a6e02ef9..a876c015 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1710,11 +1710,11 @@ "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", "requires": { - "follow-redirects": "1.5.10" + "follow-redirects": "^1.10.0" } }, "babel-code-frame": { @@ -3513,7 +3513,8 @@ "dependencies": { "acorn": { "version": "6.4.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", "dev": true }, "debug": { @@ -4045,22 +4046,9 @@ } }, "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } - } + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz", + "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==" }, "for-in": { "version": "1.0.2", diff --git a/package.json b/package.json index 5b8ed1f0..f044c05b 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@texastribune/queso-tools": "^2.1.0", "@texastribune/queso-ui": "^9.4.2", "auth0-js": "^9.13.2", - "axios": "^0.19.0", + "axios": "^0.21.1", "babel-loader": "^8.0.0", "camelcase": "^5.3.1", "clean-webpack-plugin": "^2.0.2", From 033a2d51279186eb6ae7148eb19b6d8d697b30d5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 04:39:41 +0000 Subject: [PATCH 030/243] Bump pydantic from 1.7.2 to 1.7.3 Bumps [pydantic](https://github.com/samuelcolvin/pydantic) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/samuelcolvin/pydantic/releases) - [Changelog](https://github.com/samuelcolvin/pydantic/blob/v1.7.3/HISTORY.md) - [Commits](https://github.com/samuelcolvin/pydantic/compare/v1.7.2...v1.7.3) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fc3eead8..2bc6f375 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,4 +17,4 @@ blinker==1.4 amazon-pay==2.6.0 nameparser==1.0.6 slack-sdk==3.1.0 -pydantic==1.7.2 \ No newline at end of file +pydantic==1.7.3 \ No newline at end of file From bdb54ff61a65cd3379d65d3d94e8aaa818859882 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 04:39:41 +0000 Subject: [PATCH 031/243] Bump sentry-sdk from 0.19.3 to 0.19.5 Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 0.19.3 to 0.19.5. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGES.md) - [Commits](https://github.com/getsentry/sentry-python/compare/0.19.3...0.19.5) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fc3eead8..49c7f1c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ fuzzywuzzy==0.18.0 python-Levenshtein==0.12.0 flask-talisman==0.5.1 flask-limiter==1.4 -sentry-sdk==0.19.3 +sentry-sdk==0.19.5 blinker==1.4 amazon-pay==2.6.0 nameparser==1.0.6 From 30bcb4328e03ff0762f6dcac6dd9c07152946b43 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 11:13:01 +0000 Subject: [PATCH 032/243] Bump pytz from 2020.4 to 2020.5 Bumps [pytz](https://github.com/stub42/pytz) from 2020.4 to 2020.5. - [Release notes](https://github.com/stub42/pytz/releases) - [Commits](https://github.com/stub42/pytz/compare/release_2020.4...release_2020.5) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index aebed22b..4e0a4b4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Flask==1.0.2 gunicorn==19.9.0 -pytz==2020.4 +pytz==2020.5 Flask-WTF==0.14.3 WTForms==2.2.1 stripe==2.55.1 From 1ae6c0bff2a25b06cb0f102af97f2061479a2f19 Mon Sep 17 00:00:00 2001 From: ashley-hebler Date: Mon, 11 Jan 2021 13:55:34 -0600 Subject: [PATCH 033/243] To 2021 we go --- templates/includes/footer.html | 2 +- templates/layout.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/includes/footer.html b/templates/includes/footer.html index 35fe17b6..5953ea03 100644 --- a/templates/includes/footer.html +++ b/templates/includes/footer.html @@ -14,7 +14,7 @@
    • -
  • © 2020 The Texas Tribune
    • +
  • © 2021 The Texas Tribune
diff --git a/templates/layout.html b/templates/layout.html index a084a7de..cc92e251 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -58,7 +58,7 @@
+
+
+

Thanks for supporting our nonprofit newsroom. RSVP here to join us for a members-only conversation on a year of covering COVID-19 and what comes next at 9 a.m. Central on Wednesday, March 24.

+
+

As a token of our appreciation, your membership includes a Proud Member sticker that we hope you’ll display with pride. If you’d like one, please tell us your mailing address.

From ee8cce35e3f184c61780fb04776c1d9d8654e096 Mon Sep 17 00:00:00 2001 From: Andrew Gibson Date: Wed, 24 Mar 2021 12:28:37 -0500 Subject: [PATCH 065/243] Revert "Add text for members event" --- templates/charge.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/charge.html b/templates/charge.html index e60f2a44..c2137c71 100644 --- a/templates/charge.html +++ b/templates/charge.html @@ -10,11 +10,6 @@
-
-
-

Thanks for supporting our nonprofit newsroom. RSVP here to join us for a members-only conversation on a year of covering COVID-19 and what comes next at 9 a.m. Central on Wednesday, March 24.

-
-

As a token of our appreciation, your membership includes a Proud Member sticker that we hope you’ll display with pride. If you’d like one, please tell us your mailing address.

From 8766799e247b9b60bf5ab4d77356501b6707c3b0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 26 Mar 2021 11:13:05 +0000 Subject: [PATCH 066/243] Bump amazon-pay from 2.7.0 to 2.7.1 Bumps [amazon-pay](https://github.com/amzn/amazon-pay-sdk-python) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/amzn/amazon-pay-sdk-python/releases) - [Changelog](https://github.com/amzn/amazon-pay-sdk-python/blob/master/CHANGES.txt) - [Commits](https://github.com/amzn/amazon-pay-sdk-python/compare/2.7.0...2.7.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 06ec7ad0..026820ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ flask-talisman==0.5.1 flask-limiter==1.4 sentry-sdk==1.0.0 blinker==1.4 -amazon-pay==2.7.0 +amazon-pay==2.7.1 nameparser==1.0.6 slack-sdk==3.4.2 pydantic==1.8.1 \ No newline at end of file From 1d218eb7696eaa84bf20c72b077bc41b6229a787 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 13:17:42 +0000 Subject: [PATCH 067/243] Bump gunicorn from 19.9.0 to 20.1.0 Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 19.9.0 to 20.1.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/19.9.0...20.1.0) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 06ec7ad0..32c9fb65 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Flask==1.0.2 -gunicorn==19.9.0 +gunicorn==20.1.0 pytz==2021.1 Flask-WTF==0.14.3 WTForms==2.2.1 From a3854d132c042b62ceed54e34af01fbc714163a6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Mar 2021 18:08:02 +0000 Subject: [PATCH 068/243] [Security] Bump y18n from 4.0.0 to 4.0.1 Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. **This update includes a security fix.** - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 452e36b4..b97f740e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9184,11 +9184,6 @@ "strip-ansi": "^5.0.0" } }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, "yargs": { "version": "13.2.4", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", @@ -9342,9 +9337,9 @@ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", + "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==" }, "yallist": { "version": "2.1.2", From 77b1b66328b839222675d9a0641c71dfca1c812b Mon Sep 17 00:00:00 2001 From: Daniel Craigmile Date: Thu, 1 Apr 2021 23:35:03 -0500 Subject: [PATCH 069/243] reformat --- bad_actor.py | 10 ++++++++-- npsp.py | 2 +- requirements.txt | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bad_actor.py b/bad_actor.py index 1e08a5ee..dcb11928 100644 --- a/bad_actor.py +++ b/bad_actor.py @@ -106,8 +106,14 @@ def _slackify_all(self) -> list: judgment_items = self._slackify_items(judgment_items) return [ - {"type": "section", "fields": info_items,}, - {"type": "section", "fields": judgment_items,}, + { + "type": "section", + "fields": info_items, + }, + { + "type": "section", + "fields": judgment_items, + }, { "type": "actions", "block_id": "choices", diff --git a/npsp.py b/npsp.py index f296167e..639d27af 100644 --- a/npsp.py +++ b/npsp.py @@ -28,7 +28,7 @@ # configured to use for opportunities on an RDO DEFAULT_RDO_TYPE = os.environ.get("DEFAULT_RDO_TYPE", "Membership") -logging.getLogger("urllib3").setLevel(logging.DEBUG) +# logging.getLogger("urllib3").setLevel(logging.DEBUG) class SalesforceException(Exception): diff --git a/requirements.txt b/requirements.txt index b7a08168..3cdc55e2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,4 +17,4 @@ blinker==1.4 amazon-pay==2.7.1 nameparser==1.0.6 slack-sdk==3.4.2 -pydantic==1.8.1 \ No newline at end of file +pydantic==1.8.1 From 06a9f82343c8e813b1f3f18c66f85ab81d182cce Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 11:21:32 +0000 Subject: [PATCH 070/243] Bump pytest from 6.2.2 to 6.2.3 Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.2 to 6.2.3. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.2...6.2.3) Signed-off-by: dependabot-preview[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 60a3e766..ebd7e024 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,4 @@ -pytest==6.2.2 +pytest==6.2.3 pytest-cov ipdb==0.13.7 black==20.8b1 From f8c59b4013265cd8f9c8da4886e5b50b07b8c6ec Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Thu, 8 Apr 2021 10:48:23 -0500 Subject: [PATCH 071/243] update ssri to get security patch --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b97f740e..6f5fefc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7981,9 +7981,9 @@ } }, "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", + "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==", "requires": { "figgy-pudding": "^3.5.1" } From 08ff9d3ccd15155f833a253c3e470b3bcd3923c2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 16 Apr 2021 11:13:15 +0000 Subject: [PATCH 072/243] Bump flake8 from 3.9.0 to 3.9.1 Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.9.0 to 3.9.1. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.9.0...3.9.1) Signed-off-by: dependabot-preview[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index ebd7e024..5c2acaa7 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,4 +3,4 @@ pytest-cov ipdb==0.13.7 black==20.8b1 mypy==0.812 -flake8==3.9.0 +flake8==3.9.1 From 0c41c7e527e8aec1a4928f7a91f19aa3a5944f8f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:05:56 +0000 Subject: [PATCH 073/243] Upgrade to GitHub-native Dependabot --- .github/dependabot.yml | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..71dd188c --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,84 @@ +version: 2 +updates: +- package-ecosystem: pip + directory: "/" + schedule: + interval: daily + time: "11:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: celery + versions: + - ">= 5.0.a, < 5.1" + - dependency-name: black + versions: + - 21.4b0 + - 21.4b1 + - dependency-name: pydantic + versions: + - "1.8" + - dependency-name: gunicorn + versions: + - 20.0.4 + - dependency-name: sentry-sdk + versions: + - 0.20.0 + - 0.20.1 + - 0.20.2 + - dependency-name: slack-sdk + versions: + - 3.3.0 + - 3.3.2 +- package-ecosystem: npm + directory: "/" + schedule: + interval: daily + time: "11:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: css-loader + versions: + - 5.0.1 + - 5.0.2 + - 5.1.0 + - 5.1.1 + - 5.1.2 + - 5.1.3 + - 5.2.0 + - 5.2.1 + - 5.2.2 + - dependency-name: date-fns + versions: + - 2.16.1 + - 2.17.0 + - 2.18.0 + - 2.19.0 + - 2.20.0 + - 2.20.1 + - 2.20.2 + - 2.20.3 + - dependency-name: jspdf + versions: + - 2.3.1 + - dependency-name: vue-eslint-parser + versions: + - 7.4.1 + - 7.5.0 + - dependency-name: vue-stripe-elements-plus + versions: + - 0.3.2 +- package-ecosystem: docker + directory: "/" + schedule: + interval: daily + time: "11:00" + open-pull-requests-limit: 10 + ignore: + - dependency-name: python + versions: + - 3.9.1 + - 3.9.2 + - 3.9.3 + - dependency-name: node + versions: + - "15" From 6b44aaaca0a7f26d4aa2db8a4294029608d8ee1f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 11:13:16 +0000 Subject: [PATCH 074/243] Bump slack-sdk from 3.4.2 to 3.5.1 Bumps [slack-sdk](https://github.com/slackapi/python-slack-sdk) from 3.4.2 to 3.5.1. - [Release notes](https://github.com/slackapi/python-slack-sdk/releases) - [Commits](https://github.com/slackapi/python-slack-sdk/compare/v3.4.2...v3.5.1) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3cdc55e2..c5cfa0f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,5 +16,5 @@ sentry-sdk==1.0.0 blinker==1.4 amazon-pay==2.7.1 nameparser==1.0.6 -slack-sdk==3.4.2 +slack-sdk==3.5.1 pydantic==1.8.1 From f118276d4ef04560160d09e8bb42a925bf72f2b2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 11:12:10 +0000 Subject: [PATCH 075/243] Bump black from 20.8b1 to 21.5b0 Bumps [black](https://github.com/psf/black) from 20.8b1 to 21.5b0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/master/CHANGES.md) - [Commits](https://github.com/psf/black/commits) Signed-off-by: dependabot-preview[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 5c2acaa7..33bce8a0 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ pytest==6.2.3 pytest-cov ipdb==0.13.7 -black==20.8b1 +black==21.5b0 mypy==0.812 flake8==3.9.1 From a1817eb7076563578a0cea77be522624384948b0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 5 May 2021 11:12:31 +0000 Subject: [PATCH 076/243] Bump pytest from 6.2.3 to 6.2.4 Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.3 to 6.2.4. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.3...6.2.4) Signed-off-by: dependabot-preview[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 5c2acaa7..80a24564 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,4 @@ -pytest==6.2.3 +pytest==6.2.4 pytest-cov ipdb==0.13.7 black==20.8b1 From d6fea1188cee50f1aa6ead656364f1cffe3ec7ac Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Thu, 6 May 2021 16:10:41 -0500 Subject: [PATCH 077/243] update membership contact info --- templates/circle-form.html | 6 ++---- templates/includes/business_questions.html | 6 ++---- templates/includes/faq.html | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/templates/circle-form.html b/templates/circle-form.html index 774d5af7..54aa9320 100644 --- a/templates/circle-form.html +++ b/templates/circle-form.html @@ -97,10 +97,8 @@

Questions?

For other membership questions, contact:

-

Sarah Glen

-

Loyalty Program Manager

-

512-716-8696

-

sglen@texastribune.org

+

512-716-8695

+

membership@texastribune.org

For corporate sponsorships and business membership, contact:

diff --git a/templates/includes/business_questions.html b/templates/includes/business_questions.html index cc9ef0df..f3d01279 100644 --- a/templates/includes/business_questions.html +++ b/templates/includes/business_questions.html @@ -20,10 +20,8 @@

Questions?

For other membership questions, contact:

-

Sarah Glen

-

Loyalty Program Director

-

512-716-8696

-

sglen@texastribune.org

+

512-716-8695

+

membership@texastribune.org

For major gifts or grants, contact:

diff --git a/templates/includes/faq.html b/templates/includes/faq.html index 9e3bd8d5..de0a01e4 100644 --- a/templates/includes/faq.html +++ b/templates/includes/faq.html @@ -47,10 +47,8 @@

Still have questions?

For questions about membership, contact:

-

Sarah Glen

-

Loyalty Program Director

-

512-716-8696

-

sglen@texastribune.org

+

512-716-8695

+

membership@texastribune.org

From 4e562fc749d087e616356075c4edba060839fae3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 May 2021 11:12:03 +0000 Subject: [PATCH 078/243] Bump sentry-sdk from 1.0.0 to 1.1.0 Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.0.0...1.1.0) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5cfa0f4..559f9f06 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ fuzzywuzzy==0.18.0 python-Levenshtein==0.12.2 flask-talisman==0.5.1 flask-limiter==1.4 -sentry-sdk==1.0.0 +sentry-sdk==1.1.0 blinker==1.4 amazon-pay==2.7.1 nameparser==1.0.6 From fa3ff10f29a823b34a6e9da1ca9602ebf7ae9381 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 11:56:30 +0000 Subject: [PATCH 079/243] Bump flake8 from 3.9.1 to 3.9.2 Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.9.1 to 3.9.2. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.9.1...3.9.2) Signed-off-by: dependabot[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 1a79c362..160808bf 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,4 +3,4 @@ pytest-cov ipdb==0.13.7 black==21.5b0 mypy==0.812 -flake8==3.9.1 +flake8==3.9.2 From 3d6b1d8f243a706bac13c16f8864023c23607e9a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 15:42:38 +0000 Subject: [PATCH 080/243] Bump lodash from 4.17.19 to 4.17.21 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f5fefc5..86057cc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5791,9 +5791,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.assignin": { "version": "4.2.0", From 91cea99d8101b964778ac1bc312cfbb4700e347b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 15:43:34 +0000 Subject: [PATCH 081/243] Bump hosted-git-info from 2.8.5 to 2.8.9 Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.5 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.5...v2.8.9) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f5fefc5..ea4ff2d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4946,9 +4946,9 @@ } }, "hosted-git-info": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", - "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==" + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" }, "html2canvas": { "version": "1.0.0-rc.7", From add734b6ed3910b0ef610e3267a6262221f4c261 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 11:11:01 +0000 Subject: [PATCH 082/243] Bump black from 21.5b0 to 21.5b1 Bumps [black](https://github.com/psf/black) from 21.5b0 to 21.5b1. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/commits) Signed-off-by: dependabot[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 1a79c362..e2788883 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ pytest==6.2.4 pytest-cov ipdb==0.13.7 -black==21.5b0 +black==21.5b1 mypy==0.812 flake8==3.9.1 From e6c56163edda8b5ad2271546a843e33d6d9f7f9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 11:08:12 +0000 Subject: [PATCH 083/243] Bump pydantic from 1.8.1 to 1.8.2 Bumps [pydantic](https://github.com/samuelcolvin/pydantic) from 1.8.1 to 1.8.2. - [Release notes](https://github.com/samuelcolvin/pydantic/releases) - [Changelog](https://github.com/samuelcolvin/pydantic/blob/master/HISTORY.md) - [Commits](https://github.com/samuelcolvin/pydantic/compare/v1.8.1...v1.8.2) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5cfa0f4..f1ad85bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,4 +17,4 @@ blinker==1.4 amazon-pay==2.7.1 nameparser==1.0.6 slack-sdk==3.5.1 -pydantic==1.8.1 +pydantic==1.8.2 From 324d7075b576233e6b582cf43a8f388689f3873b Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Fri, 21 May 2021 15:23:32 -0500 Subject: [PATCH 084/243] update circle contact info --- templates/circle-form.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/circle-form.html b/templates/circle-form.html index 54aa9320..139118ee 100644 --- a/templates/circle-form.html +++ b/templates/circle-form.html @@ -81,10 +81,9 @@

Questions?

For Circle Membership, contact:

-

Jenny Ajluni

+

Irma Fernandez

Development Officer

-

515-250-9168

-

jajluni@texastribune.org

+

irma.fernandez@texastribune.org

For major gifts or grants, contact:

From 84b46eb5390b49eefb4afde78f173360e8249096 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 01:33:24 +0000 Subject: [PATCH 085/243] Bump browserslist from 4.8.6 to 4.16.6 Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.8.6 to 4.16.6. - [Release notes](https://github.com/browserslist/browserslist/releases) - [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md) - [Commits](https://github.com/browserslist/browserslist/compare/4.8.6...4.16.6) Signed-off-by: dependabot[bot] --- package-lock.json | 63 +++++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 26fc6f02..4c720f60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2024,13 +2024,32 @@ } }, "browserslist": { - "version": "4.8.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.6.tgz", - "integrity": "sha512-ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg==", - "requires": { - "caniuse-lite": "^1.0.30001023", - "electron-to-chromium": "^1.3.341", - "node-releases": "^1.1.47" + "version": "4.16.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz", + "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==", + "requires": { + "caniuse-lite": "^1.0.30001219", + "colorette": "^1.2.2", + "electron-to-chromium": "^1.3.723", + "escalade": "^3.1.1", + "node-releases": "^1.1.71" + }, + "dependencies": { + "caniuse-lite": { + "version": "1.0.30001230", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz", + "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==" + }, + "electron-to-chromium": { + "version": "1.3.738", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz", + "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==" + }, + "node-releases": { + "version": "1.1.72", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz", + "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==" + } } }, "btoa": { @@ -2448,6 +2467,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, + "colorette": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", + "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==" + }, "colors": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", @@ -3043,11 +3067,6 @@ "safe-buffer": "^5.0.1" } }, - "electron-to-chromium": { - "version": "1.3.345", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.345.tgz", - "integrity": "sha512-f8nx53+Z9Y+SPWGg3YdHrbYYfIJAtbUjpFfW4X1RwTZ94iUG7geg9tV8HqzAXX7XTNgyWgAFvce4yce8ZKxKmg==" - }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -3162,6 +3181,11 @@ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -6309,21 +6333,6 @@ } } }, - "node-releases": { - "version": "1.1.47", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.47.tgz", - "integrity": "sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA==", - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, "node-sass": { "version": "4.14.1", "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", From 9c5b1a33cac10b7ad0df7fec6de81a956c4d5103 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Jun 2021 11:09:02 +0000 Subject: [PATCH 086/243] Bump stripe from 2.56.0 to 2.58.0 Bumps [stripe](https://github.com/stripe/stripe-python) from 2.56.0 to 2.58.0. - [Release notes](https://github.com/stripe/stripe-python/releases) - [Changelog](https://github.com/stripe/stripe-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/stripe/stripe-python/compare/v2.56.0...v2.58.0) --- updated-dependencies: - dependency-name: stripe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9a6ce208..14112fe9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ gunicorn==20.1.0 pytz==2021.1 Flask-WTF==0.14.3 WTForms==2.2.1 -stripe==2.56.0 +stripe==2.58.0 celery==4.3.1 redis==2.10.6 validate_email==1.3 From 7b51cc484a9475ac89d3ffb9a590e16c0a896d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:12:09 +0000 Subject: [PATCH 087/243] Bump black from 21.5b1 to 21.6b0 Bumps [black](https://github.com/psf/black) from 21.5b1 to 21.6b0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/commits) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 052ef892..6267d1f3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ pytest==6.2.4 pytest-cov ipdb==0.13.7 -black==21.5b1 +black==21.6b0 mypy==0.812 flake8==3.9.2 From bd0aeef0bf4b2344f101268c21c39ac19335fba5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 11:08:58 +0000 Subject: [PATCH 088/243] Bump slack-sdk from 3.5.1 to 3.7.0 Bumps [slack-sdk](https://github.com/slackapi/python-slack-sdk) from 3.5.1 to 3.7.0. - [Release notes](https://github.com/slackapi/python-slack-sdk/releases) - [Commits](https://github.com/slackapi/python-slack-sdk/compare/v3.5.1...v3.7.0) --- updated-dependencies: - dependency-name: slack-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9a6ce208..ebe34333 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,5 +16,5 @@ sentry-sdk==1.1.0 blinker==1.4 amazon-pay==2.7.1 nameparser==1.0.6 -slack-sdk==3.5.1 +slack-sdk==3.7.0 pydantic==1.8.2 From a1fca2179c7af314f87e729a924c9e9f2c6ab584 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 03:26:34 +0000 Subject: [PATCH 089/243] Bump mypy from 0.812 to 0.902 Bumps [mypy](https://github.com/python/mypy) from 0.812 to 0.902. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.812...v0.902) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 6267d1f3..445c2470 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,5 +2,5 @@ pytest==6.2.4 pytest-cov ipdb==0.13.7 black==21.6b0 -mypy==0.812 +mypy==0.902 flake8==3.9.2 From 039907fbb38239c88e96238ca0ed166fff1c77f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 03:31:25 +0000 Subject: [PATCH 090/243] Bump ipdb from 0.13.7 to 0.13.9 Bumps [ipdb](https://github.com/gotcha/ipdb) from 0.13.7 to 0.13.9. - [Release notes](https://github.com/gotcha/ipdb/releases) - [Changelog](https://github.com/gotcha/ipdb/blob/master/HISTORY.txt) - [Commits](https://github.com/gotcha/ipdb/compare/0.13.7...0.13.9) --- updated-dependencies: - dependency-name: ipdb dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 445c2470..d556bd70 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ pytest==6.2.4 pytest-cov -ipdb==0.13.7 +ipdb==0.13.9 black==21.6b0 mypy==0.902 flake8==3.9.2 From 18eb22beb5b0b8434a099b03357df1782bf69c57 Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Tue, 22 Jun 2021 12:15:12 -0500 Subject: [PATCH 091/243] run npm audit fix --- package-lock.json | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c720f60..f624cba7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,9 +77,9 @@ "optional": true }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "optional": true, "requires": { "is-glob": "^4.0.1" @@ -3534,8 +3534,7 @@ "dependencies": { "acorn": { "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", + "resolved": "", "dev": true }, "debug": { @@ -3882,9 +3881,9 @@ } }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "requires": { "is-glob": "^4.0.1" } @@ -7001,9 +7000,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.26", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz", - "integrity": "sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==", + "version": "7.0.36", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", + "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", "requires": { "chalk": "^2.4.2", "source-map": "^0.6.1", @@ -8918,9 +8917,9 @@ "optional": true }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "optional": true, "requires": { "is-glob": "^4.0.1" From 7aa4528a0c3c89a34fae9283f3241738ce8456ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 11:12:29 +0000 Subject: [PATCH 092/243] Bump mypy from 0.902 to 0.910 Bumps [mypy](https://github.com/python/mypy) from 0.902 to 0.910. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.902...v0.910) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index d556bd70..b41c3621 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,5 +2,5 @@ pytest==6.2.4 pytest-cov ipdb==0.13.9 black==21.6b0 -mypy==0.902 +mypy==0.910 flake8==3.9.2 From 3329ee1586635b03005403a0f8b9253921214b4d Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Wed, 23 Jun 2021 14:02:09 -0500 Subject: [PATCH 093/243] create business-membership wall; make wall component more generic --- static/js/src/Wall.vue | 92 +++++++++++++++++++ static/js/src/entry/business/BusinessWall.vue | 28 ++++++ static/js/src/entry/business/router.js | 4 +- static/js/src/entry/circle/CircleWall.vue | 31 +++++++ static/js/src/entry/circle/Wall.vue | 80 ---------------- static/js/src/entry/circle/router.js | 4 +- static/sass/6-components/_wall.scss | 5 + static/sass/business.scss | 1 + templates/business-form.html | 5 + templates/circle-form.html | 6 +- 10 files changed, 171 insertions(+), 85 deletions(-) create mode 100644 static/js/src/Wall.vue create mode 100644 static/js/src/entry/business/BusinessWall.vue create mode 100644 static/js/src/entry/circle/CircleWall.vue delete mode 100644 static/js/src/entry/circle/Wall.vue diff --git a/static/js/src/Wall.vue b/static/js/src/Wall.vue new file mode 100644 index 00000000..c25b97ac --- /dev/null +++ b/static/js/src/Wall.vue @@ -0,0 +1,92 @@ + + + diff --git a/static/js/src/entry/business/BusinessWall.vue b/static/js/src/entry/business/BusinessWall.vue new file mode 100644 index 00000000..9022986a --- /dev/null +++ b/static/js/src/entry/business/BusinessWall.vue @@ -0,0 +1,28 @@ + + + diff --git a/static/js/src/entry/business/router.js b/static/js/src/entry/business/router.js index e8fdffe3..a66368d7 100644 --- a/static/js/src/entry/business/router.js +++ b/static/js/src/entry/business/router.js @@ -5,6 +5,7 @@ import VueRouter from 'vue-router'; import RouteHandler from '../../RouteHandler.vue'; import TopForm from './TopForm.vue'; +import BusinessWall from './BusinessWall.vue'; import mergeValuesIntoStartState from '../../utils/merge-values-into-start-state'; import sanitizeParams from '../../utils/sanitize-params'; import { @@ -60,7 +61,7 @@ function createRouter() { function bindRouterEvents(router, routeHandler, store) { router.onReady(() => { const topForm = new Vue({ ...TopForm, store }); - + const wall = new Vue({ ...BusinessWall }); const { currentRoute: { query }, } = router; @@ -72,6 +73,7 @@ function bindRouterEvents(router, routeHandler, store) { routeHandler.$mount('#app'); topForm.$mount('#business-form'); + wall.$mount('#business-wall'); }); } diff --git a/static/js/src/entry/circle/CircleWall.vue b/static/js/src/entry/circle/CircleWall.vue new file mode 100644 index 00000000..c54db161 --- /dev/null +++ b/static/js/src/entry/circle/CircleWall.vue @@ -0,0 +1,31 @@ + + + diff --git a/static/js/src/entry/circle/Wall.vue b/static/js/src/entry/circle/Wall.vue deleted file mode 100644 index f0604f75..00000000 --- a/static/js/src/entry/circle/Wall.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - diff --git a/static/js/src/entry/circle/router.js b/static/js/src/entry/circle/router.js index 01961876..53503799 100644 --- a/static/js/src/entry/circle/router.js +++ b/static/js/src/entry/circle/router.js @@ -4,7 +4,7 @@ import VueRouter from 'vue-router'; import RouteHandler from '../../RouteHandler.vue'; import TopForm from './TopForm.vue'; -import Wall from './Wall.vue'; +import CircleWall from './CircleWall.vue'; import mergeValuesIntoStartState from '../../utils/merge-values-into-start-state'; import sanitizeParams from '../../utils/sanitize-params'; import { CIRCLE_LEVELS, CIRCLE_FORM_STATE, DEFAULT_LEVEL } from './constants'; @@ -67,7 +67,7 @@ function createRouter() { function bindRouterEvents(router, routeHandler, store) { router.onReady(() => { const topForm = new Vue({ ...TopForm, store }); - const wall = new Vue({ ...Wall }); + const wall = new Vue({ ...CircleWall }); const { currentRoute: { query }, } = router; diff --git a/static/sass/6-components/_wall.scss b/static/sass/6-components/_wall.scss index 2454fb42..4f6cb572 100644 --- a/static/sass/6-components/_wall.scss +++ b/static/sass/6-components/_wall.scss @@ -64,5 +64,10 @@ @media print { font-size: 0.6rem; } + + a { + color: $color-black-pure; + text-decoration: underline; + } } } diff --git a/static/sass/business.scss b/static/sass/business.scss index 670d24ab..1d31980d 100644 --- a/static/sass/business.scss +++ b/static/sass/business.scss @@ -16,5 +16,6 @@ @import '6-components/forms'; @import '6-components/hero'; @import '6-components/images'; +@import '6-components/wall'; @import '7-utilities/all'; diff --git a/templates/business-form.html b/templates/business-form.html index df9453b9..1cb115aa 100644 --- a/templates/business-form.html +++ b/templates/business-form.html @@ -47,6 +47,11 @@
{% include 'includes/business_questions.html' %}
+ +
+ +
+
{% endblock %} diff --git a/templates/circle-form.html b/templates/circle-form.html index 139118ee..f21e49eb 100644 --- a/templates/circle-form.html +++ b/templates/circle-form.html @@ -110,8 +110,10 @@

Questions?

-
- +
+ +
+
{% endblock %} From 90e1f88a03659a28e3b7d6d7a4e7084943898ae5 Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Thu, 24 Jun 2021 16:46:54 -0500 Subject: [PATCH 094/243] update heading levels --- static/js/src/Wall.vue | 6 +++--- static/js/src/entry/business/Benefits.vue | 10 +++++----- templates/business-form.html | 4 ++-- templates/circle-form.html | 13 ++++++------- templates/includes/business_questions.html | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/static/js/src/Wall.vue b/static/js/src/Wall.vue index c25b97ac..02f8958f 100644 --- a/static/js/src/Wall.vue +++ b/static/js/src/Wall.vue @@ -2,13 +2,13 @@
-
-

{{ group.name }}

+

{{ group.name }}

-
+
diff --git a/static/js/src/entry/business/Benefits.vue b/static/js/src/entry/business/Benefits.vue index 0e9890e4..3cd23f6c 100644 --- a/static/js/src/entry/business/Benefits.vue +++ b/static/js/src/entry/business/Benefits.vue @@ -2,16 +2,16 @@
-

Business member benefits

+

Business member benefits

-

Exclusive Content

+

Exclusive Content

Special notifications and updates from Evan Smith, CEO

-

+

Included with every business membership -

+
  • Organization name featured on texastribune.org support page, Business @@ -32,7 +32,7 @@
-

At higher levels

+

At higher levels

Annual subscription to The Blast, the best daily premium political diff --git a/templates/business-form.html b/templates/business-form.html index 1cb115aa..d225aeeb 100644 --- a/templates/business-form.html +++ b/templates/business-form.html @@ -44,11 +44,11 @@

-
+
{% include 'includes/business_questions.html' %}
-
+
diff --git a/templates/circle-form.html b/templates/circle-form.html index f21e49eb..38d16cef 100644 --- a/templates/circle-form.html +++ b/templates/circle-form.html @@ -55,19 +55,19 @@

Your Circle Membership

-

Circle members receive all membership benefits, plus:

+

Circle members receive all membership benefits, plus:

-

Exclusive Content

+

Exclusive Content

Special notifications and updates from Evan Smith, CEO

-

Access Benefits

+

Access Benefits

  • Early registration to select Tribune events and VIP receptions
  • Invitations to exclusive events as part of The Texas Tribune Festival
  • Year-round reserved seating at Tribune statewide events
-

Special Recognition

+

Special Recognition

Exclusive recognition as a Texas Tribune Circle Member on our site

@@ -76,7 +76,7 @@

Special Recognition

-

Questions?

+

Questions?

@@ -109,8 +109,7 @@

Questions?

- -
+
diff --git a/templates/includes/business_questions.html b/templates/includes/business_questions.html index f3d01279..0d8fae5b 100644 --- a/templates/includes/business_questions.html +++ b/templates/includes/business_questions.html @@ -5,7 +5,7 @@
-

Questions?

+

Questions?

From 81c0678f065e68eda1cf8c306519a0b656a40da6 Mon Sep 17 00:00:00 2001 From: AndrewGibson27 Date: Thu, 24 Jun 2021 16:47:23 -0500 Subject: [PATCH 095/243] make wall styles consistent --- static/js/src/entry/business/BusinessWall.vue | 4 ++++ static/js/src/entry/circle/CircleWall.vue | 5 +++-- static/sass/6-components/_wall.scss | 8 +------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/static/js/src/entry/business/BusinessWall.vue b/static/js/src/entry/business/BusinessWall.vue index 9022986a..9da3113f 100644 --- a/static/js/src/entry/business/BusinessWall.vue +++ b/static/js/src/entry/business/BusinessWall.vue @@ -3,6 +3,10 @@ json-file="business-member-roster" :ordered-group-names="orderedGroupNames" > +