authlogic-connect 0.0.5 → 0.0.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Rakefile CHANGED
@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
6
6
  spec = Gem::Specification.new do |s|
7
7
  s.name = "authlogic-connect"
8
8
  s.author = "Lance Pollard"
9
- s.version = "0.0.5"
9
+ s.version = "0.0.5.1"
10
10
  s.summary = "Authlogic Connect: Oauth and OpenID made dead simple"
11
11
  s.homepage = "http://github.com/viatropos/authlogic-connect"
12
12
  s.email = "lancejpollard@gmail.com"
@@ -29,10 +29,8 @@ end
29
29
  # Rails 3beta4 backport
30
30
  if defined?(ActiveSupport::HashWithIndifferentAccess)
31
31
  ActiveSupport::HashWithIndifferentAccess.class_eval do
32
- unless defined?(:symbolize_keys!)
33
- def symbolize_keys!
34
- symbolize_keys
35
- end
32
+ def symbolize_keys!
33
+ symbolize_keys
36
34
  end
37
35
  end
38
36
  end
@@ -1,5 +1,7 @@
1
1
  class GithubToken < OauthToken
2
2
 
3
+ version 2
4
+
3
5
  key do |access_token|
4
6
  user = JSON.parse(access_token.get("/api/v2/json/user/show"))
5
7
  user["id"]
@@ -50,8 +50,10 @@ module AuthlogicConnect::Oauth::User
50
50
  # it is called by the validation chain.
51
51
  def complete_oauth_transaction
52
52
  token = token_class.new(oauth_token_and_secret)
53
+ old_token = token_class.find_by_key_or_token(token.key, token.token)
54
+ token = old_token if old_token
53
55
 
54
- if has_token?(oauth_provider) || token_class.find_by_key_or_token(token.key, token.token)
56
+ if has_token?(oauth_provider)
55
57
  self.errors.add(:tokens, "you have already created an account using your #{token_class.service_name} account, so it")
56
58
  else
57
59
  self.access_tokens << token
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: authlogic-connect
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 89
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
9
  - 5
10
- version: 0.0.5
10
+ - 1
11
+ version: 0.0.5.1
11
12
  platform: ruby
12
13
  authors:
13
14
  - Lance Pollard