Homec4science

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Jan 13 2016, 23:52.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Event Timeline

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:8a37f2c00429: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Jan 13 2016, 23:52

Merged Changes

CommitAuthorDetailsCommitted
59a98d288a3dDavid Walend
Found a bug where my http headers were being ignored 
Jan 13 2016
852f9f302d7eDavid Walend
Comment for java code's reason to exist 
Jan 13 2016
c3ff50aa00b5David Walend
Removed some stray printlns 
Jan 13 2016
338c83b1c654David Walend
Now verifying the keys that signed the jwts string 
Jan 13 2016
d28c5d496e24David Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Jan 13 2016
474f5d939b2eKeith Dwyer
Remove (unused) PCORI_AdapterMappings.xml file. This should make build/test a… 
Jan 13 2016
7fc8a17aba50David Walend
Restored tests of dashboard-to-dashboard comms 
Jan 13 2016
fa62d920c198David Walend
Now sending a Spray OAuth token with the request 
Jan 13 2016
bfb561311772David Walend
Switched to Bearer auth scheme, step 1 
Jan 13 2016
63d938c2d6c8David Walend
Reformatted ShrineJwtAuthenticator.scala 
Jan 13 2016
18ebe89d2a41David Walend
Another try at getting the pom.xml to build just JDK 7 code 
Jan 13 2016
4761d5b7f69aDavid Walend
Swithcing on the JDK 7 comple option. Hope that the Scala/Java compiler thing… 
Jan 13 2016
d7464de1cfe9David Walend
Now using just the jwtsString, almost able to switch to Bearer authentication. 
Jan 13 2016
013344e6f0e3David Walend
Removed some less interesting dead code 
Jan 12 2016
a41433107ccbDavid Walend
Now using jwt's kid field for the public part of the cert. 
Jan 12 2016
08ea31cca746David Walend
Trying out an ssl client that accepts all certs 
Jan 12 2016