omniauth-microsoft-office365 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd622f841b717635405a31b2ca3817b2e5eef5e1
-  data.tar.gz: 57bb2bf5a24c69db93c36563576593fade0ac646
+  metadata.gz: 9f1593595f1128cc3961d2e8a41f7e5c7c8b527d
+  data.tar.gz: 148bd4e0ad5ca323afc732f8399a78823c6613fe
 SHA512:
-  metadata.gz: e059ee9e2289c6949b368bc8cf14c45b0f0eb85fa1da5cf477b4b742e465b58922b3f7336013e80849c3c037d63680cbd5318458c64cf5370650d81d2ca08f8b
-  data.tar.gz: 095233d9948ed4bc1bee1a8b93d9a869ab34e5a688e85c3edff14f96bc688baa12e29059abf6541d9817e5beda7a4a8b81a2730178a630c57f12c7185725f09d
+  metadata.gz: ae2328eee7df00e7d9b78a79c15f8820c35a091b2debf517e644059d21176b917d259b68bacd04c431068ae44da6d2a280aa9ef5089d9ea1afcdcf45dbc87a5a
+  data.tar.gz: e730a417f25b83aa3bf40af0533c1a78d564a3a81f638c9e5d55a7bb3bf2f81393fc01d46596a7f712f79a4db729fe1c23d6cf5ff919e847deaf85c07687c85d

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0-preview1
+ruby-2.3.5

data/lib/omniauth/microsoft_office365/version.rb

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

data/lib/omniauth/strategies/microsoft_office365.rb

@@ -5,7 +5,7 @@ module OmniAuth
     class MicrosoftOffice365 < OmniAuth::Strategies::OAuth2
       option :name, :microsoft_office365
 
-      DEFAULT_SCOPE="openid email profile https://outlook.office.com/contacts.read"
+      DEFAULT_SCOPE="openid User.Read Contacts.Read"
 
       option :client_options, {
         site:          "https://login.microsoftonline.com",
@@ -13,18 +13,21 @@ module OmniAuth
         token_url:     "/common/oauth2/v2.0/token"
       }
 
-      option :authorize_options, [:scope]
+      option :authorize_options, %w[scope domain_hint]
 
-      uid { raw_info["Id"] }
+      uid { raw_info["id"] }
 
       info do
         {
-          email:        raw_info["EmailAddress"],
-          display_name: raw_info["DisplayName"],
-          first_name:   first_last_from_display_name(raw_info["DisplayName"])[0],
-          last_name:    first_last_from_display_name(raw_info["DisplayName"])[1],
-          image:        avatar_file,
-          alias:        raw_info["Alias"]
+          email:           raw_info["mail"] || raw_info["userPrincipalName"],
+          display_name:    raw_info["displayName"],
+          first_name:      raw_info["givenName"],
+          last_name:       raw_info["surname"],
+          job_title:       raw_info["jobTitle"],
+          business_phones: raw_info["businessPhones"],
+          mobile_phone:    raw_info["mobilePhone"],
+          office_phone:    raw_info["officePhone"],
+          image:           avatar_file,
         }
       end
 
@@ -35,12 +38,12 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get("https://outlook.office.com/api/v2.0/me/").parsed
+        @raw_info ||= access_token.get("https://graph.microsoft.com/v1.0/me").parsed
       end
 
       def authorize_params
         super.tap do |params|
-          %w[display scope auth_type].each do |v|
+          %w[display domain_hint scope auth_type].each do |v|
             if request.params[v]
               params[v.to_sym] = request.params[v]
             end
@@ -52,21 +55,12 @@ module OmniAuth
 
       private
 
-      def first_last_from_display_name(display_name)
-        # For display names with last name first like "Del Toro, Benicio"
-        if last_first = display_name.match(/^([^,]+),\s+(\S+)$/)
-          [last_first[2], last_first[1]]
-        else
-          display_name.split(/\s+/, 2)
-        end
-      end
-
       def callback_url
         options[:redirect_uri] || (full_host + script_name + callback_path)
       end
 
       def avatar_file
-        photo = access_token.get("https://outlook.office.com/api/v2.0/me/photo/$value")
+        photo = access_token.get("https://graph.microsoft.com/v1.0/me/photo/$value")
         ext   = photo.content_type.sub("image/", "") # "image/jpeg" => "jpeg"
 
         Tempfile.new(["avatar", ".#{ext}"]).tap do |file|

data/spec/omniauth/strategies/microsoft_office365_spec.rb

@@ -78,7 +78,7 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
 
     it "uses correct scope and allows to customize authorization parameters" do
       expect(strategy.authorize_params).to match(
-        "scope" => "openid email profile https://outlook.office.com/contacts.read",
+        "scope" => "openid User.Read Contacts.Read",
         "foo" => "bar",
         "baz" => "zip",
         "state" => /\A\h{48}\z/
@@ -89,18 +89,22 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
   describe "#info" do
     let(:profile_response) do
       instance_double(OAuth2::Response, parsed: {
-        "@odata.context" => "https://outlook.office.com/api/v2.0/$metadata#Me",
-        "@odata.id"      => "https://outlook.office.com/api/v2.0/Users('XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX@XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX')",
-        "Id"             => "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX@XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
-        "EmailAddress"   => "luke.skywalker@example.com",
-        "DisplayName"    => "Skywalker, Luke",
-        "Alias"          => "luke.skywalker",
-        "MailboxGuid"    => "YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY"
+        "@odata.context"  => "https://outlook.office.com/api/v2.0/$metadata#Me",
+        "@odata.id"       => "https://outlook.office.com/api/v2.0/Users('XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX@XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX')",
+        "id"              => "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX@XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
+        "mail"            => "luke.skywalker@example.com",
+        "displayName"     => "Luke Skywalker",
+        "givenName"       => "Luke",
+        "surname"         => "Skywalker",
+        "jobTitle"        => "Jedi Master",
+        "businessPhones" => ['555-555-5555'],
+        "mobilePhone"    => '555-555-5556',
+        "MailboxGuid"     => "YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY"
       })
     end
 
     before do
-      expect(access_token).to receive(:get).with("https://outlook.office.com/api/v2.0/me/")
+      expect(access_token).to receive(:get).with("https://graph.microsoft.com/v1.0/me")
         .and_return(profile_response)
     end
 
@@ -108,17 +112,20 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 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")
+        expect(access_token).to receive(:get).with("https://graph.microsoft.com/v1.0/me/photo/$value")
           .and_return(avatar_response)
       end
 
       it "returns a hash containing normalized user data" do
         expect(strategy.info).to match({
-          alias: "luke.skywalker",
-          display_name: "Skywalker, Luke",
+          display_name: "Luke Skywalker",
           email: "luke.skywalker@example.com",
           first_name: "Luke",
           last_name: "Skywalker",
+          job_title: "Jedi Master",
+          business_phones: ['555-555-5555'],
+          mobile_phone: '555-555-5556',
+          office_phone: nil,
           image: Tempfile,
         })
       end
@@ -131,53 +138,24 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
       end
     end
 
-    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)
-      end
-
-      let(:profile_response) do
-        instance_double(OAuth2::Response, parsed: {
-          "@odata.context" => "https://outlook.office.com/api/v2.0/$metadata#Me",
-          "@odata.id"      => "https://outlook.office.com/api/v2.0/Users('XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX@XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX')",
-          "Id"             => "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX@XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
-          "EmailAddress"   => "luke.skywalker@example.com",
-          "DisplayName"    => "Luke Skywalker",
-          "Alias"          => "luke.skywalker",
-          "MailboxGuid"    => "YYYYYYYY-YYYY-YYYY-YYYY-YYYYYYYYYYYY"
-        })
-      end
-
-      it "returns the parsed first and last name correctly" do
-        expect(strategy.info).to match({
-          alias: "luke.skywalker",
-          display_name: "Luke Skywalker",
-          email: "luke.skywalker@example.com",
-          first_name: "Luke",
-          last_name: "Skywalker",
-          image: Tempfile,
-        })
-      end
-    end
-
     context "when user didn't provide avatar image" do
       let(:avatar_response) { instance_double(OAuth2::Response, "error=" => nil, status: 404, parsed: {}, body: '') }
 
       before do
-        expect(access_token).to receive(:get).with("https://outlook.office.com/api/v2.0/me/photo/$value")
+        expect(access_token).to receive(:get).with("https://graph.microsoft.com/v1.0/me/photo/$value")
           .and_raise(OAuth2::Error, avatar_response)
       end
 
       it "returns a hash containing normalized user data" do
         expect(strategy.info).to match({
-          alias: "luke.skywalker",
-          display_name: "Skywalker, Luke",
+          display_name: "Luke Skywalker",
           email: "luke.skywalker@example.com",
           first_name: "Luke",
           last_name: "Skywalker",
+          job_title: "Jedi Master",
+          business_phones: ['555-555-5555'],
+          mobile_phone: '555-555-5556',
+          office_phone: nil,
           image: nil,
         })
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-microsoft-office365
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Marcin Urbański
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: OmniAuth provider for Microsoft Office365