omniauth-microsoft-office365 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1709f398346ffb52d4477645cc2d7fd289490a4d
-  data.tar.gz: f7d8ab0dc27ba6ab11947611f46e5aef48a2658d
+  metadata.gz: fd622f841b717635405a31b2ca3817b2e5eef5e1
+  data.tar.gz: 57bb2bf5a24c69db93c36563576593fade0ac646
 SHA512:
-  metadata.gz: 52dd89caac47c6ec88794c0b96d7bc0da6f1194890b7a92e6027ccae9ebd39af7f06502ce67f1662ef418c616bb181a63a97c53b0de7f07f7d0d21b2d5e26448
-  data.tar.gz: dc8289cbe82684efaa699f3a4bad02f12989f80fb939f398a816567bee1c3dea1eae73df20206da8aa30cde08e52b274cbc7d0a5f2ed1aa8aad28ec57c7f4ce5
+  metadata.gz: e059ee9e2289c6949b368bc8cf14c45b0f0eb85fa1da5cf477b4b742e465b58922b3f7336013e80849c3c037d63680cbd5318458c64cf5370650d81d2ca08f8b
+  data.tar.gz: 095233d9948ed4bc1bee1a8b93d9a869ab34e5a688e85c3edff14f96bc688baa12e29059abf6541d9817e5beda7a4a8b81a2730178a630c57f12c7185725f09d

data/lib/omniauth/microsoft_office365/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module MicrosoftOffice365
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/lib/omniauth/strategies/microsoft_office365.rb

@@ -5,15 +5,15 @@ module OmniAuth
     class MicrosoftOffice365 < OmniAuth::Strategies::OAuth2
       option :name, :microsoft_office365
 
+      DEFAULT_SCOPE="openid email profile https://outlook.office.com/contacts.read"
+
       option :client_options, {
         site:          "https://login.microsoftonline.com",
         authorize_url: "/common/oauth2/v2.0/authorize",
         token_url:     "/common/oauth2/v2.0/token"
       }
 
-      option :authorize_params, {
-        scope: "openid email profile https://outlook.office.com/contacts.read",
-      }
+      option :authorize_options, [:scope]
 
       uid { raw_info["Id"] }
 
@@ -38,6 +38,18 @@ module OmniAuth
         @raw_info ||= access_token.get("https://outlook.office.com/api/v2.0/me/").parsed
       end
 
+      def authorize_params
+        super.tap do |params|
+          %w[display scope auth_type].each do |v|
+            if request.params[v]
+              params[v.to_sym] = request.params[v]
+            end
+          end
+
+          params[:scope] ||= DEFAULT_SCOPE
+        end
+      end
+
       private
 
       def first_last_from_display_name(display_name)

data/spec/omniauth/strategies/microsoft_office365_spec.rb

@@ -133,7 +133,7 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
 
     context "when the name is in alternate format" do
       let(:avatar_response) { instance_double(OAuth2::Response, content_type: "image/jpeg", body: "JPEG_STREAM") }
-      
+
       before do
         expect(access_token).to receive(:get).with("https://outlook.office.com/api/v2.0/me/photo/$value")
           .and_return(avatar_response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-microsoft-office365
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Marcin Urbański
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth