devise_oauth2_rails4 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22427ed5ab66d9da651871d64af020f2a2affca6
-  data.tar.gz: 8fe7f6f4779876ea2ea872040d53d27ade881cd2
+  metadata.gz: ad0e15ec79488248298982fcf833bd85b03358d5
+  data.tar.gz: b26a39c3065e052a1fe782d33237347d1ca6e320
 SHA512:
-  metadata.gz: 183c1aafe6a395f8b32468aeb846da3d5dccee9697afbcb8fa35513cbc6a16a036272815ac37b9199263eb5eeec7431e21ffc79891c7ad594bb44ebb47a8093d
-  data.tar.gz: 98847d55f11d8af140b03132ed5e780cffc370208f8c8a11479852c8bf1d0b4e5d1c4844e33d7bee83f3e659b11da8ed6794cca2b0d288da91747ba3555d0b51
+  metadata.gz: 62ccff4b3461bf7592b9915a7a81e9d12b14f8520514b2053bfbf943afaface7225d4f86e1d526133d396ae5e26e693a52e3e9a669aeaea65490b380e038accb
+  data.tar.gz: 84dd9b90a0d08724d437e136f5eda3cc4ec4a07c34610ba4cc63968bba91c3426fa7dda2bebabbbedb110c215970ee5c02da99663f75528765829976c754e395

data/app/controllers/devise/oauth2/authorization.rb

@@ -0,0 +1,58 @@
+module Devise
+  module Oauth2
+    module Authorization
+      extend ActiveSupport::Concern
+
+      def current_oauth2_client(opts: { secure: false })
+        return @secure_client ||= Client.find_by(secret: client_secret) if opts[:secure]
+        return @secure_client ||= Client.find_by(id: current_access_token.client_id) if access_token?
+        @client ||= Client.find_by('identifier = :client_id OR secret = :secret', client_id: client_id, secret: client_secret) if client_credentials?
+      end
+
+      def current_access_token
+        @access_token ||= AccessToken.find_by(token: access_token)
+      end
+
+      def oauth2_client_signed_in?
+        !!@client
+      end
+
+      def access_token_signed_in?
+        !!@access_token
+      end
+
+      def client_credentials
+        client_id? || client_secret?
+      end
+
+      def client_credentials?
+        !!client_credentials
+      end
+
+      def client_secret
+        params[:client_secret]
+      end
+
+      def client_secret?
+        !!client_secret
+      end
+
+      def client_id
+        params[:client_id]
+      end
+
+      def client_id?
+        !!params[:client_id]
+      end
+
+      def access_token
+        params[:access_token]
+      end
+
+      def access_token?
+        !!access_token
+      end
+
+    end
+  end
+end

data/lib/devise/oauth2/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_oauth2_rails4
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brian Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,6 +166,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/devise/oauth2/authorization.rb
 - app/controllers/devise/oauth2/authorizations_controller.rb
 - app/controllers/devise/oauth2/tokens_controller.rb
 - app/helpers/permissions_helper.rb