omniauth-campus 8.1 → 8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7535266f6d61b2ff5f49d9608604a7f208aedef
-  data.tar.gz: 6031b936cc8b61c508b9218c3b7b62109ac89e34
+  metadata.gz: fb0354acf5eecfcd3dabb3ae09105085d0c15dfe
+  data.tar.gz: 9e6e17f9ad79cb602eac5aa726b0d64d4ecec0ab
 SHA512:
-  metadata.gz: ec8ec95a219e35e68b3b8dfb804e700daa716bbacea766a0c900473737749f3beede674e245da9ac2c8885fbc1dc01e409fe2929717554a405cc582aeef79fb0
-  data.tar.gz: 7722d28de687f7d214a336f1879fe3430f0b5793c3e913e5404a714a3e5fbe39402a4d98a3a479135b850b78b0e3c8c54b41708baeeb6fda38094cf7cd0a7d07
+  metadata.gz: 2be70ab32188a2129d1746c549936fd5b4a1ae31f102137d25f8850a9ec13d82a718b60e3d575e691e88a8032f100c9df8b2cc060b99d3beb71b062f9d36143d
+  data.tar.gz: 2e7793472eab1bcb522e39b136ccf340133eefa410beeaef31a3721d9723e77b9a987248e7ab988e7e8045c9600136e1e91d7fb816c583c819e32f4381bc94b6

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "8.1"
+    VERSION = "8.2"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -1,29 +1,41 @@
-require 'omniauth-oauth'
-require 'multi_json'
 
 module OmniAuth
   module Strategies
-    class Campus < OmniAuth::Strategies::OAuth
-      option :name, :campus
+    class Password
+      include OmniAuth::Strategy
 
-      option :client_options, {
-          :site => "http://community3dev.devcloud.acquia-sites.com/api"
-      }
+      option :user_model, nil # default set to 'User' below
+      option :login_field, :email
 
-      uid do
-        raw_info[0]['uid']
+      def request_phase
+        redirect "/session/new"
       end
 
-      info do
-        {
-            :name => raw_info[0]['users_name'],
-            :email => raw_info[0]['users_mail']
-        }
+      def callback_phase
+        return fail!(:invalid_credentials) unless user.try(:authenticate, password)
+        super
       end
 
-      def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get("http://community3dev.devcloud.acquia-sites.com/api").body)
+      def user
+        @user ||= user_model.send("find_by_#{options[:login_field]}", login)
       end
-  end
+
+      def user_model
+        options[:user_model] || ::User
+      end
+
+      def login
+        request[:sessions][options[:login_field].to_s]
+      end
+
+      def password
+        request[:sessions]['password']
+      end
+
+      uid do
+        user.password_digest
+      end
+
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: '8.1'
+  version: '8.2'
 platform: ruby
 authors:
 - johnvehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler