ncs_navigator_authority 1.0.0 → 1.1.0

data/buildfile

@@ -3,5 +3,5 @@ require 'buildr-gemjar'
 
 define 'ncs_navigator_authority_gems' do
   project.version = '1.0.0'
-  package(:gemjar).with_gem(:file => _('ncs_navigator_authority-1.0.0.gem')).with_gem('jruby-ossl', '0.7.5')
+  package(:gemjar).with_gem(:file => _('ncs_navigator_authority-1.0.0.gem')).with_gem('jruby-openssl', '0.7.5')
 end

data/lib/ncs_navigator/authorization/core/authority.rb

@@ -2,6 +2,7 @@ require 'ncs_navigator/configuration'
 module NcsNavigator::Authorization::Core
   class Authority
     def initialize(ignored_config=nil)
+      @logger = Logger.new("ncs_navigator_authority_core.log")
       @groups = {}
       @portal = :NCSNavigator
     end
@@ -11,7 +12,7 @@ module NcsNavigator::Authorization::Core
       return user unless base
       user.merge!(base)
     end
-    
+
     def user(user)
       staff = get_staff(user)
       if staff
@@ -28,7 +29,7 @@ module NcsNavigator::Authorization::Core
         groups = staff['roles'].collect do |role|
           role['name']
         end
-      
+
         if groups
           u.group_memberships(@portal).concat(load_group_memberships(@portal, groups))
         end
@@ -37,25 +38,44 @@ module NcsNavigator::Authorization::Core
         nil
       end
     end
-    
-    private 
-    
+
+    def find_users(*criteria)
+      return [] unless criteria.empty?
+      result = []
+      if users = get_users
+        users.each do |u|
+          au = Aker::User.new(u["username"])
+          au.identifiers[:staff_id] = u["staff_id"]
+          au.first_name = u["first_name"]
+          au.last_name  = u["last_name"]
+          result << au
+        end
+      end
+      result
+    end
+
+    private
+
     def staff_portal_uri
       NcsNavigator.configuration.staff_portal_uri
     end
-    
+
     def get_connection(user)
       connection = staff_portal_client(user).connection
     end
-    
-    def staff_portal_client(user)
+
+    def staff_portal_client(user = nil)
       NcsNavigator::Authorization::StaffPortal::Client.new(staff_portal_uri, :authenticator => create_authenticator(user))
     end
-    
-    def create_authenticator(user)
+
+    def create_authenticator(user = nil)
+      if user
         { :token => lambda { user.cas_proxy_ticket(staff_portal_uri) } }
+      else
+        { :basic => ["psc_application", NcsNavigator.configuration.staff_portal['psc_user_password']] }
+      end
     end
-    
+
     def load_group_memberships(portal, group_data)
       group_data.collect do |group|
         Aker::GroupMembership.new(find_or_create_group(portal, group))
@@ -66,11 +86,11 @@ module NcsNavigator::Authorization::Core
       existing = (@groups[portal] ||= []).collect { |top|
         top.find { |g| g.name == group_name }
       }.compact.first
-      return existing if existing      
+      return existing if existing
       @groups[portal] << Aker::Group.new(group_name)
       @groups[portal].last
     end
-    
+
     def get_staff(user)
       connection = get_connection(user)
       response = connection.get '/staff/' << user.username << '.json'
@@ -80,5 +100,20 @@ module NcsNavigator::Authorization::Core
         nil
       end
     end
+
+    def get_users
+      users = nil
+      begin
+        response = staff_portal_client.connection.get('/users.json')
+        if response.status == 200
+          users = response.body
+        else
+          @logger.warn("#{Time.now}: Staff Portal Response: #{response.body}")
+        end
+      rescue => e
+        @logger.error("#{Time.now} : Staff Portal: #{e.class} #{e}")
+      end
+      users
+   end
   end
 end

data/lib/ncs_navigator/authorization/psc/authority.rb

@@ -3,8 +3,8 @@ require 'logger'
 module NcsNavigator::Authorization::Psc
   class Authority
     def initialize(ignored_config=nil)
-      @staff_portal_connection ||= staff_portal_client.connection
       @logger = Logger.new("#{Java::JavaLang::System.getProperty('catalina.base')}/logs/ncs_navigator_authority.log")
+      @staff_portal_connection ||= staff_portal_client.connection
     end
     
     def get_user_by_username(username, role_detail_level)
@@ -69,7 +69,8 @@ module NcsNavigator::Authorization::Psc
     
       def staff_portal_client
         NcsNavigator::Authorization::StaffPortal::Client.new(NcsNavigator.configuration.staff_portal_uri, 
-        :authenticator => create_authenticator)
+        :authenticator => create_authenticator, 
+        :ssl => {:ca_file => NcsNavigator.configuration.psc['ssl_ca_file']}.tap{|a| @logger.info("#{a.inspect}")})
       end
     
       def create_authenticator
@@ -82,11 +83,12 @@ module NcsNavigator::Authorization::Psc
           response = @staff_portal_connection.get url
           if response.status == 200
             staff = response.body
+            @logger.info("#{Time.now}: Staff Portal Response: Successful connection")
           else            
             @logger.warn("#{Time.now}: Staff Portal Response: #{response.body}")
           end
         rescue => e
-          @logger.error("#{Time.now} : Staff Portal: #{e.class} #{e.backtrace.join("\n")}")
+          @logger.error("#{Time.now} : Staff Portal: #{e} #{e.class}")
         end
         staff
       end

data/lib/ncs_navigator/authorization/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
-  class Authorization
-    VERSION = '1.0.0'
+  module Authorization
+    VERSION = '1.1.0'
   end
 end

data/spec/fixtures/vcr_cassettes/staff_portal/psc/users_with_null_username.yml

@@ -0,0 +1,34 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://psc_application:psc_application@staffportal.local/users.json?role%5B%5D=Field%20Staff&role%5B%5D=Phone%20Staff
+    body: 
+    headers: 
+      authorization: 
+      - Basic cHNjX2FwcGxpY2F0aW9uOnBzY19hcHBsaWNhdGlvbg==
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-ua-compatible: 
+      - IE=Edge
+      etag: 
+      - "\"59c92e159922355929ebc5d1e6250f07\""
+      content-type: 
+      - application/json; charset=utf-8
+      x-runtime: 
+      - "0.163889"
+      server: 
+      - WEBrick/1.3.1 (Ruby/1.8.7/2011-02-18)
+      date: 
+      - Tue, 06 Mar 2012 19:28:46 GMT
+      content-length: 
+      - "1005"
+      set-cookie: 
+      - _OMA_session=BAh7ByIZYWtlci5sYXN0X3JlcXVlc3RfYXRsKwduZVZPIg9zZXNzaW9uX2lkIiU0YzBmZWYxMzU3NDljYmI0OTRhMTg1Nzg4ZTc1YzFkMg%3D%3D--74de3cd65976130dd9df4118f7ba156d94661db8; path=/; HttpOnly
+      cache-control: 
+      - max-age=0, private, must-revalidate
+    body: "[{\"notify\":true,\"study_center\":20000029,\"ncs_inactive_date\":null,\"staff_type_other\":null,\"roles\":[{\"name\":\"Field Staff\"},{\"name\":\"Outreach Staff\"}],\"ethnicity\":null,\"staff_id\":\"5de404f5-9c37-4d92-8f2a-30041400ba06\",\"zipcode\":null,\"numeric_id\":1885042269,\"race_other\":null,\"username\":null,\"gender\":null,\"external\":false,\"staff_type\":null,\"languages\":[],\"last_name\":\"Palbo\",\"subcontractor\":null,\"race\":null,\"experience\":null,\"email\":\"nolan_palbo@test.com\",\"first_name\":\"Nolan\",\"ncs_active_date\":null},{\"notify\":true,\"study_center\":20000029,\"ncs_inactive_date\":null,\"staff_type_other\":null,\"roles\":[{\"name\":\"Field Staff\"},{\"name\":\"Phone Staff\"},{\"name\":\"System Administrator\"},{\"name\":\"User Administrator\"},{\"name\":\"Staff Supervisor\"},{\"name\":\"Biological Specimen Collector\"}],\"ethnicity\":null,\"staff_id\":\"16912345-ba05-481d-aa80-96e71e1ac9d9\",\"zipcode\":null,\"numeric_id\":960833693,\"race_other\":null,\"username\":\"testuser\",\"gender\":null,\"external\":false,\"staff_type\":null,\"languages\":[],\"last_name\":\"Grant\",\"subcontractor\":null,\"race\":null,\"experience\":null,\"email\":\"perry_grant@test.com\",\"first_name\":\"Perry\",\"ncs_active_date\":null}]"
+    http_version: "1.1"

data/spec/ncs_navigator/authorization/core/authority_spec.rb

@@ -4,47 +4,63 @@ require 'vcr'
 require 'faraday'
 require 'faraday_stack'
 describe NcsNavigator::Authorization::Core::Authority do
- 
+
   before do
     @ncs_navigator_authority = NcsNavigator::Authorization::Core::Authority.new
     @user = mock(:username => "lee", :cas_proxy_ticket => "PT-cas-ticket")
   end
-  
+
   describe "user" do
     before do
       VCR.use_cassette('staff_portal/core/user') do
         @return_user = @ncs_navigator_authority.user(@user)
       end
     end
-    
+
     it "copies first name from staff portal user" do
       @return_user.first_name.should == "Lee"
     end
-    
+
     it "copies last name from staff portal user" do
       @return_user.last_name.should == "Peterson"
     end
-    
+
     it "copies email from staff portal user" do
       @return_user.email.should == "lee@test.com"
     end
-    
+
     it "copies staff_id as identifiers from staff portal staff_id" do
       @return_user.identifiers[:staff_id].should == "test_staff_id"
     end
-    
+
     it "generate group membership from staff role" do
       @return_user.group_memberships(:NCSNavigator).include?("Staff Supervisor").should be_true
     end
   end
-  
-  
+
+  describe "find_users" do
+    it "returns all the users" do
+      VCR.use_cassette('staff_portal/psc/all_users') do
+        users = @ncs_navigator_authority.find_users
+        users.count.should == 6
+      end
+    end
+
+    it "returns and empty array if passed criteria" do
+      VCR.use_cassette('staff_portal/psc/all_users') do
+        users = @ncs_navigator_authority.find_users({"a" => "b"})
+        users.should be_empty
+      end
+    end
+  end
+
+
   describe "#amplify!" do
     before do
       @lee = mock(Aker::User, :username => "lee", :cas_proxy_ticket => "PT-cas-ticket",:first_name => "Lee", :portals => [:NCSNavigator])
       @before_lee = mock(Aker::User, :username => "lee", :cas_proxy_ticket => "PT-cas-ticket", :merge! => @lee)
     end
-  
+
     def actual
       VCR.use_cassette('staff_portal/core/user') do
         @ncs_navigator_authority.amplify!(@before_lee)
@@ -54,16 +70,16 @@ describe NcsNavigator::Authorization::Core::Authority do
     it "copies simple attributes" do
       actual.first_name.should == "Lee"
     end
-    
+
     it "copies portal" do
       actual.portals.should == [:NCSNavigator]
     end
-    
+
     it "does nothing for an unknown user" do
       VCR.use_cassette('staff_portal/core/unknown_user') do
         lambda { @ncs_navigator_authority.amplify!(mock(Aker::User, :username => "lees", :cas_proxy_ticket => "PT-cas-ticket"))}.should_not raise_error
       end
     end
   end
-  
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ncs_navigator_authority
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jalpa Patel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-06 00:00:00 -05:00
+date: 2012-11-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -185,6 +185,7 @@ files:
 - spec/fixtures/vcr_cassettes/staff_portal/psc/users_by_last_or_user_name.yml
 - spec/fixtures/vcr_cassettes/staff_portal/psc/users_by_role.yml
 - spec/fixtures/vcr_cassettes/staff_portal/psc/users_by_username.yml
+- spec/fixtures/vcr_cassettes/staff_portal/psc/users_with_null_username.yml
 - spec/navigator.ini
 - spec/ncs_navigator/.DS_Store
 - spec/ncs_navigator/authorization/core/authority_spec.rb
@@ -246,6 +247,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/staff_portal/psc/users_by_last_or_user_name.yml
 - spec/fixtures/vcr_cassettes/staff_portal/psc/users_by_role.yml
 - spec/fixtures/vcr_cassettes/staff_portal/psc/users_by_username.yml
+- spec/fixtures/vcr_cassettes/staff_portal/psc/users_with_null_username.yml
 - spec/navigator.ini
 - spec/ncs_navigator/.DS_Store
 - spec/ncs_navigator/authorization/core/authority_spec.rb