omniauth-wrike 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7cadd09c0de366c36a34551b964659b3aafc47f
-  data.tar.gz: 0c56acbf9e7b6ed493a8a8a1d1a545234ffa7a0b
+  metadata.gz: 5753890e4845aaccb00fb6a419197bfc1386f019
+  data.tar.gz: 581d832271d05720613876fa7b775f7b27e2382d
 SHA512:
-  metadata.gz: 20a87f97ca409045e66450ef6985e532a5070859e849004e442b4bc0e47223d0998bcb4736e8c2cc42fdb88f57ff3f69bcc8bdf06920b9ae47e528cf2917a95c
-  data.tar.gz: 4f00c2c21244335854249e1ddf54f01531651697b97296be06bc53024a56fb2b50b280220af814de4e40961a351233e4aa02fdf681e574e6a6930f9c32539aad
+  metadata.gz: f24dbd30ae49ebc7ff34084f769bf14561752bba8c66e0735874ce630286c5d5ff619f13bbd6981479b6c4ce4cd04bb878aca9f17171f6514073a1ccb33fb860
+  data.tar.gz: 2c624b0f6f4cdc172d5c2cc05c885acfb65aa43f7f3c8149b91afdd0381e508e98038cff8c414a2544c539f11442428414de27ab90637a1426584633d0586921

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store

data/.rspec

@@ -0,0 +1 @@
+--colour

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in omniauth-wrike.gemspec
 gemspec
+
+gem 'rake'
+
+group :test do
+  gem 'rspec'
+  gem 'rack-test'
+  gem 'webmock'
+end

data/README.md

@@ -21,7 +21,9 @@ end
 
 To get your Wrike client ID and Secret, you must [request them here](https://developers.wrike.com/getting-started/).
 
-[Wrike API 3.0 Documentation](https://developers.wrike.com/documentation/api/overview)
+[Wrike API 3.0 Documentation](https://developers.wrike.com/documentation-v3/api/overview)
+[Wrike API 4.0 Documentation](https://developers.wrike.com/documentation/api/overview)
+[Wrike migration from API v3 to API v4 Documentation](https://developers.wrike.com/documentation/api/migrations)
 
 ## TODO
 
@@ -30,4 +32,3 @@ To get your Wrike client ID and Secret, you must [request them here](https://dev
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Jpuelpan/omniauth-wrike
-

data/lib/omniauth-wrike/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Wrike
-    VERSION = '0.2.1'
+    VERSION = '1.0.0'
   end
-end
+end

data/lib/omniauth/strategies/wrike.rb

@@ -6,38 +6,38 @@ module OmniAuth
       option :name, 'wrike'
 
       option :client_options, {
-        :site => 'https://www.wrike.com/api/v3',
-        :authorize_url => 'https://www.wrike.com/oauth2/authorize',
-        :token_url => 'https://www.wrike.com/oauth2/token'
+        site: 'https://www.wrike.com/api/v4',
+        authorize_url: 'https://www.wrike.com/oauth2/authorize/v4',
+        token_url: 'https://www.wrike.com/oauth2/token'
       }
 
       uid { raw_info['id'] }
 
       info do
         {
-          'uid' => raw_info['id'],
-          'name' => raw_info['name']
+          uid: raw_info['id'],
+          name: "#{raw_info['firstName']} #{raw_info['lastName']}",
+          email: user_email
         }
       end
 
       extra do
-        { 
-          'raw_info' => raw_info,
-          'accounts' => accounts
+        {
+          raw_info: raw_info
         }
       end
 
-      def raw_info
-        @raw_info ||= first_account
+      def user_email
+        raw_info['profiles'].first['email']
       end
 
-      def accounts
-        @accounts ||= access_token.get('accounts').parsed['data']
+      def user_data_url
+        @url ||= URI::HTTPS.build(host: access_token.params['host'], path: '/api/v4/contacts', query: 'me=true').to_s
       end
 
-      def first_account
-        @first_account ||= accounts.first
+      def raw_info
+        @raw_info ||= access_token.get(user_data_url).parsed['data'].first
       end
     end
   end
-end
+end

data/spec/omniauth/strategies/wrike_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Wrike do
+  let(:request) { double('Request', params: {}, cookies: {}, env: {}) }
+  let(:profile) { raw_info_hash['profiles'].first }
+
+  subject do
+    args = ['appid', 'secret', @options || {}].compact
+    OmniAuth::Strategies::Wrike.new(*args).tap do |strategy|
+      allow(strategy).to receive(:request) {
+        request
+      }
+    end
+  end
+
+  describe 'client options' do
+    it 'has correct name' do
+      expect(subject.options.name).to eq('wrike')
+    end
+
+    it 'has correct site' do
+      expect(subject.options.client_options.site).to eq('https://www.wrike.com/api/v4')
+    end
+
+    it 'has correct authorize url' do
+      expect(subject.options.client_options.authorize_url).to eq('https://www.wrike.com/oauth2/authorize/v4')
+    end
+  end
+
+  describe 'info' do
+    before do
+      allow(subject).to receive(:raw_info).and_return(raw_info_hash)
+    end
+
+    it 'contains strict list of attrs' do
+      expect(subject.info.keys).to contain_exactly(:uid, :name, :email)
+    end
+
+    it 'returns the uid' do
+      expect(subject.info[:uid]).to eq(raw_info_hash['id'])
+    end
+
+    it 'returns the name' do
+      expect(subject.info[:name]).to eq("#{raw_info_hash['firstName']} #{raw_info_hash['lastName']}")
+    end
+
+    it 'returns the email' do
+      expect(subject.info[:email]).to eq(profile['email'])
+    end
+  end
+
+  describe 'user_email' do
+    before do
+      allow(subject).to receive(:raw_info).and_return(raw_info_hash)
+    end
+
+    it 'returns user email from first profile' do
+      expect(subject.user_email).to eq(profile['email'])
+    end
+  end
+
+  describe 'request_phase' do
+    context 'with a specified callback_url in the params' do
+      before do
+        params = { 'callback_url' => 'http://foo.dev/auth/wrike/foobar' }
+        allow(subject).to receive(:request) do
+          double('Request', params: params)
+        end
+        allow(subject).to receive(:session) do
+          double('Session', :[] => { 'callback_url' => params['callback_url'] })
+        end
+      end
+
+      it 'returns the correct callback_path' do
+        expect(subject.callback_path).to eq '/auth/wrike/callback'
+      end
+    end
+
+    context 'with no callback_url set' do
+      it 'returns the default callback_path value' do
+        expect(subject.callback_path).to eq '/auth/wrike/callback'
+      end
+    end
+  end
+end
+
+private
+
+def raw_info_hash
+  {
+    "id" => "KUAJ25LC",
+    "firstName" => "Test",
+    "lastName" => "User",
+    "type" => "Person",
+    "profiles" => [
+      {
+        "accountId" => "IEAGIITR",
+        "email" => "test.user@myapp.com",
+        "role" => "User",
+        "external" => false,
+        "admin" => false,
+        "owner" => true
+      }
+    ],
+    "avatarUrl" => "https://www.wrike.com/avatars//7E/A2/Box_ffdf2a2e_84-84_v1.png",
+    "timezone" => "Europe/Moscow",
+    "locale" => "en",
+    "deleted" => false,
+    "me" => true
+  }
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'rspec'
+require 'rack/test'
+require 'webmock/rspec'
+require 'omniauth'
+require 'omniauth-wrike'
+
+RSpec.configure do |config|
+  config.include WebMock::API
+  config.include Rack::Test::Methods
+  config.extend  OmniAuth::Test::StrategyMacros, type: :strategy
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-wrike
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Juan Puelpan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -32,12 +32,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - README.md
 - lib/omniauth-wrike.rb
 - lib/omniauth-wrike/version.rb
 - lib/omniauth/strategies/wrike.rb
 - omniauth-wrike.gemspec
+- spec/omniauth/strategies/wrike_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/Jpuelpan/omniauth-wrike
 licenses:
 - MIT
@@ -63,3 +66,4 @@ signing_key:
 specification_version: 4
 summary: Wrike strategy for Omniauth.
 test_files: []
+has_rdoc: