Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
3ec03d1
start skeleton for auth handler
squirrelo Dec 5, 2015
7547ef8
flake8
squirrelo Dec 5, 2015
1df6292
add table for oauth2 keys
squirrelo Dec 5, 2015
0107b15
add token storage in redis
squirrelo Dec 5, 2015
0f22b12
add tests
squirrelo Dec 5, 2015
2d279e8
add tests for password
squirrelo Dec 5, 2015
599cdb0
add oauth2 bad client tests
squirrelo Dec 5, 2015
ec40863
fix up tests
squirrelo Dec 5, 2015
2357500
add error messages to oauth2 errors
squirrelo Dec 5, 2015
8692357
more tests for oauth access codes
squirrelo Dec 5, 2015
964873f
remove print
squirrelo Dec 5, 2015
f721773
update tests for other handlers
squirrelo Dec 5, 2015
96a5be6
merge upstream/master
squirrelo Dec 5, 2015
476ecab
add missing auth check
squirrelo Dec 7, 2015
13b0896
move test inserts
squirrelo Dec 7, 2015
61df629
merge upstream/artifact
squirrelo Dec 8, 2015
edbbebb
add daily request limiting
squirrelo Dec 8, 2015
7c58a6b
docstrings
squirrelo Dec 8, 2015
19a227a
update error controlled vocab
squirrelo Dec 8, 2015
f49fa50
move authenticator to wrapper
squirrelo Dec 11, 2015
ab3cbed
update other handlers to reflect decorator
squirrelo Dec 11, 2015
8fe3c2c
Merge branch 'artifact' of https://github.com/biocore/qiita into oauth2
squirrelo Dec 11, 2015
11c680a
flake8
squirrelo Dec 11, 2015
dcd78a1
address comments
squirrelo Dec 14, 2015
e3ef9d9
break up tests
squirrelo Dec 14, 2015
8c42fdd
Propagate artifact visibility
josenavas Dec 16, 2015
cb99e04
Merge branch 'artifact' of https://github.com/biocore/qiita into oauth2
josenavas Dec 16, 2015
427471f
initial commit
antgonza Dec 17, 2015
b9eda75
Addressing comments
josenavas Dec 17, 2015
9b106f9
addressing @ackermag comment
antgonza Dec 17, 2015
362fa4e
fix #1568
antgonza Dec 17, 2015
bfd7194
better display
antgonza Dec 17, 2015
b65953c
addressing @josenavas comments
antgonza Dec 18, 2015
1eb4920
Merge pull request #1580 from antgonza/fix-1568
ElDeveloper Dec 18, 2015
c7ce866
addressing @ElDeveloper comments
antgonza Dec 18, 2015
dbeb14d
Merge pull request #1579 from antgonza/improving-ebi-help
josenavas Dec 18, 2015
c716574
Adding QiitaClient class
josenavas Dec 18, 2015
28f9697
Adding QiitaClient tests
josenavas Dec 18, 2015
15a6ee7
Using wss for websockets
josenavas Dec 18, 2015
7dbac08
Using https in the tornado webserver, adding default certificates and…
josenavas Dec 18, 2015
e7b541f
Update plugin to use https rather than http
josenavas Dec 18, 2015
c9a3da0
Type on config file
josenavas Dec 18, 2015
f60a98d
Removing prints
josenavas Dec 18, 2015
8739635
Fixing small bug
josenavas Dec 18, 2015
605abff
Addressing comments
josenavas Dec 19, 2015
18fe70c
Adding documentation to the QiitaClient object
josenavas Dec 19, 2015
1337746
Addressing comments
josenavas Dec 19, 2015
1ab69e1
Merge pull request #1578 from josenavas/artifact-propagate-visibility
ElDeveloper Dec 19, 2015
e8169f3
Merge branch 'oauth2' of https://github.com/squirrelo/qiita into oauth2
josenavas Dec 20, 2015
1004130
Merge branch 'artifact' of https://github.com/biocore/qiita into oauth2
josenavas Dec 20, 2015
2aa5876
Merge branch 'artifact' of https://github.com/biocore/qiita into arti…
josenavas Dec 20, 2015
f963137
Merge branch 'oauth2' into artifact-oauth
josenavas Dec 20, 2015
100b354
Fixing the qiita client to use OAuth2
josenavas Dec 21, 2015
be34c7c
Fixing plugin tests
josenavas Dec 21, 2015
3a305d8
Adding python patch to create the target gene client oauth2 info
josenavas Dec 21, 2015
4b79d66
address sugestions
squirrelo Dec 21, 2015
4d1d100
add returns
squirrelo Dec 21, 2015
df7a469
add raises
squirrelo Dec 21, 2015
0c7b152
expand docstring
squirrelo Dec 21, 2015
4e2d728
break up test imports
squirrelo Dec 21, 2015
f0c25b3
flake8 and docstrings
squirrelo Dec 21, 2015
d6f63dd
Addressing comments
josenavas Dec 21, 2015
0b848d8
Adding verbose comment to the _verify attribute in QiitaClient
josenavas Dec 21, 2015
e28153b
Removing try/except
josenavas Dec 21, 2015
e05c43b
Updating changelog
josenavas Dec 21, 2015
fa43356
Merge branch 'artifact-https' into artifact-plugin-setup
josenavas Dec 21, 2015
0500833
Adding setup.py to the target gene plugin
josenavas Dec 23, 2015
74e6bcd
Adding a readme to the target gene plugin
josenavas Dec 23, 2015
464e68d
Solving merge conflicts
josenavas Dec 23, 2015
c7e294f
Addressing comments
josenavas Dec 23, 2015
211aeda
Merge pull request #1562 from squirrelo/oauth2
antgonza Dec 24, 2015
7fa4162
Merge pull request #1585 from josenavas/artifact-changelog
squirrelo Dec 29, 2015
b9d6931
Merge branch 'artifact' of https://github.com/biocore/qiita into arti…
josenavas Jan 3, 2016
19dfe07
Merge pull request #1581 from josenavas/artifact-https
antgonza Jan 3, 2016
12dab96
Fixing conflicts
josenavas Jan 3, 2016
dbccfca
Fixing failing tests
josenavas Jan 7, 2016
00c69c0
Merge branch 'artifact-oauth' into artifact-plugin-setup
josenavas Jan 7, 2016
1c4ea5b
Addressing comments
josenavas Jan 7, 2016
305dfa5
Merge branch 'artifact-oauth' into artifact-plugin-setup
josenavas Jan 7, 2016
ab5eb1e
Adding names to the artifacts
josenavas Jan 7, 2016
faa33a5
Fixing populate test db
josenavas Jan 7, 2016
7cc3b13
Adding name property
josenavas Jan 7, 2016
822b3fc
Modifying create to accept name optional parameter
josenavas Jan 7, 2016
e474219
Adding relation table between software and oauth identifiers
josenavas Jan 8, 2016
1b2bdbc
Adding plugin information to the qiita-test-install script
josenavas Jan 8, 2016
c6eebfb
Fixing comments
josenavas Jan 8, 2016
64e0713
Fixing expire time
josenavas Jan 9, 2016
0909755
Merge pull request #1584 from josenavas/artifact-oauth
squirrelo Jan 11, 2016
27950d7
Merge branch 'artifact' of https://github.com/biocore/qiita into arti…
josenavas Jan 13, 2016
5d3de41
Creating a section in install.md with the instructions to install the…
josenavas Jan 13, 2016
378be82
Updating travis so it also installs the plugin
josenavas Jan 13, 2016
4576e59
Merge conflict hell
josenavas Jan 13, 2016
d1b829b
Fixing merge conflict hell
josenavas Jan 13, 2016
668dc76
Fix #1573
josenavas Jan 13, 2016
cb9cf57
Merge pull request #1587 from josenavas/artifact-plugin-setup
antgonza Jan 13, 2016
b09bf9e
Merge branch 'artifact' of https://github.com/biocore/qiita into arti…
josenavas Jan 13, 2016
ed61554
Fixing travis config file
josenavas Jan 13, 2016
d5b67e8
Addressing comments
josenavas Jan 13, 2016
a3c9e6e
Merge pull request #1599 from josenavas/artifact-names
antgonza Jan 13, 2016
6546a5a
Merge pull request #1523 from biocore/artifact
antgonza Jan 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing failing tests
  • Loading branch information
josenavas committed Jan 7, 2016
commit dbccfcad76d8e3a584353c0cbb91629a25694b8c
6 changes: 3 additions & 3 deletions qiita_db/handlers/tests/test_oauth2.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def test_authenticate_client_header(self):
obs_body = loads(obs.body)
exp = {'access_token': 'token',
'token_type': 'Bearer',
'expires_in': '3600'}
'expires_in': 3600}
self.assertItemsEqual(obs_body.keys(), exp.keys())
self.assertEqual(obs_body['token_type'], exp['token_type'])
self.assertEqual(obs_body['expires_in'], exp['expires_in'])
Expand All @@ -122,7 +122,7 @@ def test_authenticate_client_post(self):
obs_body = loads(obs.body)
exp = {'access_token': 'placeholder',
'token_type': 'Bearer',
'expires_in': '3600'}
'expires_in': 3600}
self.assertItemsEqual(obs_body.keys(), exp.keys())
self.assertEqual(obs_body['token_type'], exp['token_type'])
self.assertEqual(obs_body['expires_in'], exp['expires_in'])
Expand Down Expand Up @@ -215,7 +215,7 @@ def test_authenticate_password(self):
obs_body = loads(obs.body)
exp = {'access_token': 'placeholder',
'token_type': 'Bearer',
'expires_in': '3600'}
'expires_in': 3600}
self.assertItemsEqual(obs_body.keys(), exp.keys())
self.assertEqual(obs_body['token_type'], exp['token_type'])
self.assertEqual(obs_body['expires_in'], exp['expires_in'])
Expand Down