omniauth-campus 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3aa81608d9b3c20dc330d44527514599be2b277
-  data.tar.gz: f8e064edb636380b1d78f3db39decb0cb9291d98
+  metadata.gz: d00cd74f2e4f1cae1641edb762e6b6675b29ca0c
+  data.tar.gz: a0a2c5f993ac89da38f95f458b5f7854740cc182
 SHA512:
-  metadata.gz: bcb4a60e86eefa0b67a36bd7056b308200ce7f5ca81aea5605c3f865e33035c50777c26139775e18b7175d2bfd04ecdcca203a35fea5c635df470a0f980701a0
-  data.tar.gz: 9a4b12ff47b39bb095dec374bf2149543125f2f19f8ce7873f211342f7dc38cfbb9a6640ba7c64ca209a60f53c100bc4d0e2549b55eeaf40d682b002e5533995
+  metadata.gz: e95c82905a7f147fef5a8a6a3541c1e35f5c545a8556435bcb0f04a03aad285a0bcfb916b51414a982d156e2f4bad88dd1e2401d82174e1647404c700eafa2e9
+  data.tar.gz: f4de3092941d1925baa4c5907977f1771923824634e93c4cf1d1b50fd4f57764640c802868819ef0ba70f9f160483514b37d147c2cea058c4c4487b82b3df1a4

data/lib/omniauth-campus/version.rb

@@ -1,6 +1,6 @@
 module Omniauth
   module Campus
-    VERSION = "0.4.8"
+    VERSION = "0.4.9"
   end
 end
 

data/lib/omniauth/strategies/campus.rb

@@ -25,7 +25,7 @@ module OmniAuth
             access_token_path: '/oauth/access_token',
             authorize_path: '/oauth/authorize',
             request_token_path: '/oauth/request_token',
-            site: 'http://vistacampus.org'
+            site: 'https://vistacampus.org'
         }
 
         option :fields, [:name, :email]
@@ -40,11 +40,27 @@ module OmniAuth
 #
 #        }
         #
-     def request_phase
-        options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
-        super
-      end
+        def request_phase
+        %w[force_login lang screen_name].each do |v|
+          if request.params[v]
+            options[:authorize_params][v.to_sym] = request.params[v]
+          end
+        end
+
+        %w[x_auth_access_type].each do |v|
+          if request.params[v]
+            options[:request_params][v.to_sym] = request.params[v]
+          end
+        end
 
+        if request.params['use_authorize'] == 'true'
+          options[:client_options][:authorize_path] = '/oauth/authorize'
+        else
+          options[:client_options][:authorize_path] = '/oauth/authenticate'
+        end
+
+        old_request_phase
+      end
         uid {raw_info['uid']}
 
         info do {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-campus
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - johnvehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler