Code

Improved API keys logic#1061

Code

Merged

krivard merged 113 commits intocmu-delphi:api-keyscmu-delphi/delphi-epidata:api-keysfrom

dmytrotsko:api_key_v2dmytrotsko/delphi-epidata:api_key_v2Copy head branch name to clipboard

Mar 29, 2023

Commits

Commits on Oct 18, 2022

• Cleanup unused imports && added role definition and security

  

  work

  committed
  c7b0120

  Copy full SHA for c7b0120

• Simple api role checking

  dmytrotsko

  committed
  a700ef2

  Copy full SHA for a700ef2

• Render api key warnings

  dmytrotsko

  committed
  75509cb

  Copy full SHA for 75509cb

• Move tests

  dmytrotsko

  committed
  a796e2c

  Copy full SHA for a796e2c

• Add api user ddl

  dmytrotsko

  committed
  8d48b20

  Copy full SHA for 8d48b20

• tests

  dmytrotsko

  committed
  c753f73

  Copy full SHA for c753f73

• improve dockerignore

  dmytrotsko

  committed
  a15a36e

  Copy full SHA for a15a36e

• support api date via env

  dmytrotsko

  committed
  4fc210d

  Copy full SHA for 4fc210d

• start with admin interface

  dmytrotsko

  committed
  ee0c087

  Copy full SHA for ee0c087

• start with simple admin interface

  dmytrotsko

  committed
  0446ea9

  Copy full SHA for 0446ea9

• very basic admin interface

  dmytrotsko

  committed
  c7ca927

  Copy full SHA for c7ca927

• list all known roles

  dmytrotsko

  committed
  d066a90

  Copy full SHA for d066a90

• remove log statement

  dmytrotsko

  committed
  8b09387

  Copy full SHA for 8b09387

• fixup tests

  dmytrotsko

  committed
  e940f8b

  Copy full SHA for e940f8b

• add record flag to user

  dmytrotsko

  committed
  8bb2789

  Copy full SHA for 8bb2789

• basic record based on flag logging

  dmytrotsko

  committed
  3161d2e

  Copy full SHA for 3161d2e

• rename column to tracking

  dmytrotsko

  committed
  9ab8978

  Copy full SHA for 9ab8978

• add webhook endpoint for google forms and simplify table

  dmytrotsko

  committed
  54dc83c

  Copy full SHA for 54dc83c

• tests for simplified api_user

  dmytrotsko

  committed
  62122cf

  Copy full SHA for 62122cf

• prepare for sending mails with mailgun

  dmytrotsko

  committed
  32096ac

  Copy full SHA for 32096ac

• disable security check for test setup

  dmytrotsko

  committed
  45414bc

  Copy full SHA for 45414bc

• fix tests

  dmytrotsko

  committed
  60f7cd6

  Copy full SHA for 60f7cd6

• add registered flag

  dmytrotsko

  committed
  dac3fcb

  Copy full SHA for dac3fcb

• request a simple api key form with recaptcha check

  dmytrotsko

  committed
  d880795

  Copy full SHA for d880795

• implement rate limiting

  dmytrotsko

  committed
  e76cde4

  Copy full SHA for e76cde4

• registered flag not saved

  dmytrotsko

  committed
  f1f008e

  Copy full SHA for f1f008e

• mark all tests no rate limit

  dmytrotsko

  committed
  98315c6

  Copy full SHA for 98315c6

• add link to registration form within api key form

  dmytrotsko

  committed
  f897e28

  Copy full SHA for f897e28

• elevate sqlalchemy log level to ERROR for test purpose

  dmytrotsko

  committed
  b345f76

  Copy full SHA for b345f76

• add structlog to requirements

  dmytrotsko

  committed
  5ce96bd

  Copy full SHA for 5ce96bd

• add structured logging module

  dmytrotsko

  committed
  f851d5b

  Copy full SHA for f851d5b

• implement api key scrubbing logs and getter functions for User class

  dmytrotsko

  committed
  38abd83

  Copy full SHA for 38abd83

• minor commenting change

  dmytrotsko

  committed
  d65acb8

  Copy full SHA for d65acb8

• change logging to kward format and add a get function for API key

  dmytrotsko

  committed
  5aee08f

  Copy full SHA for 5aee08f

• move mask_apikey function out of User class

  dmytrotsko

  committed
  7378e8d

  Copy full SHA for 7378e8d

• minor change in variable name

  dmytrotsko

  committed
  02a535b

  Copy full SHA for 02a535b

• Fixed test

  dmytrotsko

  committed
  c18a122

  Copy full SHA for c18a122

• added missing import

  dmytrotsko

  committed
  da947fd

  Copy full SHA for da947fd

Commits on Oct 24, 2022

• Fixed _is_public_route method. Added URL_PREFIX to list of routes

  dmytrotsko

  committed
  4732467

  Copy full SHA for 4732467

• Merge pull request #2 from dmytrotsko/fix_admin_endpoint_access

  Show description for ae1e6a1
  dmytrotsko

  authored
  ae1e6a1

  Copy full SHA for ae1e6a1

Commits on Oct 25, 2022

• Added email column to User table

  dmytrotsko

  committed
  16a154c

  Copy full SHA for 16a154c

• Merge branch 'api_key' of github.com:dmytrotsko/delphi-epidata into api_key

  dmytrotsko

  committed
  4b5fa65

  Copy full SHA for 4b5fa65

• Fixed tests

  dmytrotsko

  committed
  a8011fd

  Copy full SHA for a8011fd

• Added Dockerfile for Redis

  dmytrotsko

  committed
  6775384

  Copy full SHA for 6775384

• Made email optional

  dmytrotsko

  committed
  7e11435

  Copy full SHA for 7e11435

Commits on Oct 26, 2022

• Added email address validaiton

  dmytrotsko

  committed
  74fd290

  Copy full SHA for 74fd290

Commits on Oct 27, 2022

• Fixed API key creation via /create_key endpoint

  dmytrotsko

  committed
  8d496ba

  Copy full SHA for 8d496ba

• Fixed /register endpoint after google script refactoring

  dmytrotsko

  committed
  3bc7095

  Copy full SHA for 3bc7095

Commits on Oct 28, 2022

• Fixed registration

  dmytrotsko

  committed
  e39c82a

  Copy full SHA for e39c82a

• Reverted some changes in _config.py

  dmytrotsko

  committed
  be80550

  Copy full SHA for be80550

Commits on Nov 2, 2022

• Reverted changes in .env.example

  dmytrotsko

  committed
  8f21122

  Copy full SHA for 8f21122

• Code refactoring

  dmytrotsko

  committed
  71bb186

  Copy full SHA for 71bb186

• Removed unused variables

  dmytrotsko

  committed
  aea77eb

  Copy full SHA for aea77eb

• Code cleaning

  dmytrotsko

  committed
  b7a6078

  Copy full SHA for b7a6078

Commits on Nov 3, 2022

• Removed unused variables

  dmytrotsko

  committed
  635be31

  Copy full SHA for 635be31

• Removed default redis configuration file (it is not needed for now)

  dmytrotsko

  committed
  93b056e

  Copy full SHA for 93b056e

• Moved BASE_URL and auth to setUP, formatted code

  dmytrotsko

  committed
  df11183

  Copy full SHA for df11183

• Moved BASE_URL and auth to setUP(), formatted code

  dmytrotsko

  committed
  b63faa3

  Copy full SHA for b63faa3

• Revert "Moved BASE_URL and auth to setUP(), formatted code"

  Show description for 9ed758b
  dmytrotsko

  committed
  9ed758b

  Copy full SHA for 9ed758b

Commits on Nov 4, 2022

• Formatted code & removed unused imports.

  Show description for 02083a0
  dmytrotsko

  committed
  02083a0

  Copy full SHA for 02083a0

Commits on Nov 7, 2022

• Created staticmethod _make_rqeuest() and reused it in test_caching() method.

  dmytrotsko

  committed
  99f75a6

  Copy full SHA for 99f75a6

• Returned BASE_URL and auth back, because if we use default BASE_URL from Epidata class, tests will send requests to the wrong address and fail

  dmytrotsko

  committed
  f94ec4d

  Copy full SHA for f94ec4d

• Completely removed patch_flask_config() function as it is useless. There is no need to patch app.config is this case, because we are using that variables directly from _config.py

  dmytrotsko

  committed
  0480172

  Copy full SHA for 0480172

• Removed duplicated _logger.py file (this is exact copy of src/acquisition/covidcast/logger.py). Changed _security.py to use that logger.

  dmytrotsko

  committed
  3586bcf

  Copy full SHA for 3586bcf

Commits on Nov 8, 2022

• Fixed test

  dmytrotsko

  committed
  1ee16f7

  Copy full SHA for 1ee16f7

• Removed unused method

  dmytrotsko

  committed
  7ce411b

  Copy full SHA for 7ce411b

• Added missing changes in Dockerfiles for copying logger

  dmytrotsko

  committed
  68240ca

  Copy full SHA for 68240ca

Commits on Nov 9, 2022

• Fixed misspelled filename

  dmytrotsko

  committed
  d350347

  Copy full SHA for d350347

• Added missing variable in CSVPrinter

  dmytrotsko

  committed
  4bca6b4

  Copy full SHA for 4bca6b4

• Formatted code

  dmytrotsko

  committed
  3cf15da

  Copy full SHA for 3cf15da

• Removed tests for admin endpoint for now

  dmytrotsko

  committed
  ad00db5

  Copy full SHA for ad00db5

• Moved config variables from _security to _config. Removed duplicated method in _security.py by creating parent class for DBUser and APIUser classes.

  dmytrotsko

  committed
  4285b87

  Copy full SHA for 4285b87

Commits on Nov 15, 2022

• Added missing changes

  dmytrotsko

  committed
  ec67149

  Copy full SHA for ec67149

• Replaced db.execute delete and update with built-it sqlalchemy functions.

  dmytrotsko

  committed
  7a364d9

  Copy full SHA for 7a364d9

• Removed email field. Edited google form link to prefill tracking consent option as Yes

  dmytrotsko

  committed
  e4ae70c

  Copy full SHA for e4ae70c

Commits on Nov 24, 2022

• Removed api_user ddl

  dmytrotsko

  committed
  c21689d

  Copy full SHA for c21689d

Commits on Nov 28, 2022

• Changed user roles to use m2m table instead of string in api_user table

  dmytrotsko

  committed
  1ebff22

  Copy full SHA for 1ebff22

• Added new variable for api key expiration date

  dmytrotsko

  committed
  c49c1f8

  Copy full SHA for c49c1f8

• Updated admin endpoint. Removed email from user details and added creation_date, expiration_date and last_api_access_date fields

  dmytrotsko

  committed
  c54412c

  Copy full SHA for c54412c

• Updated integration tests

  dmytrotsko

  committed
  6c50703

  Copy full SHA for 6c50703

• Updated endpoints to register user role on endpoint load

  dmytrotsko

  committed
  3e34e3c

  Copy full SHA for 3e34e3c

Commits on Nov 30, 2022

• Removed user_role FK in api_user table.

  Show description for 8fbae7d
  dmytrotsko

  committed
  8fbae7d

  Copy full SHA for 8fbae7d

• Updated according to new structure

  dmytrotsko

  committed
  95507c2

  Copy full SHA for 95507c2

• Removed API_KEY_EXPIRE_AFTER variable

  dmytrotsko

  committed
  597eeb4

  Copy full SHA for 597eeb4

• Removed creation_date, expiration_date and last_api_access_date from admin UI as we don't have them anymore

  dmytrotsko

  committed
  08bd2b6

  Copy full SHA for 08bd2b6

• Added roles registraion on endpoints load

  dmytrotsko

  committed
  c436b0a

  Copy full SHA for c436b0a

• Removed role registration statement

  dmytrotsko

  committed
  199d434

  Copy full SHA for 199d434

• Fixed integration tests. Actually reverted latest changes as api_user table can be truncated again

  dmytrotsko

  committed
  4422a5e

  Copy full SHA for 4422a5e

• Added new ddls

  dmytrotsko

  committed
  806d6e4

  Copy full SHA for 806d6e4

• Merge branch 'dev' into api_key

  dmytrotsko

  authored
  82a0e25

  Copy full SHA for 82a0e25

Commits on Dec 1, 2022

• Fixed wrong import

  dmytrotsko

  committed
  58f715d

  Copy full SHA for 58f715d

• Fixed issue after resolving conflicts

  dmytrotsko

  committed
  73efe70

  Copy full SHA for 73efe70

Commits on Dec 27, 2022

• Moved admin endpoint to another file into endpoints folder

  dmytrotsko

  committed
  d291f61

  Copy full SHA for d291f61

• Removed from _security.py all unnecessary functions

  dmytrotsko

  committed
  efe545f

  Copy full SHA for efe545f

• Changed roles registration process. Now we have only necessary roles. Prev we had roles for all the endpoints where role.name == endpoint.name which added redundant roles to the database. Also chan…

  Show description for 7433cf2
  dmytrotsko

  committed
  7433cf2

  Copy full SHA for 7433cf2

• Added IF NOT EXISTS to table creation statement

  dmytrotsko

  committed
  c1947c3

  Copy full SHA for c1947c3

• Added missing import

  dmytrotsko

  committed
  466adfb

  Copy full SHA for 466adfb

• Moved admin models to the separate file. Now we have only 1 User class which containts all necessary methods to work with User model.

  dmytrotsko

  committed
  16c4dec

  Copy full SHA for 16c4dec

• Added declarative_base and session objects to the _db.py file. To have all db related stuff into one file

  dmytrotsko

  committed
  007be57

  Copy full SHA for 007be57

• Updated tests to use statement in order to clean api_user table after each test run. This is done because of returning relationship into User model.

  dmytrotsko

  committed
  a2de0c7

  Copy full SHA for a2de0c7

Commits on Feb 24, 2023

• Reverted formatting

  dmytrotsko

  committed
  835d602

  Copy full SHA for 835d602

Commits on Feb 28, 2023

• Reverted formatting

  dmytrotsko

  committed
  0913051

  Copy full SHA for 0913051

• Removed copying of _logger.py

  dmytrotsko

  committed
  0c5f12a

  Copy full SHA for 0c5f12a

• Fixed auth props

  dmytrotsko

  committed
  0e9c7c8

  Copy full SHA for 0e9c7c8

• Added missing requirements

  dmytrotsko

  committed
  e212abe

  Copy full SHA for e212abe

• Added authentication params

  dmytrotsko

  committed
  56c8cbb

  Copy full SHA for 56c8cbb

• Removed unused imports

  dmytrotsko

  committed
  d3ec9a6

  Copy full SHA for d3ec9a6

Commits on Mar 21, 2023

• Added new columns to api_user table

  dmytrotsko

  committed
  db9d87b

  Copy full SHA for db9d87b

• Added placeholder to handle api key last usage update

  dmytrotsko

  committed
  4c6d84a

  Copy full SHA for 4c6d84a

Commits on Mar 22, 2023

• Added Redis host variable

  dmytrotsko

  committed
  2f2398a

  Copy full SHA for 2f2398a

• Uncommented @after_reqeust function to update last API key usage in Redis.

  dmytrotsko

  committed
  c75f0ea

  Copy full SHA for c75f0ea

Commits on Mar 28, 2023

• Added Redis to ci.yaml. Added several more env variables for delphi_web_epidata container

  dmytrotsko

  committed
  8b41263

  Copy full SHA for 8b41263

Commits on Mar 29, 2023

• Merge branch 'api-keys' into api_key_v2

  krivard

  authored
  7a890b4

  Copy full SHA for 7a890b4