Merge pull request #2499 from StateVoicesNational/stage-main-14.1.2

mau11 · web-flow · commit 715ab464c575 · 2024-10-23T11:05:05.000-04:00
Stage main 14.1.2
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -2,12 +2,12 @@ version: 2
 updates:
   - package-ecosystem: "npm"
     directory: "/"
-    target-branch: "stage-main-14.1"
+    target-branch: "stage-main-14.2"
     schedule:
       interval: "weekly"
       day: "monday"
       time: "12:00"
     rebase-strategy: auto
     open-pull-requests-limit: 10
     labels:
-      - "A-dependencies"
+      - "A-dependencies"
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Want to know more?
 
 This version of Spoke suitable for testing and, potentially, for small campaigns. This won't cost any money and will not support production(aka large-scale) usage. It's a great way to practice deploying Spoke or see it in action.
 
-<a href="https://heroku.com/deploy?template=https://github.com/StateVoicesNational/Spoke/tree/v14.1.1">
+<a href="https://heroku.com/deploy?template=https://github.com/StateVoicesNational/Spoke/tree/v14.1.2">
 
   <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
 </a>
diff --git a/app.json b/app.json
@@ -183,7 +183,7 @@
     }
   },
   "addons": [
-    "heroku-postgresql:basic",
+    "heroku-postgresql:essential-0",
     {
       "plan": "heroku-redis:mini",
       "options": {
diff --git a/docs/HOWTO_USE_POSTGRESQL.md b/docs/HOWTO_USE_POSTGRESQL.md
@@ -3,9 +3,19 @@
 To use Postgresql, follow these steps:
 
 1. Either install docker (recommended) or postgresql on your machine:
-   * If you installed docker run the database using: `docker compose up`
-   * If you installed postgres locally, create the spoke dev database: `psql -c "create database spokedev;"`
-     * Then create a spoke user to connect to the database with `createuser -P spoke` with password "spoke" (to match the credentials in the .env.example file)
+   * If you installed docker run the database using: `docker-compose up`
+   * If you installed postgres locally (or if you already have a local installation of postgres), create the spoke dev database: `psql -c "create database spokedev;"`
+     * Then create a spoke user to connect to the database with `psql -d spokedev -c "create user spoke with password 'spoke';"` (to match the credentials in the .env.example file)
+     * Grant permissions to the new Spoke user:
+       * `psql -d spokedev -c "GRANT ALL PRIVILEGES ON DATABASE spokedev TO spoke;"`
+       * `psql -d spokedev -c "GRANT ALL PRIVILEGES ON schema public TO spoke;"`
+     * Create a test database by running the following commands:
+       ```
+       psql -d spokedev
+       CREATE DATABASE spoke_test;
+       CREATE USER spoke_test WITH PASSWORD 'spoke_test';
+       GRANT ALL PRIVILEGES ON DATABASE spoke_test TO spoke_test;
+       ```
 1. In `.env` set `DB_TYPE=pg`. (Otherwise, you will use sqlite.)
 2. Set `DB_PORT=5432`, which is the default port for Postgres.
 
diff --git a/docs/REFERENCE-environment_variables.md b/docs/REFERENCE-environment_variables.md
@@ -40,6 +40,7 @@
 | DEV_APP_PORT                                     | Port for development Webpack server. Required for development.                                                                                                                                                                                                                                                                                                                              |
 | DOWNTIME                                     | When enabled it will redirect users to a /downtime page.  If set to a string, it will show the string as a message to users on the downtime page.  Use this to take the system down for maintenance.  It will NOT stop graphql requests and will NOT stop users that are already in the app. |
 | DOWNTIME_NO_DB                               | On AWS Lambda this blocks the site from loading the app at all and swaps out a system that redirects users to /downtime.  This is useful for DB maintenance.  For non-Lambda environments, just run the src/server/downtime app instead of src/server/index default app    |
+| DOWNTIME_NO_INITIAL                          | When enabled, texters will see a message telling them that sending of initial messages is paused, but they will still be able to reply to any incoming responses.    |
 | DOWNTIME_TEXTER                              | Setting DOWNTIME_TEXTER to a text message (without quotes, please) will give the message as a text to texters when they arrive on the site, but the admin pages will still be accessible.  This could be useful if you want to stop new texters from landing on the site and texting, while you debug things. |
 | DST_REFERENCE_TIMEZONE                           | Timezone to use to determine whether DST is in effect. If it's DST in this timezone, we assume it's DST everywhere. _Default_: "US/Eastern". (The default will work for any campaign in the US. For example, if the campaign is in Australia, use "Australia/Sydney" or some other timezone in Australia. Note that DST is opposite in the northern and souther hemispheres.)         |
 | DYNAMICASSIGNMENT_BATCHES | Enables texter strategies for campaigns. Enabled by default are "finished-replies-tz", "vetted-texters", and "finished-replies". Learn more at [HOWTO-use-dynamicassignment-batches.md](https://github.com/StateVoicesNational/Spoke/blob/e217a971f0e1eed6f96d1494aee0f62ce715a771/docs/HOWTO-use-dynamicassignment-batches.md#dynamic-assignment-strategies). NOTE: "vetted-takeconversations" is experimental and does not work on its own, needing other three default strategies enabled. 
diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md
@@ -1,5 +1,27 @@
 # Release Notes
 
+## 14.1.2
+
+_October 2024_: Version 14.1.2
+
+14.1.2 is a patch release.
+
+### Bug Fixes
+
+- [#2488](https://github.com/StateVoicesNational/Spoke/pull/2488) - Fix Redis and readonly DB certificate issues - @jeffm2001
+- [#2490](https://github.com/StateVoicesNational/Spoke/pull/2490) - Fix Bandwidth sending - @jeffm2001
+- [#2491](https://github.com/StateVoicesNational/Spoke/pull/2491) - Avoid error on opt-out - @jeffm2001
+- [#2493](https://github.com/StateVoicesNational/Spoke/pull/2493) - Fix broken docker image build - @engelhartrueben
+- [#2442](https://github.com/StateVoicesNational/Spoke/pull/2442) - Add instructions for local postgres - @sjwmoveon
+- [#2478](https://github.com/StateVoicesNational/Spoke/pull/2478) - Allow pausing of initial messages - @jeffm2001
+- [#2494](https://github.com/StateVoicesNational/Spoke/pull/2494) - Heroku Plan Update - @engelhartrueben
+- [#2498](https://github.com/StateVoicesNational/Spoke/pull/2498) - Remove unused variables causing /phone-numbers blank screen error for Admins - @mau11
+- [#2492](https://github.com/StateVoicesNational/Spoke/pull/2492) - Fix UserInputError GraphQL errors - @jeffm2001
+
+### Appreciations
+
+[Jeff Mann](https://github.com/jeffm2001), [Maureen Zitouni](https://github.com/mau11), [Ruby Engelhart](https://github.com/engelhartrueben), [Sophie Waldman](https://github.com/sjwmoveon)
+
 ## 14.1.1
 
 _October 2024_: Version 14.1.1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spoke",
-  "version": "14.1.1",
+  "version": "14.1.2",
   "description": "Spoke",
   "main": "src/server",
   "engines": {
@@ -119,6 +119,7 @@
     "bandwidth-sdk": "^1.0.2",
     "body-parser": "^1.15.2",
     "browserify": "^17.0.0",
+    "buffer": "^6.0.3",
     "color-difference": "^0.3.4",
     "cookie-session": "^2.1.0",
     "dataloader": "^2.2.2",
diff --git a/src/components/AssignmentTexter/Controls.jsx b/src/components/AssignmentTexter/Controls.jsx
@@ -1173,6 +1173,12 @@ export class AssignmentTexterContactControls extends React.Component {
 
   renderFirstMessage(enabledSideboxes) {
     const { contact } = this.props;
+    if (window.DOWNTIME_NO_INITIAL) {
+      return [
+        this.renderToolbar(enabledSideboxes),
+        <div>Sending initial messages is currently paused. You can still reply to any incoming messages.</div>
+      ];
+    }
     return [
       this.renderToolbar(enabledSideboxes),
       <ContactToolbar
diff --git a/src/components/IncomingMessageFilter.jsx b/src/components/IncomingMessageFilter.jsx
@@ -412,7 +412,8 @@ class IncomingMessageFilter extends Component {
                   placeholder="Error code number"
                   label="Error codes"
                   value={this.state.errorCode}
-                  onChange={(_, errorCode) => {
+                  onChange={event => {
+                    const errorCode = event.target.value;
                     this.setState({ errorCode });
                   }}
                   onKeyPress={evt => {
diff --git a/src/containers/AdminIncomingMessageList.jsx b/src/containers/AdminIncomingMessageList.jsx
@@ -185,7 +185,7 @@ export class AdminIncomingMessageList extends Component {
   handleErrorCodeChange = async errorCode => {
     const contactsFilter = {
       ...this.state.contactsFilter,
-      errorCode: errorCode ? errorCode.split(",") : null
+      errorCode: errorCode ? errorCode.split(",").map(Number) : null
     };
     await this.setState({
       contactsFilter,
@@ -234,7 +234,7 @@ export class AdminIncomingMessageList extends Component {
   handleReassignAllMatchingRequested = async newTexterUserId => {
     await this.props.mutations.bulkReassignCampaignContacts(
       this.props.params.organizationId,
-      newTexterUserId,
+      newTexterUserId.toString(),
       this.state.campaignsFilter || {},
       this.state.assignmentsFilter || {},
       this.state.contactsFilter || {},
diff --git a/src/containers/AdminPhoneNumberInventory.js b/src/containers/AdminPhoneNumberInventory.js
@@ -48,6 +48,9 @@ const inlineStyles = {
   cancelButton: {
     marginTop: 15,
     marginRight: 5
+  },
+  deleteButton: {
+    marginTop: 15
   }
 };
 
@@ -263,9 +266,6 @@ class AdminPhoneNumberInventory extends React.Component {
   }
 
   renderBuyNumbersForm() {
-    const service = this.props.data.organization.serviceVendor;
-    const serviceName = service.name;
-    const serviceConfig = service.config || "{}";
     return (
       <GSForm
         schema={this.buyNumbersFormSchema()}
@@ -420,8 +420,8 @@ class AdminPhoneNumberInventory extends React.Component {
             </Button>
             <Button
               variant="contained"
-              color="secondary"
-              variant="outlined"
+              color="primary"
+              style={inlineStyles.deleteButton}
               onClick={this.handleDeletePhoneNumbersSubmit}
             >
               Delete {this.state.deleteNumbersCount} Numbers
diff --git a/src/containers/TexterTodo.jsx b/src/containers/TexterTodo.jsx
@@ -276,7 +276,7 @@ const queries = {
         ownProps.location.query.review === "1"
           ? {
               messageStatus,
-              errorCode: ["0"],
+              errorCode: [0],
               ...(ownProps.params.reviewContactId && {
                 contactId: ownProps.params.reviewContactId
               })
diff --git a/src/extensions/service-vendors/bandwidth/messaging.js b/src/extensions/service-vendors/bandwidth/messaging.js
@@ -1,4 +1,4 @@
-import { Configuration, MessagesApiFp } from "bandwidth-sdk";
+import { Configuration, MessagesApi } from "bandwidth-sdk";
 import { log } from "../../../lib";
 import { getFormattedPhoneNumber } from "../../../lib/phone-format";
 import { getConfig } from "../../../server/api/lib/config";
@@ -38,7 +38,7 @@ export async function getBandwidthController(organization, config) {
     username: config.userName,
     password: config.password
   });
-  return new MessagesApiFp(client);
+  return new MessagesApi(client);
 }
 
 export async function sendMessage({
@@ -106,7 +106,6 @@ export async function sendMessage({
     bandwidthMessage.media = [parsedMessage.mediaUrl];
   }
 
-  let response;
   if (/bandwidthapitest/.test(message.text)) {
     let err;
     const response = {
@@ -131,15 +130,24 @@ export async function sendMessage({
       organization,
       config
     );
-    response = await messagingController.createMessage(
+    const { status, data } = await messagingController.createMessage(
       config.accountId,
       bandwidthMessage
     );
     console.log(
       "bandwidth.sendMessage createMessage response",
-      response && response.statusCode,
-      response && response.result
+      status,
+      data
     );
+    await postMessageSend({
+      status,
+      data,
+      message,
+      contact,
+      trx,
+      organization,
+      changes
+    });
   } catch (err) {
     console.log("bandwidth.sendMessage ERROR", err);
     await postMessageSend({
@@ -152,22 +160,15 @@ export async function sendMessage({
     });
     return;
   }
-  await postMessageSend({
-    response,
-    message,
-    contact,
-    trx,
-    organization,
-    changes
-  });
 }
 
 export async function postMessageSend({
   message,
   contact,
   trx,
   err,
-  response,
+  status,
+  data,
   organization,
   changes
 }) {
@@ -181,10 +182,10 @@ export async function postMessageSend({
     organization_id: organization.id,
     service: "bandwidth"
   };
-  if (response && response.statusCode === 202 && response.result) {
-    changesToSave.service_id = response.result.id;
+  if (status && status === 202 && data) {
+    changesToSave.service_id = data.id;
     organizationContact.status_code = 1;
-    organizationContact.user_number = response.result.from;
+    organizationContact.user_number = data.from;
     cacheableData.campaignContact.updateStatus(
       contact,
       undefined,
@@ -193,8 +194,8 @@ export async function postMessageSend({
   } else {
     // ERROR
     changesToSave.send_status = "ERROR";
-    changesToSave.error_code = response.statusCode;
-    organizationContact.last_error_code = response.statusCode;
+    changesToSave.error_code = status;
+    organizationContact.last_error_code = status;
   }
   let updateQuery = r.knex("message").where("id", message.id);
   if (trx) {
diff --git a/src/lib/conversations.js b/src/lib/conversations.js
@@ -97,7 +97,7 @@ export const getConversationFiltersFromQuery = (query, organizationTags) => {
     filters.contactsFilter.messageStatus = query.messageStatus;
   }
   if (query.errorCode) {
-    filters.contactsFilter.errorCode = query.errorCode.split(",");
+    filters.contactsFilter.errorCode = query.errorCode.split(",").map(Number);
   }
   if (query.tags) {
     if (/^[a-z]/.test(query.tags)) {
diff --git a/src/server/api/conversations.js b/src/server/api/conversations.js
@@ -483,7 +483,7 @@ export async function reassignConversations(
 
         returnCampaignIdAssignmentIds.push({
           campaignId,
-          assignmentId: assignmentId.toString()
+          assignmentId: assignmentId?.toString()
         });
       }
     }
diff --git a/src/server/api/mutations/getOptOutMessage.js b/src/server/api/mutations/getOptOutMessage.js
@@ -1,10 +1,14 @@
+import { getConfig } from "../lib/config";
 import optOutMessageCache from "../../models/cacheable_queries/opt-out-message";
 import zipStateCache from "../../models/cacheable_queries/zip";
 
 export const getOptOutMessage = async (
   _,
   { organizationId, zip, defaultMessage }
 ) => {
+  if (!getConfig("OPT_OUT_PER_STATE")) {
+    return defaultMessage;
+  }
   try {
     const queryResult = await optOutMessageCache.query({
       organizationId: organizationId,
diff --git a/src/server/middleware/render-index.js b/src/server/middleware/render-index.js
@@ -123,6 +123,7 @@ export default function renderIndex(html, css, assetMap) {
       window.CAN_GOOGLE_IMPORT=${canGoogleImport}
       window.DOWNTIME="${process.env.DOWNTIME || ""}"
       window.DOWNTIME_TEXTER="${process.env.DOWNTIME_TEXTER || ""}"
+      window.DOWNTIME_NO_INITIAL="${process.env.DOWNTIME_NO_INITIAL || ""}"
       window.EXPERIMENTAL_PER_CAMPAIGN_MESSAGING_LEGACY=${getConfig(
         "EXPERIMENTAL_PER_CAMPAIGN_MESSAGING_LEGACY",
         null,
diff --git a/src/server/models/cacheable_queries/organization-contact.js b/src/server/models/cacheable_queries/organization-contact.js
@@ -27,7 +27,7 @@ const organizationContactCache = {
     if (r.redis && organizationContact) {
       await r.redis
         .MULTI()
-        .SET(cachekey, json.stringify(organizationcontact))
+        .SET(cacheKey, JSON.stringify(organizationContact))
         .EXPIRE(cacheKey, 43200) // 12 hours
         .exec();
     }
diff --git a/src/server/models/thinky.js b/src/server/models/thinky.js
@@ -3,6 +3,8 @@ import bluebird from "bluebird";
 import knex from "knex";
 import config from "../knex-connect";
 
+const { parse: pgDbUrlParser } = require("pg-connection-string");
+
 // Instantiate the rethink-knex-adapter using the config defined in
 // /src/server/knex.js.
 const knexConn = knex(config);
@@ -14,11 +16,18 @@ if (
 ) {
   const roConfig = {
     ...config,
-    connection: process.env.READONLY_DATABASE_URL || {
+    connection: {
       ...config.connection,
       host: process.env.DB_READONLY_HOST
     }
   };
+
+  if (process.env.READONLY_DATABASE_URL) {
+    roConfig.connection = pgDbUrlParser(process.env.READONLY_DATABASE_URL);
+    const useSSL = process.env.DB_USE_SSL === "1" || process.env.DB_USE_SSL.toLowerCase() === "true";
+    roConfig.connection.ssl = useSSL ? { rejectUnauthorized: false } : false;
+  }
+
   thinkyConn.r.knexReadOnly = knex(roConfig);
 } else {
   thinkyConn.r.knexReadOnly = thinkyConn.r.knex;
@@ -51,10 +60,9 @@ if (redisUrl) {
   if (/rediss/.test(redisSettings.url)) {
     // secure redis protocol for Redis 6.0+
     // https://devcenter.heroku.com/articles/securing-heroku-redis#using-node-js
-    redisSettings.tls = {
+    redisSettings.socket = {
+      tls: true,
       rejectUnauthorized: false,
-      requestCert: true,
-      agent: false
     };
   }
   if (process.env.REDIS_JSON) {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@`
`183`	`183`	`}`
`184`	`184`	`},`
`185`	`185`	`"addons": [`
`186`		`- "heroku-postgresql:basic",`
	`186`	`+ "heroku-postgresql:essential-0",`
`187`	`187`	`{`
`188`	`188`	`"plan": "heroku-redis:mini",`
`189`	`189`	`"options": {`