openam_auth 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc60c0f8f563389a4986b738a0cb1d4c7a0c9d67
-  data.tar.gz: 60ad9c40f97b78b656610bb7a1408c534f8546fe
+  metadata.gz: 0913734338ee45a826e3d2b8b2d060c405532105
+  data.tar.gz: 79dbfc448da870664023029b11fbe2413b69ee7c
 SHA512:
-  metadata.gz: 3365ce33d3deb11202f0f3ef7e4eeccc599d437ff849e09f91c4fa7ef5c8ac4883b0c90904b635d9cb2f9f2a8dd99c50c9682808a27a0467741e9782cc2f2185
-  data.tar.gz: 2d8f06fd82e83e2aef8d8f0ee73d04e3810f0a7ce4486875db4e460357f17e2beecaf0c05436dbc831c693e6e157480b70d30c80f5179661c83d69c9369e7802
+  metadata.gz: 3504d9e01a6a22a669dc5c00b0d9d4a73230a489893fce6f89f34726e328ef2a58dd87398f071048f4aad387a16e99b4a6c5ddb3fc788a6540d992815c619a4d
+  data.tar.gz: 1a92e5e78da602b5f8147354833540c53a0105dfa11483e465768ff6175982e7e8ac86b64cf7d05ef5bcaf7a2b477e0cca89deeccc8753ef61a613b337379295

data/lib/openam_auth/authenticate.rb

@@ -1,45 +1,48 @@
 module OpenamAuth
   module Authenticate
-    module ClassMethods ; end
-
-    module InstanceMethods
-
-      def authenticate_user!
-        status = false
-        openam = OpenamAuth::Openam.new
-        cookie_name = openam.cookie_name
-        token = openam.token_cookie(request, cookie_name)
-
-        #The following class  method shold be implemented by the parent application
-        user = User.existing_user_by_token(token) if token
-
-        unless user
-          if openam.valid_token?(token)
-            response = openam.openam_user(cookie_name, token)
-            user_hash = openam.user_hash(response.body)
-            #following class method should be implemented by the parent application
-            user = User.update_openam_user(token, user_hash)
-          end
-        end
-        if user
-          session[:user_id] = user.id
-          status = true
-        end
-        status ? true : (redirect_to openam.login_url)
-      end
+    attr_accessor :openam_instance
+    extend ActiveSupport::Concern
+
+    def authenticate_user!
+      user ||= User.update_openam_user(token, user_hash) if openam.valid_token?(token)
+
+      session[:user_id] = user.id if user
+
+      !!session[:user_id] || redirect_to(openam.login_url)
     end
 
-    def openam_logout(token)
-      OpenamAuth::Openam.new.logout(token)
+    private
+    def openam
+      @openam_instance ||= OpenamAuth::Openam.new
+      @openam_instance
+    end
+
+    def cookie_name
+      openam.cookie_name
+    end
+
+    def token
+      openam.token_cookie(request, cookie_name)
+    end
+
+    def user
+      User.existing_user_by_token(token)
     end
 
     def current_user
       User.where(id: session[:user_id]).first
     end
 
-    def self.included(receiver)
-      receiver.extend         ClassMethods
-      receiver.send :include, InstanceMethods
+    def user_hash
+      openam.user_hash(openam_response.body)
+    end
+
+    def openam_response
+      openam.openam_user(cookie_name, token)
+    end
+
+    def openam_logout(token)
+      openam.new.logout(token)
     end
   end
 end

data/lib/openam_auth/openam.rb

@@ -57,8 +57,6 @@ module OpenamAuth
       end
       opensso_user
     end
-
-
   end
 end
 

data/lib/openam_auth/version.rb

@@ -1,3 +1,3 @@
 module OpenamAuth
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/openam_auth.rb

@@ -1,3 +1,4 @@
+require 'active_support/concern'
 require "openam_auth/version"
 require "openam_auth/openam"
 require "openam_auth/authenticate"

data/spec/openam_auth_spec.rb

@@ -47,7 +47,7 @@ EOF
         to_return(:status => 200, :body => response, :headers => {})
     end
 
-    it "should return openam user string" do
+    fit "should return openam user string" do
       OpenamAuth::Openam.new.openam_user('iPlanetDirectoryPro',token).to_s.should eq(response)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openam_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - sameera207
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler