omniauth-microsoft-office365 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c5f03607220a87567e619bb32d66cfb18e837ed
-  data.tar.gz: 23f08b52c77deb9ed8bbbde09fc92a29fd47c9ee
+  metadata.gz: 84463d49baf7efb41ce48a2c7bb69f941a4dd79e
+  data.tar.gz: be291be2bc42901ff687ce87478ea22f2a5b0f7c
 SHA512:
-  metadata.gz: 2c7fb3a7b86c5d2bb1359547bed0e9ad4439b809b7354ad3291beb731eca6027771fecdc590b4d755a1ef4ce209bab4518a4ca976243cb93bbd0b1d8db2b9dae
-  data.tar.gz: e7d9a20ffa388edd782314f6677c02bbee4606b2844878cb125f7362cad2cc425b737cf8ccccc8763e24b96271173c0a167a871377c09ed7c2084f57839b8c3f
+  metadata.gz: dc5a8b18a576f647ecdeeebe67630557bb4426c588cc3b31bb8864351df13a1f16a9ba3e7fa054f957f542b4707096ce88993f277869918f0fc079ce4484f9c9
+  data.tar.gz: dc6e1a7de0a9844b3939bbb5cd0b98abc142158dc4bed889d7fc9ac858fcae9f60160b681fd4a6e0ff3a8b3e469c357d3ed5583cc0bc710b51a981598a030117

data/lib/omniauth/microsoft_office365/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module MicrosoftOffice365
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/omniauth/strategies/microsoft_office365.rb

@@ -23,6 +23,7 @@ module OmniAuth
           display_name: raw_info["DisplayName"],
           first_name:   raw_info["DisplayName"].split(", ")[1],
           last_name:    raw_info["DisplayName"].split(", ")[0],
+          image:        avatar_file,
           alias:        raw_info["Alias"]
         }
       end
@@ -36,6 +37,27 @@ module OmniAuth
       def raw_info
         @raw_info ||= access_token.get("https://outlook.office.com/api/v2.0/me/").parsed
       end
+
+      private
+
+      def avatar_file
+        photo = access_token.get("https://outlook.office.com/api/v2.0/me/photo/$value")
+        ext   = photo.content_type.sub("image/", "") # "image/jpeg" => "jpeg"
+
+        Tempfile.new(["avatar", ".#{ext}"]).tap do |file|
+          file.binmode
+          file.write(photo.body)
+          file.rewind
+        end
+
+      rescue ::OAuth2::Error => e
+        if e.response.status == 404 # User has no avatar...
+          return nil
+        else
+          raise
+        end
+      end
+
     end
   end
 end

data/spec/omniauth/strategies/microsoft_office365_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
-  let(:request) { double('Request', :params => {}, :cookies => {}, :env => {}) }
-  let(:options) { { } }
+  let(:request)      { double("Request", params: {}, cookies: {}, env: {}) }
+  let(:access_token) { instance_double(OAuth2::AccessToken) }
+  let(:options)      { { } }
 
   let(:app) do
     lambda do
@@ -11,12 +12,13 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
   end
 
   let(:strategy) do
-    OmniAuth::Strategies::MicrosoftOffice365.new(app, 'appid', 'secret', options)
+    OmniAuth::Strategies::MicrosoftOffice365.new(app, "appid", "secret", options)
   end
 
   before do
     OmniAuth.config.test_mode = true
     allow(strategy).to receive(:request).and_return(request)
+    allow(strategy).to receive(:access_token).and_return(access_token)
   end
 
   after do
@@ -48,9 +50,9 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
       let(:options) do
         {
           client_options: {
-            'site'          => 'https://example.com',
-            'authorize_url' => 'https://example.com/authorize',
-            'token_url'     => 'https://example.com/token',
+            "site"          => "https://example.com",
+            "authorize_url" => "https://example.com/authorize",
+            "token_url"     => "https://example.com/token",
           }
         }
       end
@@ -84,4 +86,70 @@ RSpec.describe OmniAuth::Strategies::MicrosoftOffice365 do
     end
   end
 
+  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"
+      })
+    end
+
+    before do
+      expect(access_token).to receive(:get).with("https://outlook.office.com/api/v2.0/me/")
+        .and_return(profile_response)
+    end
+
+    context "when user provided avatar image" 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
+
+      it "returns a hash containing normalized user data" do
+        expect(strategy.info).to match({
+          alias: "luke.skywalker",
+          display_name: "Skywalker, Luke",
+          email: "luke.skywalker@example.com",
+          first_name: "Luke",
+          last_name: "Skywalker",
+          image: Tempfile,
+        })
+      end
+
+      it "downloads avatar to a local file with appropriate extension" do
+        avatar = strategy.info[:image]
+        expect(avatar.binmode?).to be_truthy
+        expect(avatar.path).to match(/avatar.*\.jpeg\z/)
+        expect(avatar.read).to eq("JPEG_STREAM")
+      end
+    end
+
+    context "when user didn't provide avatar image" do
+      let(:avatar_response) { instance_double(OAuth2::Response, status: 404, "error=": nil, parsed: {}, body: '') }
+
+      before do
+        expect(access_token).to receive(:get).with("https://outlook.office.com/api/v2.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",
+          email: "luke.skywalker@example.com",
+          first_name: "Luke",
+          last_name: "Skywalker",
+          image: nil,
+        })
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-microsoft-office365
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Marcin Urbański
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth