oa-pubcookie 0.0.2 → 0.1.0

data/lib/omniauth/pubcookie.rb

@@ -1,4 +1,4 @@
-require 'omniauth/core'
+require 'omniauth'
 
 module OmniAuth
   module Pubcookie

data/lib/omniauth/pubcookie/cmu_ldap.rb

@@ -9,10 +9,6 @@ module OmniAuth
         ldap = Net::LDAP.new :host => 'ldap.andrew.cmu.edu', :port => 389
 
         filter = Net::LDAP::Filter.eq('cmuAndrewID', username)
-        attrs = ['givenName', 'sn', 'nickname', 'eduPersonSchoolCollegeName',
-                 'cmuStudentClass', 'mail', 'cmuPreferredMail',
-                 'cmuPersonPrincipalName']
-
         ldap.search(:base => 'ou=Person,dc=cmu,dc=edu',
                     :filter => filter, :return_result => true) do |entry|
           results = {}

data/lib/omniauth/pubcookie/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Pubcookie
-    VERSION = '0.0.2'
+    VERSION = '0.1.0'
   end
 end

data/lib/omniauth/strategies/cmu.rb

@@ -6,36 +6,51 @@ module OmniAuth
 
       include OmniAuth::Pubcookie::CMULdap
 
-      def pubcookie_options= options
-        options[:login_server] ||= 'webiso.andrew.cmu.edu'
-        options[:granting_cert] ||=
-          File.expand_path('../cmu_granting.cert', __FILE__)
-
-        super
+      option :login_server, 'webiso.andrew.cmu.edu'
+      option :granting_cert, File.expand_path('../cmu_granting.cert', __FILE__)
+      option :name, 'pubcookie' # otherwise it thinks the provider is cmu
+
+      info do
+        {
+          :name       => raw_info[:name],
+          :email      => raw_info[:email],
+          :nickname   => raw_info[:nickname],
+          :first_name => raw_info[:first_name],
+          :last_name  => raw_info[:last_name],
+          :location   => raw_info[:location]
+        }
       end
 
-      def auth_hash username
-        andrew_id = username.match(/^(.*)@/)[1]
-
-        attrs = lookup_andrew_id(andrew_id)
-
-        OmniAuth::Utils.deep_merge(super, {
-          'uid'       => andrew_id,
-          'provider'  => 'cmu',
-          'user_info' => {
-            'name'       => attrs[:cn],
-            'email'      => attrs[:mail],
-            'nickname'   => attrs[:nickname],
-            'first_name' => attrs[:givenname],
-            'last_name'  => attrs[:sn],
-            'class'      => attrs[:cmustudentclass],
-            'department' => attrs[:cmudepartment],
-            'location'   => attrs[:cmucampus]
-          },
-          'extra' => {'user_hash' => attrs}
-        })
+      extra do
+        {
+          :department => raw_info[:department],
+          :class      => raw_info[:class],
+          :raw_info   => raw_info[:ldap_attrs]
+        }
       end
 
+      def raw_info
+        if @raw_info.nil?
+          username  = extract_username(request)
+          andrew_id = username.match(/^(.*)@/)[1]
+          attrs     = lookup_andrew_id andrew_id
+
+          @raw_info = {
+            :username   => andrew_id,
+            :name       => attrs[:cn],
+            :email      => attrs[:mail],
+            :nickname   => attrs[:nickname],
+            :first_name => attrs[:givenname],
+            :last_name  => attrs[:sn],
+            :class      => attrs[:cmustudentclass],
+            :department => attrs[:cmudepartment],
+            :location   => attrs[:cmucampus],
+            :ldap_attrs => attrs
+          }
+        end
+
+        @raw_info
+      end
     end
   end
 end

data/lib/omniauth/strategies/pubcookie.rb

@@ -8,21 +8,26 @@ module OmniAuth
       include OmniAuth::Strategy
       include Rack::Pubcookie::Auth
 
-      def initialize app, options, &block
+      option :return_to, '/auth/pubcookie/callback'
+
+      # Override initialize.  Omniauth frowns on this
+      # but we need to set pubcookie_options on initialize
+      def initialize(app, *args, &block)
+        super(app, *args, &block)
         self.pubcookie_options = options
-        super app, :pubcookie, &block
       end
 
       def request_phase
+        @raw_info = nil
         Rack::Response.new(login_page_html).finish
       end
 
       def callback_phase
-        username = extract_username request
-        request.env['REMOTE_USER'] = username # Part of the pubcookie spec
+        # Part of the pubcookie spec
+        request.env['REMOTE_USER'] = raw_info[:username]
 
-        if username
-          request.env['omniauth.auth'] = auth_hash(username)
+        if raw_info[:username]
+          self.env['omniauth.auth'] = auth_hash # provided by Omniauth now
           request.env['REQUEST_METHOD'] = 'GET'
 
           status, headers, body = call_app!
@@ -37,14 +42,16 @@ module OmniAuth
         end
       end
 
-      def auth_hash username
-        OmniAuth::Utils.deep_merge(super(), {
-          'uid'       => username,
-          'provider'  => 'pubcookie',
-          'user_info' => {'name' => username}
-        })
+      # unique user id
+      uid { raw_info[:username] }
+
+      info do
+        {'name' => raw_info[:username]}
       end
 
+      def raw_info
+        @raw_info ||= {:username => extract_username(request)}
+      end
     end
   end
 end

metadata

@@ -1,73 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oa-pubcookie
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alex Crichton
+- Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-19 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack-pubcookie
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70356016614280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oa-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70356016614280
+- !ruby/object:Gem::Dependency
+  name: omniauth
+  requirement: &70356016613780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-ldap
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70356016613780
+- !ruby/object:Gem::Dependency
+  name: net-ldap
+  requirement: &70356016613400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-description: Omniauth strategy using pubcookie with special additions for CMU students where information is fetched via LDAP
-email: 
+  prerelease: false
+  version_requirements: *70356016613400
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70356016612860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *70356016612860
+description: Omniauth strategy using pubcookie with special additions for CMU students
+  where information is fetched via LDAP
+email:
 - alex@crichton.co
+- stafford.brunk@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/oa-pubcookie.rb
 - lib/omniauth/pubcookie.rb
 - lib/omniauth/pubcookie/cmu_ldap.rb
@@ -75,37 +72,28 @@ files:
 - lib/omniauth/strategies/cmu.rb
 - lib/omniauth/strategies/cmu_granting.cert
 - lib/omniauth/strategies/pubcookie.rb
-has_rdoc: true
 homepage: https://github.com/alexcrichton/oa-pubcookie
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Omniauth strategy using pubcookie
 test_files: []
-