omniauth-microsoft-office365 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ae9e029226fd032447b568e53b3c81cab5deaa0
-  data.tar.gz: acc34211c5424bc942057e0436d1e383006ccd42
+  metadata.gz: 1709f398346ffb52d4477645cc2d7fd289490a4d
+  data.tar.gz: f7d8ab0dc27ba6ab11947611f46e5aef48a2658d
 SHA512:
-  metadata.gz: e7ec8cb5d9fe19dd7b93a545e5b848b151c6e9abf01088ea0d66bb7df8d05baa0789ba6ba3d553d22d154be8b9b00d9e78c6215607a702f2401a2205c4c501c5
-  data.tar.gz: 03a991ae1f18bf4f26f0e2a33a4dcb9cc028398261b845fc18b3a1966b2ec1bbc185be19b0cb70dc81845205f64d113be97f280e552514675f806ce1e65500bb
+  metadata.gz: 52dd89caac47c6ec88794c0b96d7bc0da6f1194890b7a92e6027ccae9ebd39af7f06502ce67f1662ef418c616bb181a63a97c53b0de7f07f7d0d21b2d5e26448
+  data.tar.gz: dc8289cbe82684efaa699f3a4bad02f12989f80fb939f398a816567bee1c3dea1eae73df20206da8aa30cde08e52b274cbc7d0a5f2ed1aa8aad28ec57c7f4ce5

data/lib/omniauth/microsoft_office365/version.rb

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

data/lib/omniauth/strategies/microsoft_office365.rb

@@ -21,8 +21,8 @@ module OmniAuth
         {
           email:        raw_info["EmailAddress"],
           display_name: raw_info["DisplayName"],
-          first_name:   raw_info["DisplayName"].split(", ")[1],
-          last_name:    raw_info["DisplayName"].split(", ")[0],
+          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"]
         }
@@ -40,6 +40,15 @@ 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
@@ -57,6 +66,8 @@ module OmniAuth
       rescue ::OAuth2::Error => e
         if e.response.status == 404 # User has no avatar...
           return nil
+        elsif e.code['code'] == 'GetUserPhoto' && e.code['message'].match('not supported')
+          nil
         else
           raise
         end

data/spec/omniauth/strategies/microsoft_office365_spec.rb

@@ -131,6 +131,38 @@ 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: '') }
 

metadata

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