Kelly McDonald
a8203ed01d
save changes before refactor
2020-12-10 10:06:21 -05:00
Kelly McDonald
c57b17df1e
Add a robust way of adding an API key, update examples and documentation for swagger API and add the ability to completely sync the local system from the remote system.
2020-12-09 12:13:17 -05:00
Dan
c14e50046c
Merging in changes from Kelly.
2020-11-23 16:20:10 -05:00
Kelly McDonald
871c9e4409
Merge remote-tracking branch 'origin/dev' into dev
2020-11-23 16:12:30 -05:00
Kelly McDonald
255dca09ec
Try out some options for SQLAlchemy engine to head off connectoin issues
2020-11-23 16:12:10 -05:00
Dan
5499adb10e
Making more modifications to the default configuration to try and debug an issue with the database connections.
2020-11-23 15:33:51 -05:00
Dan
071c98d72e
Some minor config tweaks to try and deal with some database timeout issues.
2020-11-19 11:25:58 -05:00
Kelly McDonald
5c4aae6802
Make sure we have PB_SPONSORS_URL defined
2020-11-05 10:45:51 -05:00
Carlos Lopez
2bd906e96d
Update github routines to use branches
2020-08-14 11:04:22 -06:00
Dan Funk
31982f81ae
Merge branch 'dev' into feature/documents_publishing
...
# Conflicts:
# Pipfile.lock
2020-07-30 10:17:08 -04:00
Carlos Lopez
fcb772c900
Reporting to Sentry all captured exceptions and enabling multiple environments
2020-07-19 16:40:33 -06:00
Carlos Lopez
f4eb592b87
Extracting token to env var
2020-07-17 12:31:05 -06:00
Carlos Lopez
419d06c95b
Updating file by latest version
2020-07-17 12:31:05 -06:00
Aaron Louie
1f454536e3
Renames TOKEN_AUTH_SECRET_KEY to SECRET_KEY
2020-07-10 11:26:15 -04:00
Carlos Lopez
e947f40ec7
Merge branch 'rrt/dev' into feature/emails-enhancement
2020-06-17 20:10:11 -06:00
Carlos Lopez
c730a7b1ec
Sending subject and using default sender
2020-06-17 08:53:02 -06:00
Aaron Louie
720435113b
Fixes typo in Alex's uid
2020-06-17 08:54:43 -04:00
Aaron Louie
ffadc8e1b7
Merge branch 'rrt/staging' into rrt/production
2020-06-15 13:28:55 -04:00
Aaron Louie
81b6fc1490
Removes unnecessary extra config file
2020-06-13 23:34:12 -04:00
Aaron Louie
c664a77beb
Updates default Protocol Builder base URL
2020-06-13 11:56:00 -04:00
Aaron Louie
cccff9b856
Fixes broken unit tests. But still broken.
2020-06-11 11:29:58 -04:00
Aaron Louie
1f5554d0d8
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-11 08:55:29 -04:00
Dan Funk
9281c962a6
Default to no ssl or tls
2020-06-08 14:46:36 -04:00
Dan Funk
777e429382
Merging production back into dev, because we got out of whack somehow.
2020-06-08 14:19:30 -04:00
Dan Funk
8cf420b781
Default mail user name and password to blank.
2020-06-08 14:15:56 -04:00
Carlos Lopez
ed10cc1fa8
Enabling mail debugging
2020-06-08 11:59:09 -06:00
Aaron Louie
87e2379871
Merge branch 'rrt/dev' into feature/swagger_admin_authentication
2020-06-08 10:30:16 -04:00
Aaron Louie
af1c848f65
Merge branch 'rrt/dev' into rrt/testing
2020-06-07 19:57:09 -04:00
Dan Funk
213d3f3501
Merge branch 'feature/better_approval_status' into rrt/dev
2020-06-05 19:11:16 -04:00
Dan Funk
6861991d8f
Allow setting the type of approvals you want back, by status.
...
Some very minor performance enhancements, that will add up on the Approvers page.
2020-06-05 17:49:55 -04:00
Carlos Lopez
663da57d8b
Config can read smtp values from environment now
2020-06-05 13:54:37 -06:00
Carlos Lopez
4727d87adb
Hooking up emails into process - start
2020-06-04 20:37:28 -06:00
Carlos Lopez
95a3b22bf0
Enabling Sentry for boxes with the flag set
2020-06-01 19:59:55 -06:00
Aaron Louie
be9b613bbb
Refactors user authentication endpoints so we can use the Swagger UI in production mode
2020-05-31 16:49:39 -04:00
Aaron Louie
0f04b1dd79
Forces PB_ENABLED to be a boolean, because environment variables always come through as a string
2020-05-27 08:35:04 -04:00
Dan Funk
7869fa596e
Protocol Builder isn't disabled on the dcos servers, trying to figure out why, and assure it isn't some sort of weird race condition.
2020-05-26 22:42:49 -04:00
Dan Funk
c7fc6649ed
oh my goodness it's late, and I hate docker containers sometimes.
2020-05-25 22:52:36 -04:00
Dan Funk
25adf47277
converting integers to ints, cause that's nice.
2020-05-25 22:47:11 -04:00
Dan Funk
0792aa40a5
Can't override travis settings if you do it with the testing file.
2020-05-25 22:28:33 -04:00
Dan Funk
cbaedad0f6
have testing respect the environment variables if they are set, so we can set them in travis, and use the testing environment there.
2020-05-25 22:02:06 -04:00
Dan Funk
a14168362a
Merge branch 'feature/support_ui_dashboard' into dev
2020-05-25 21:31:16 -04:00
Dan Funk
d80a6af754
Disabling the Protocol Builder, and getting the rrt data correct.
2020-05-25 12:53:56 -04:00
Aaron Louie
4eaee57076
Apparently, APPLICATION_ROOT does something.
2020-05-24 00:05:13 -04:00
Aaron Louie
68084a84cf
Adds base href environment variable. Sets base path for API and all routes from BASE_HREF environment variable.
2020-05-23 22:07:22 -04:00
Dan Funk
503c1c8f18
Allow disabling the Protocol Builder
...
PB_ENABLED can be set to false in the configuration (either in a file called instance/config.py, or as an environment variable)
Added a check in the base_test, to assure that we are always running tests with the test configuration, and bail out otherwise. Setting TESTING=true as an environment variable will get this, but so well the correct ordering of imports. Just be dead certain the first file every test file imports is base_test.py.
Aaron was right, and we call the Protocol Builder in all kinds of awful places. But we don't do this now. So Carlos, you should have the ability to reuse a lot of the logic in the study_service now.
I dropped the poorly named "study-update" endpoint completely. We weren't using it. POST and PUT to Study still work just fine for doing exactly that.
All the tests now run and pass with the Protocol builder disabled. Tests that specifically check PB behavior turn it back on for the test, or mock it out.
2020-05-22 14:37:49 -04:00
Dan Funk
b490005af7
dropping the remaining config stuff for flask_sso.
...
updaing the user 'sso' endpoint to provide additional information for debugging.
Pulling information from ldap to stay super consistent on where we get our information.
2020-05-22 09:50:18 -04:00
Dan Funk
b3ae9ee770
changing the mapping, because 'Uid' not 'uid'
2020-05-21 16:28:34 -04:00
Aaron Louie
daaa7be4ba
Corrects typo
2020-05-16 13:13:49 -04:00
Aaron Louie
183a2c5d66
Run flask on PORT_0 environment variable, if defined.
2020-05-16 11:39:45 -04:00
Aaron Louie
bf563e177b
Allows port to be set via environment variable
2020-05-15 21:32:33 -04:00
