omniauth-zooniverse 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cbae562cb3a069e0e5a3ac4a583d6554cf61425
-  data.tar.gz: 10d2f457876023635070b875d8d41c4442c3a342
+  metadata.gz: d1cac300621628bea9ad6742c3bd60ba0749c9db
+  data.tar.gz: 53501e81a0b65a94c1ec1f4c00619ea2ee3c6a15
 SHA512:
-  metadata.gz: 8b770270192cbab72ae3b4ca0faba9551560fdefe00d86e623e6b1167b48cc8cfde58d84f0f695265b1debb9bbd2085be09fcf4f5cdd997760dcd69c398f5259
-  data.tar.gz: f4367a521b182ec52461e872612d3bae47c825971c953c3b515f0d3e86083f4aba94b96eeb375b43a744f9d91ff21d91cc99c7cc687c400dfdbe2e226e96a67f
+  metadata.gz: 15c21e53693ec787a70d374091c1f9f1454a769ff05f7de0b01db62b77c9de14df106d55467955e04fa99b4f752f49fcfe11f80797fb2e45b5a62dba39ce9682
+  data.tar.gz: 3b4ad6ab24bec6dad8be0dfdb90a2c408a8e9a4e94c8683dd1a8fc8642bc5c7643b73f3b2e1a20f5acc73a4d61bf567b51f970b9e6b3f20d99c6522bc7da5f59

data/lib/omniauth/strategies/zooniverse.rb

@@ -6,13 +6,33 @@ module OmniAuth
       # change the class name and the :name option to match your application name
       option :name, :zooniverse
 
+      BASE_SCOPES = %w[user public]
+      DEFAULT_SCOPE = "user,public"
+
       option :client_options, {
         :site => "https://panoptes-staging.zooniverse.org",
         :authorize_url => "/oauth/authorize",
+        :scope => "user, public"
       }
 
       uid { raw_info["id"] }
 
+      option :authorize_options, [:user, :public]
+
+
+      def authorize_params
+        super.tap do |params|
+          options[:authorize_options].each do |k|
+            params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
+          end
+
+          raw_scope = params[:scope] || DEFAULT_SCOPE
+          scope_list = raw_scope.split(" ").map {|item| item.split(",")}.flatten
+          scope_list.map! { |s| s =~ /^https?:\/\// || BASE_SCOPES.include?(s) ? s : "#{BASE_SCOPE_URL}#{s}" }
+          params[:scope] = scope_list.join(" ")
+        end
+      end
+
       info do
         {
           :email => raw_info["email"],
@@ -20,6 +40,7 @@ module OmniAuth
         }
       end
 
+
       def raw_info
         raw = JSON.parse(access_token.get('/api/me', headers: {'Accept' => "application/vnd.api+json; version=1"}).body)
         @raw_info ||= raw["users"][0]

data/lib/omniauth/zooniverse/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Zooniverse
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-zooniverse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stuart Lynn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler