Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: intridea/omniauth
base: v0.2.6
...
head fork: intridea/omniauth
compare: v0.3.0
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jan 11, 2011
@jaigouk jaigouk need to change google_health.rb a94a63a
@gduquesnay gduquesnay working on google health 47e9ef2
@gduquesnay gduquesnay no such file to load -- omniauth/startegies/google_health (LoadError) 689215d
@jaigouk jaigouk fixed a typo 98e49d0
@jaigouk jaigouk added Google Health Sandbox 7eb0991
@jaigouk jaigouk working on redicret 8fc55e8
@jaigouk jaigouk working on redicret feccb99
@jaigouk jaigouk user hash 82c6ee7
Commits on Mar 30, 2011
Diego Sueiro Trying to add blogger support 42617af
Diego Sueiro fix typo f2307ed
Diego Sueiro Blogger integration up and running 0c28f4d
Commits on Mar 31, 2011
Diego Sueiro Forcing change of version 8a4eb3e
Diego Sueiro More revision changing 83fc468
Diego Sueiro More revision changing 2e4a534
Commits on May 20, 2011
@jerryluk jerryluk Added Google OAuth2 strategy f45195c
@jerryluk jerryluk Added GoogleOAuth2 to CAMERIZE_SPECIAL c982512
@jerryluk jerryluk Changed from Google2 to Google_OAuth2 fa247a3
Commits on May 23, 2011
@jerryluk jerryluk Added expires_at d1d787c
@jerryluk jerryluk Added expires_at to credcredentials 5eae641
Commits on May 24, 2011
@he9qi he9qi sina 0e07f3f
@sferik sferik Add credentials params 1bfab1e
@sferik sferik Allow passing params from initial auth link to callback 5271a9d
Commits on May 25, 2011
@sferik sferik Merge branch 'master' of https://github.com/dsueiro-backing/omniauth
Conflicts:
	VERSION
	oa-oauth/lib/omniauth/oauth.rb
2b31822
@sferik sferik Don't test against Ruby 1.9.1 until Rack restores compatibility 9ddad05
@sferik sferik Merge branch 'master' of https://github.com/sleekr/omniauth
Conflicts:
	oa-oauth/lib/omniauth/oauth.rb
e3a08a7
@sferik sferik Add Google Health to README 21e6ef8
Commits on May 27, 2011
@unixcharles unixcharles Google default scope should include http 86c4a64
@ryanwood ryanwood Add WePay strategy 0356c46
Commits on May 28, 2011
@sferik sferik Merge pull request #348 from ryanwood/master
Add WePay strategy
d14c053
@sferik sferik Merge pull request #346 from unixcharles/master
Fix google auth default scope
55921b0
Commits on Jun 01, 2011
@nickstamas nickstamas added dropbox strategy d7891fd
@sferik sferik Merge pull request #350 from nstamas/master
Added Dropbox strategy
af7cc92
Commits on Jun 05, 2011
@sferik sferik Running `bundle exec rake` is no longer necessary d66f38c
Commits on Jun 08, 2011
@sferik sferik Test against Rubinius 2.0 007a26f
Commits on Jun 27, 2011
@sferik sferik Update addressable dependency to version ~> 2.2.6 66a9ef5
@sferik sferik Fix bug in versioning task to allow pre-release gems 647c30e
@sferik sferik Update OAuth strategies
* Update to oauth2 version 0.5.0.rc1
  * Rescue from OAuth2::Error instead of OAuth2::HTTPError
  * Rename from web_server strategy to auth_code strategy
* Update to faraday version 0.7.3
* Organize OAuth/OAuth2 strategies into separate directories
* Make naming more consistent
* Remove methods that I'm not sure are necessary

Sorry if this commit broke your strategy. Please submit a patch that
restores just the parts you need. All the tests are passing, so you
should also submit a failing test.
2ea4639
@sferik sferik Bump version to 0.3.0.rc1 fe63cbb
@sferik sferik Cleanup 24cc19f
Commits on Jun 28, 2011
thickpaddy Don't explode when LinkedIn user doesn't have a public profile url ae9a501
@sbfaulkner sbfaulkner support name option for twitter strategy
allows application to authenticate for multiple twitter application key/secret pairs
84e9fa5
Commits on Jun 29, 2011
@sferik sferik Allow bundling of unreleased versions of sub-gems 59ca55b
@sferik sferik Update evernote dependency to version 1.0 44fa39a
@ngauthier ngauthier handle expired sessions during oauth signup
when the session expires while waiting for a callback,
 catch the empty session exception and respond with
and OmniAuth::NoSessionError

References Github Issue 338
#338
eb6f751
@ngauthier ngauthier catch twitter user info timeout
when the http get to gather a twitter user's user_hash
times out, it raises Errno::ETIMEDOUT, so I re-raised
it as Timeout::Error so that it's caught properly.
b5fd2e2
@sferik sferik Merge pull request #381 from ngauthier/master
Resilience to Twitter
abc65ba
@sferik sferik Replace tabs with spaces 0e07a49
Commits on Jun 30, 2011
@ngauthier ngauthier catch bad gateway on oauth request token fetch 682dc11
@sferik sferik Merge pull request #382 from ngauthier/master
catch bad gateway on oauth request token fetch
a1de379
Commits on Jul 01, 2011
Harry Love Add Glitch to OAuth2 strategies e143ddb
@mbleigh mbleigh Merge pull request #385 from harrylove/master
Adding Glitch to OAuth2 strategies
b9fe799
Commits on Jul 04, 2011
@aagrawal2001 aagrawal2001 Adding Yahoo to README cc23a21
@sferik sferik Merge pull request #387 from aagrawal2001/master
One line addition to README
eaac5a8
Commits on Jul 05, 2011
@dcu dcu implemented flattr strategy
Signed-off-by: David A. Cuadrado <krawek@gmail.com>
3e785d9
Commits on Jul 10, 2011
@sferik sferik Merge pull request #378 from thickpaddy/master
Fixed - Invalid response when linked in user has no public profile url
f6f7d5e
@sferik sferik Update nokogiri dependency to version ~> 1.5.0 f1d9826
@sferik sferik Revert part of 2ea4639.
Only apply changes to OAuth2 strategies.
dc0202c
@sferik sferik Revert "Test against Rubinius 2.0"
This reverts commit 007a26f.
9453f46
@sferik sferik Merge branch 'master' of https://github.com/sbfaulkner/omniauth into …
…sbfaulkner-master

Conflicts:
	oa-oauth/lib/omniauth/strategies/oauth/twitter.rb
2c1509b
@sferik sferik Merge pull request #389 from dcu/flattr
implemented flattr strategy
7b47266
Commits on Jul 11, 2011
@quickerbuy quickerbuy Remove the duplicated word "will will". 9d46469
@sferik sferik Merge pull request #393 from quickerbuy/patch-1
Remove the duplicated word "will will".
e540fd9
Commits on Jul 12, 2011
@boyvanamstel boyvanamstel Added Google OpenID+OAuth Hybrid protocol.
Based on standard Google OpenID plugin.
14e4414
@boyvanamstel boyvanamstel Minimalized code by extending the default OpenID strategy. b92d038
@boyvanamstel boyvanamstel Added comment and credits 32c265a
@sferik sferik Cleanup e105f34
@sferik sferik Change twitter path to authorize to allow direct messages access 0875396
@sferik sferik Change default URL 68b06cb
Commits on Jul 13, 2011
@andersonleite andersonleite adding new orkut strategy 1de9d78
Commits on Jul 14, 2011
@andersonleite andersonleite alphabetical order e8ca973
@andersonleite andersonleite alphabetical order in oauth.rb 2869c41
@sferik sferik Merge pull request #396 from andersonleite/master
adding new orkut strategy
28631a2
Commits on Jul 16, 2011
@boyvanamstel boyvanamstel Moved scope, token and secret to credentials in auth hash schema. f32d6a5
Commits on Jul 19, 2011
@kamal kamal Add Cobot to OAuth2 strategies 346bdec
Commits on Jul 20, 2011
@paratiger paratiger LastFM Strategy f2908ff
Commits on Jul 21, 2011
@felipecsl felipecsl Fixed bug in Facebook strategy where the whole authentication process…
… was failing
351cee1
@sferik sferik Merge pull request #405 from felipecsl/master
Fix for facebook strategy
f44cd84
@sferik sferik Restore Ruby 1.8 compatibility 3817313
@sferik sferik Don't test against JRuby baaf998
@sferik sferik Merge pull request #403 from kamal/cobot
Add Cobot to OAuth2 strategies
dcd5f0b
@boyvanamstel boyvanamstel Added spec setup, needed to change require path b480307
@sferik sferik Merge pull request #406 from tictoc/v0.2.6lastfm
LastFM Strategy
3157309
@boyvanamstel boyvanamstel Unfinished OpenID en Google Hybrid specs. e6a2f33
@mbleigh mbleigh Adds :site option to GitHub strategy. 3033c9c
@mbleigh mbleigh Make GitHub provider work with newer OAuth2. 8a47886
@mbleigh mbleigh Got Facebook strategy working on new OAuth2 cb3dc54
@boyvanamstel boyvanamstel Added very basic specs for OpenID and Hybrid Protocol.
I've uncommented the working existing OpenID specs and added a few todos.
For Hybrid Protocol to work it needs access to oa-oauth, so I've added
it to oa-openid's Gemfile.
09068e0
@mbleigh mbleigh Make orkut use MultiJson. 1c8cae1
@sferik sferik Merge pull request #394 from boyvanamstel/google-hybrid
Google OpenID+OAuth Hybrid Protocol strategy
249718c
@mbleigh mbleigh Refactor oa-oauth/spec/helper to be oa-oauth/spec/spec_helper to be c…
…onsistent.
e6032b7
@mbleigh mbleigh Merge branch 'master' of github.com:intridea/omniauth f134ee7
@mbleigh mbleigh oa-oauth now depends on oauth2 0.5.0.rc2 d4545b1
Commits on Jul 22, 2011
@sferik sferik Remove old document file 7407ebe
@sferik sferik The omniauth gem is a meta-gem
Don't include all sub-gem files in this package, just specify sub-gems
as dependencies
51813ed
@sferik sferik Add vcr as a development dependency 496acc6
Michael Bleigh Add vcr to bundle. 1856639
Michael Bleigh Merge branch 'master' of github.com:intridea/omniauth 6c90dfe
@sferik sferik Revert "Add vcr to bundle."
This reverts commit 1856639 because it
vcr was already specified as a development dependency in
496acc6.
5203ccd
Commits on Jul 23, 2011
@boyvanamstel boyvanamstel Fixed a type.. crendentails should be credentials on the omniauth hash' e478aec
@sferik sferik Merge pull request #408 from boyvanamstel/google-hybrid
Fixed a typo.. crendentails should be credentials on the omniauth hash
de088f9
Commits on Jul 25, 2011
AlexanderPavlenko fix needless access token refreshing in vkontakte strategy e9aab55
AlexanderPavlenko fix undefined method 'length' for OAuth2::Response error 51a41a0
AlexanderPavlenko pass usefull options 55aebec
@sferik sferik Merge pull request #410 from AlexanderPavlenko/fix-instant-token-expi…
…ring

Some fixes to the Vkontakte strategy
a234d03
@viking viking Remove use of stringify_keys 609bc7d
Commits on Jul 26, 2011
@antonlitvinenko antonlitvinenko by default should use https protocol for loading data to fill in user…
…_hash. HTTP and HTTPS are considered to be different scopes by Google API
db3c4d4
@sferik sferik Merge pull request #412 from antonlitvinenko/patch-2
by default should use https protocol for loading data for user_hash
387caf4
Commits on Jul 27, 2011
@sferik sferik Use SSL-enabled build status image to avoid proxy caching fde619f
@sferik sferik Add section on Supported Rubies c343e35
@sferik sferik Remove stray debugging output 3a84460
@sferik sferik Remove JRuby support 1c6f9f1
@sferik sferik Remove MRI 1.9.3 ec6230a
Commits on Jul 28, 2011
@whilefalse whilefalse Maintain query string parameters in test mode a20c0a9
@boyvanamstel boyvanamstel Changed the Hyves OAuth strategy to allow options to be set for the '…
…request

token' stage.

By adding options you can customize the methods (scope)
and duration of the authorization:
:hyves, 'token', 'secret', :methods => 'users.get,friends.get',
:expirationtype => 'infinite'

More:
http://www.hyves-developers.nl/documentation/data-api/methods/2.0/auth.requesttoken
a0733e8
@sferik sferik Merge pull request #414 from boyvanamstel/hyves
Changed the Hyves OAuth strategy to allow options to be set
662af27
Commits on Jul 29, 2011
@mbleigh mbleigh Update oauth2 dependency to 0.5.0 5972c94
Commits on Aug 03, 2011
@nekodex nekodex Updated SoundCloud strategy to use OAuth2. 8b35183
@nekodex nekodex Fixed incorrect OAuth2 header for SoundCloud. cfd3852
@nekodex nekodex Whoops, typo! 91ea109
@sferik sferik Merge pull request #416 from nekodex/master
Update SoundCloud strategy to use OAuth2
bc9376f
@tomtaylor tomtaylor Added Flickr OAuth provider. 68e5313
@tomtaylor tomtaylor Added Flickr OAuth provider. 050532a
@tomtaylor tomtaylor Merge branch 'master' of github.com:tomtaylor/omniauth c607a4f
@tomtaylor tomtaylor Removing deprecated Flickr strategy. 7d74c0b
@sferik sferik Merge pull request #417 from tomtaylor/master
Added Flickr OAuth provider
8eea87a
@sferik sferik Alphabetize strategies e38a450
Commits on Aug 05, 2011
@sferik sferik Test against Rubinius
Happy Rubinius Day!
26fb41d
Commits on Aug 06, 2011
@sferik sferik Add link to REE [ci skip] 02acb10
@sferik sferik Add official support for Rubinius [ci skip]
Happy Rubinius Day!
5aaa1ae
Commits on Aug 08, 2011
@sferik sferik Revert "Remove JRuby support"
This reverts commit 1c6f9f1.
a6b3ce9
Commits on Aug 10, 2011
@antonlitvinenko antonlitvinenko parse user uid and email into user_info hash d565ba0
@jerryluk jerryluk merge with upstream/master 7aba36d
@sferik sferik Merge pull request #342 from jerryluk/master
Added Google OAuth2 Strategy
8c26354
@jerryluk jerryluk Updated request_phase to use auth_code b48938e
@jerryluk jerryluk Changes for updated OAuth2 gem cec78fe
Commits on Aug 11, 2011
@sferik sferik Merge pull request #422 from jerryluk/master
Updated code to works with the latest OAuth2 gem
639dcf0
@thomaswitt thomaswitt Request less permissions for authenticating users
The m8 scope asks the user to give permission to the whole contacts directory, which is quite exaggerated as a default for authenticating a user.

Google describes in http://sites.google.com/site/oauthgoog/Home/emaildisplayscope a better way just to retrieve the email address of the user.
cd5e038
@sferik sferik Merge pull request #424 from thomaswitt/master
Request less permissions for authenticating users via Google OAuth2
ef86298
Commits on Aug 12, 2011
@chrispeterson chrispeterson first commit of Liveid 465a55d
@chrispeterson chrispeterson 2nd commit of Liveid a464240
@chrispeterson chrispeterson 2nd commit of Liveid 4d93540
@chrispeterson chrispeterson comment out authorization_code c5b548d
@chrispeterson chrispeterson switch back to oauth2 0e5b13d
@chrispeterson chrispeterson add callback back b820d53
@chrispeterson chrispeterson add callback back c703ff3
@chrispeterson chrispeterson add callback back 073c818
@chrispeterson chrispeterson add callback back d19ecac
@chrispeterson chrispeterson add callback back 299d1e3
@chrispeterson chrispeterson add callback back 2d5ec62
@chrispeterson chrispeterson add callback back 5e40e15
@chrispeterson chrispeterson add callback back ee74a2b
@chrispeterson chrispeterson add callback back 73ced0f
@chrispeterson chrispeterson add callback back b26ea3b
@chrispeterson chrispeterson add callback back c9eb904
@chrispeterson chrispeterson add callback back 31e2b5a
@chrispeterson chrispeterson add callback back a8a21a7
@chrispeterson chrispeterson add callback back 8df85d0
@chrispeterson chrispeterson add callback back bd0b825
@chrispeterson chrispeterson add callback back 07b40f6
@chrispeterson chrispeterson update authhash aa6a183
@chrispeterson chrispeterson update authhash d27da84
@chrispeterson chrispeterson update authhash 6646668
@chrispeterson chrispeterson update authhash 575eff4
@chrispeterson chrispeterson update authhash 1ec1ae2
@chrispeterson chrispeterson update authhash a14fc5c
@chrispeterson chrispeterson update authhash 59e928c
@chrispeterson chrispeterson update authhash 1d4003f
@chrispeterson chrispeterson update authhash 9a4490a
@chrispeterson chrispeterson update authhash 7470535
@chrispeterson chrispeterson update authhash 6111e4f
@chrispeterson chrispeterson update authhash bcadd3e
@chrispeterson chrispeterson update authhash 1c7ae86
@chrispeterson chrispeterson update authhash 1677ed8
@chrispeterson chrispeterson update authhash ae198a5
@chrispeterson chrispeterson update authhash 44cf481
@chrispeterson chrispeterson update authhash 6f60459
@chrispeterson chrispeterson update authhash 74bdddb
@chrispeterson chrispeterson update authhash e5cfd57
@chrispeterson chrispeterson update authhash 3ed8174
@chrispeterson chrispeterson added new liveid strategy 2953474
@chrispeterson chrispeterson moved lived oauth autoload line up to proper spot 34450eb
@sferik sferik Remove ZenTest 17d5ce6
@chrispeterson chrispeterson moved lived oauth autoload line up to proper alpha order 37129a0
@sferik sferik Merge pull request #425 from chrispeterson/liveid_addition
Liveid addition
7e6f75d
@sferik sferik Fix typo in spec 92dae19
@bdotdub bdotdub Update Instagram strategy for OAuth2 0.5.0 gem
* Specify the mode and set the token param
fb54f98
@sferik sferik Merge pull request #426 from bdotdub/master
Update Instagram strategy to be compatible with new OAuth2 gem
de55bff
Commits on Aug 13, 2011
@leshill leshill Return :service_unavailable if SSL fails 80afc64
@sferik sferik Add anchors [ci skip] 4bc2298
@sferik sferik Merge pull request #427 from leshill/ssl_error
Return :service_unavailable if SSL fails
181931c
Commits on Aug 14, 2011
@leshill leshill Respond with :service_unavailable to SSL errors
- covers both request and callback phase
886186c
@sferik sferik Merge pull request #429 from leshill/ssl_error_request
Respond with :service_unavailable to SSL errors
78f106b
Commits on Aug 15, 2011
@felipecsl felipecsl Fixed foursquare strategy to use correct apiv2 url e1ce3fd
@sferik sferik Merge pull request #430 from felipecsl/master
Fix for foursquare strategy
3b6d283
@sferik sferik Update gemspec [ci skip] 869a7b4
@sferik sferik Update webmock dependency to version 1.7.0 b1d5182
Commits on Aug 18, 2011
@GuillauG GuillauG added Viadeo through OAuth2.0 224a733
@sferik sferik Merge pull request #432 from GuillauG/master
Viadeo added as a provider
753eb5f
Commits on Aug 19, 2011
@sferik sferik Switch up Markdown syntax for headers [ci skip] c6e8f8a
Commits on Aug 21, 2011
@sferik sferik Replace maruku with rdiscount for Markdown library 7861fe3
Commits on Aug 23, 2011
Stafford Brooke [#17145261] Added Mailchimp OAuth2 Strategy 8fb14e2
stranbird fix tsina strategy bug 2745fa6
@sferik sferik Merge pull request #435 from stranbird/master
fix a tsina session keys bug
f5c6834
Stafford Brooke ordering fix bf21d8b
@nowa nowa Mod: change TaoBao to Taobao
Fix: sort error in generate_sign
43290f9
@nowa nowa Add email to user hash for t163 0613246
@sferik sferik Merge pull request #436 from nowa/master
Bug fix for taobao oauth login
72a93c5
@sferik sferik Merge pull request #439 from srbiv/master
Added a OAuth2 strategy for Mailchimp
2ef1613
@sferik sferik Merge pull request #438 from iammuneeb/patch-1
Removed repetition of word 'that' from description
d608b21
Commits on Aug 24, 2011
@iammuneeb iammuneeb Removed repetition of word 'that' from description 60b7689
@fxposter fxposter typo fixes 57c3967
@sferik sferik Merge pull request #440 from fxposter/typo_fixes
Small typo fixes
51f7611
@joshuaxls joshuaxls Add AngelList OAuth2 Strategy 047984b
@sferik sferik Merge pull request #443 from joshuaxls/master
Added OAuth2 Strategy for AngelList
7e7478c
Commits on Aug 27, 2011
@sferik sferik Make Rakefile executable 59f048f
@sailavu sailavu Salesforce provides additional fields namely issued_at & signature th…
…at are to be returned. access_token post authorization is always perishable. Hence the need to obtain refresh_token.
4e4c361
Commits on Aug 29, 2011
@sferik sferik Merge pull request #444 from sailavu/master
Add additional fields to Salesforce strategy.
b8041a8
@sferik sferik Update multi_xml dependency to version 0.3.0 abe1d1c
@raecoo raecoo adds SAML strategy 3079ffc
@raecoo raecoo renew the test codes e8de4f2
@mbleigh mbleigh Merge pull request #445 from raecoo/master
Add SAML strategy
54a73ca
Commits on Aug 30, 2011
@marcbey marcbey fixes bug with empty open_id identifier from form field 0203ece
@joefiorini joefiorini Use `base` from options if it's passed in 2a0e430
@sferik sferik Merge pull request #448 from joefiorini/patch-1
Use `base` from options if it's passed in
90fc42c
@sferik sferik Merge pull request #447 from marcbey/master
Fixes a bug with empty open_id identifier from form field fixed
4bc762d
Commits on Sep 01, 2011
@sferik sferik Update CI image URL [ci skip] d10c96b
Jeffrey Jones Fix Instagram OAuth2 spec to test Instagram instead of Github dd43c70
@sferik sferik Merge pull request #450 from rurounijones/master
Fix OAuth2 Instragram spec
2a3e8ba
Commits on Sep 02, 2011
@soorajb soorajb Fix for google email scope. fa374ab
@soorajb soorajb Update to google email scope url 6be3bf0
@sferik sferik Merge pull request #452 from soorajb/master
Most Google Oauth2 API not working - Google Email scope fix
d5b1bb6
Commits on Sep 03, 2011
@sferik sferik Merge pull request #420 from antonlitvinenko/patch-3
(Dropbox oauth strategy) parse user uid and email into user_info hash
95802bf
@sferik sferik Merge pull request #413 from whilefalse/master
Maintain query string parameters in test mode.
43ef8d9
@mbleigh mbleigh Merge pull request #411 from viking/remove-stringify-keys-use
Remove use of stringify_keys in OmniAuth::Configuration#add_mock
e015844
Commits on Sep 10, 2011
@bruno bruno Replacing Yammer OAuth with the new OAuth2 0aa9452
Commits on Sep 11, 2011
@soorajb soorajb Fixed the missing space for google email scope 2bfb889
@sferik sferik Merge pull request #463 from roadly/0-3-stable
Replacing Yammer OAuth with the new OAuth2
a9598ee
Commits on Sep 15, 2011
@gruen gruen Fixed Goodreads strategy to work. (MultiXml returns a hash.) 4e75459
@gruen gruen Fixed typo on method definition. 1512c2c
@gruen gruen fixed method header 510c420
@sferik sferik Update multi_xml dependency to version 0.4.0 9137efd
@sferik sferik Fix syntax error on Ruby 1.8 e22e77d
Commits on Sep 22, 2011
@mbleigh mbleigh Merge pull request #473 from gruen/0-3-stable
0 3 stable
48d4d71
@mbleigh mbleigh Merge pull request #468 from soorajb/master
Fix for missing space in google email scope (issue #467)
d0f1e72
@mbleigh mbleigh Switch twitter back to /authenticate, Closes #466, Closes #478 58d5e14
@mbleigh mbleigh Fix Twitter spec. How did that default get flipped anyway? cc3391b
@mbleigh mbleigh Bump version to 0.3.0 bf02226