stormpath-sdk 1.0.0.beta.6 → 1.0.0.beta.7

data/lib/stormpath-sdk/provider/google/google_provider_data.rb

@@ -0,0 +1,19 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::GoogleProviderData < Stormpath::Provider::ProviderData
+  prop_reader :access_token, :refresh_token
+end
+              

data/lib/stormpath-sdk/provider/provider.rb

@@ -0,0 +1,18 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::Provider < Stormpath::Resource::Base
+  prop_reader :provider_id, :created_at, :modified_at
+end

data/lib/stormpath-sdk/provider/provider_data.rb

@@ -0,0 +1,18 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::ProviderData < Stormpath::Resource::Base
+  prop_reader :provider_id, :created_at, :modified_at
+end

data/lib/stormpath-sdk/provider/stormpath/stormpath_provider.rb

@@ -0,0 +1,17 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::StormpathProvider < Stormpath::Provider::Provider
+end

data/lib/stormpath-sdk/provider/stormpath/stormpath_provider_data.rb

@@ -0,0 +1,17 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::StormpathProviderData < Stormpath::Provider::ProviderData
+end

data/lib/stormpath-sdk/resource/account.rb

@@ -41,4 +41,19 @@ class Stormpath::Resource::Account < Stormpath::Resource::Instance
     group_membership.delete if group_membership
   end
 
+  def provider_data
+    internal_instance = instance_variable_get "@_provider_data"
+    return internal_instance if internal_instance
+
+    provider_data_href = self.href + '/providerData'
+
+    clazz_proc = Proc.new do |data|
+      provider_id = data['providerId']
+      "Stormpath::Provider::#{provider_id.capitalize}ProviderData".constantize
+    end
+
+    provider_data = data_store.get_resource provider_data_href, clazz_proc
+    instance_variable_set "@_provider_data", provider_data
+  end
+
 end

data/lib/stormpath-sdk/resource/application.rb

@@ -57,8 +57,11 @@ class Stormpath::Resource::Application < Stormpath::Resource::Instance
   end
 
   def authenticate_account request
-    response = Stormpath::Authentication::BasicAuthenticator.new data_store
-    response.authenticate href, request
+    Stormpath::Authentication::BasicAuthenticator.new(data_store).authenticate(href, request)
+  end
+
+  def get_provider_account request
+    Stormpath::Provider::AccountResolver.new(data_store).resolve_provider_account(href, request)
   end
 
   private

data/lib/stormpath-sdk/resource/associations.rb

@@ -88,15 +88,17 @@ module Stormpath
             if value.is_a? Hash
               resource_href = get_href_from_hash value
             end
-            
-            if instance_variable_get("@_#{key.underscore}").nil?
+
+            key_name = "@_#{key.underscore}"
+
+            if instance_variable_get(key_name).nil?
               if resource_href
-                instance_variable_set("@_#{key.underscore}", data_store.instantiate(clazz, value))
+                instance_variable_set(key_name, data_store.instantiate(clazz, value))
               else
-                instance_variable_set("@_#{key.underscore}", clazz.new(value))
+                instance_variable_set(key_name, clazz.new(value))
               end
             end
-            instance_variable_get("@_#{key.underscore}")
+            instance_variable_get(key_name)
           end
 
           def get_resource_href_property(key)

data/lib/stormpath-sdk/resource/directory.rb

@@ -31,4 +31,19 @@ class Stormpath::Resource::Directory < Stormpath::Resource::Instance
     account.apply_custom_data_updates_if_necessary
     data_store.create href, account, Stormpath::Resource::Account
   end
+
+  def provider
+    internal_instance = instance_variable_get "@_provider"
+    return internal_instance if internal_instance
+
+    provider_href = self.href + '/provider'
+
+    clazz_proc = Proc.new do |data|
+      provider_id = data['providerId']
+      "Stormpath::Provider::#{provider_id.capitalize}Provider".constantize
+    end
+
+    provider = data_store.get_resource provider_href, clazz_proc
+    instance_variable_set "@_provider", provider
+  end
 end

data/lib/stormpath-sdk/version.rb

@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 module Stormpath
-  VERSION = '1.0.0.beta.6'
-  VERSION_DATE = '2014-07-07'
+  VERSION = '1.0.0.beta.7'
+  VERSION_DATE = '2014-07-21'
 end

data/spec/auth/basic_authenticator_spec.rb

@@ -4,17 +4,17 @@ describe "BasicAuthenticator" do
   context "given an instance of BasicAuthenticator" do
 
     before do
-      ds = Stormpath::DataStore.new "", {}, ""
-      allow(test_api_client).to receive(:data_store).and_return(ds)
+      data_store = Stormpath::DataStore.new "", {}, ""
+      allow(test_api_client).to receive(:data_store).and_return(data_store)
       auth_result = Stormpath::Authentication::AuthenticationResult.new({}, test_api_client)
-      allow(ds).to receive(:create).and_return(auth_result)
+      allow(data_store).to receive(:create).and_return(auth_result)
 
-      @ba = Stormpath::Authentication::BasicAuthenticator.new ds
+      @basic_authenticator = Stormpath::Authentication::BasicAuthenticator.new data_store
     end
 
     context "when authenticating" do
       before do
-        @response = @ba.authenticate "foo/bar", Stormpath::Authentication::UsernamePasswordRequest.new("fake-username", "fake-password")
+        @response = @basic_authenticator.authenticate "foo/bar", Stormpath::Authentication::UsernamePasswordRequest.new("fake-username", "fake-password")
       end
 
       it "an AuthenticationResult is returned" do

data/spec/cache/cache_entry_spec.rb

@@ -63,7 +63,7 @@ describe Stormpath::Cache::CacheEntry do
       end
 
       it 'returns false' do
-        expect(expired).to be_false
+        expect(expired).to be_falsey
       end
     end
 
@@ -76,7 +76,7 @@ describe Stormpath::Cache::CacheEntry do
       end
 
       it 'returns true' do
-        expect(@expired).to be_true
+        expect(@expired).to be_truthy
       end
     end
 
@@ -89,7 +89,7 @@ describe Stormpath::Cache::CacheEntry do
       end
 
       it 'returns true' do
-        expect(@expired).to be_true
+        expect(@expired).to be_truthy
       end
     end
   end

data/spec/client_spec.rb

@@ -285,7 +285,7 @@ properties
 
       it 'returns the collection' do
         expect(applications).to be_kind_of(Stormpath::Resource::Collection)
-        expect(applications).to have_at_least(1).item
+        expect(applications.count).to be >= 1
       end
 
       after do
@@ -296,13 +296,13 @@ properties
     context 'pagination' do
       let!(:applications) do
         (0..2).to_a.map do |index|
-          test_api_client.applications.create name: "Pagination Test #{index + 1}", description: 'foo'
+          test_api_client.applications.create name: random_application_name(index), description: 'foo'
         end
       end
 
       it 'accepts offset and limit' do
-        expect(test_api_client.applications.limit(2)).to have_at_least(3).items
-        expect(test_api_client.applications.offset(1).limit(2)).to have_at_least(2).items
+        expect(test_api_client.applications.limit(2).count).to be >= 3
+        expect(test_api_client.applications.offset(1).limit(2).count).to be >= 2
       end
 
       after do
@@ -337,11 +337,11 @@ properties
       end
 
       let(:directory) do
-        client.directories.create name: 'testDirectory'
+        client.directories.create name: random_directory_name
       end
 
       let(:group) do
-        directory.groups.create name: 'someGroup'
+        directory.groups.create name: random_group_name
       end
 
       let(:account) do
@@ -385,7 +385,7 @@ properties
         end
 
         let(:group) do
-          directory.groups.create name: 'someGroup'
+          directory.groups.create name: random_group_name
         end
 
         before do
@@ -401,16 +401,20 @@ properties
     end
 
     context 'search' do
+
+      let(:first_application_name) { random_application_name(1) }
+      let(:second_application_name ) { random_application_name(2) }
+
       let!(:applications) do
         [
-          test_api_client.applications.create(name: 'Test Alpha', description: 'foo'),
-          test_api_client.applications.create(name: 'Test Beta', description: 'foo')
+          test_api_client.applications.create(name: first_application_name, description: 'foo'),
+          test_api_client.applications.create(name: second_application_name, description: 'foo')
         ]
       end
 
       context 'by any attribute' do
         let(:search_results) do
-          test_api_client.applications.search('Test Alpha')
+          test_api_client.applications.search(first_application_name)
         end
 
         it 'returns the application' do
@@ -420,7 +424,7 @@ properties
 
       context 'by an explicit attribute' do
         let(:search_results) do
-          test_api_client.applications.search(name: 'Test Alpha')
+          test_api_client.applications.search(name: first_application_name)
         end
 
         it 'returns the application' do
@@ -436,7 +440,7 @@ properties
     end
 
     describe '.create' do
-      let(:application_name) { 'Client Application Create Test' }
+      let(:application_name) { random_application_name }
 
       let(:application_attributes) do
         {
@@ -543,7 +547,7 @@ properties
           end
         end
 
-        after(:each) do
+        after(:each) do |example|
           unless example.metadata[:skip_cleanup]
             application.delete
             test_api_client.directories.each do |d|
@@ -570,7 +574,7 @@ properties
 
       it 'returns the collection' do
         expect(directories).to be_kind_of(Stormpath::Resource::Collection)
-        expect(directories).to have_at_least(1).item
+        expect(directories.count).to be >= 1
       end
 
       after do
@@ -580,11 +584,11 @@ properties
 
     context 'given a collection with a limit' do
       let!(:directory_1) do
-        test_api_client.directories.create name: "0000_test_directory_with_limit"
+        test_api_client.directories.create name: random_directory_name(1)
       end
 
       let!(:directory_2) do
-        test_api_client.directories.create name: "0001_test_directory_with_limit"
+        test_api_client.directories.create name: random_directory_name(2)
       end
 
       after do
@@ -593,14 +597,17 @@ properties
       end
 
       it 'should retrieve the number of directories described with the limit' do
-        expect(test_api_client.directories).to have_at_least(2).items
+        expect(test_api_client.directories.count).to be >= 2
       end
     end
 
     describe '.create' do
+
+      let(:directory_name) { random_directory_name }
+
       let(:directory_attributes) do
         {
-          name: 'Client Directory Create Test',
+          name: directory_name,
           description: 'A test description'
         }
       end
@@ -627,11 +634,11 @@ properties
 
       let(:account) do
         account = Stormpath::Resource::Account.new({
-          email: "test@example.com",
+          email: random_email,
           givenName: 'Ruby SDK',
           password: 'P@$$w0rd',
           surname: 'SDK',
-          username: "testusername"
+          username: random_user_name
         })
         directory.create_account account
       end

data/spec/provider/account_resolver_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "ProviderAccountResolver" do
+  context "given an instance of ProviderAccountResolver" do
+
+    before do
+      data_store = Stormpath::DataStore.new "", {}, ""
+      allow(test_api_client).to receive(:data_store).and_return(data_store)
+      auth_result = Stormpath::Provider::AccountResult.new({}, test_api_client)
+      allow(data_store).to receive(:create).and_return(auth_result)
+
+      @provider_account_resolver = Stormpath::Provider::AccountResolver.new data_store
+    end
+
+    context "when integrating" do
+      before do
+        @response = @provider_account_resolver.resolve_provider_account "foo/bar", Stormpath::Provider::AccountRequest.new(:facebook, :access_token, "some-token")
+      end
+
+      it "an ProviderResult is returned" do
+        expect(@response).to be_a Stormpath::Provider::AccountResult
+      end
+    end
+  end
+end

data/spec/provider/provider_spec.rb

@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+describe Stormpath::Provider::Provider, :vcr do
+
+  let(:application) do
+    test_api_client.applications.create name: random_application_name,
+                                        description: 'Test Provider Application for AccountStoreMappings'
+  end
+
+  let(:account_store_mapping) do
+    test_api_client.account_store_mappings.create application: application, account_store: directory
+  end
+
+  let(:directory) do
+    test_api_client.directories.create directory_hash
+  end
+
+  let(:directory_hash) do
+    Hash.new.tap do |hash|
+      hash[:name] = name
+      hash[:description] = description
+      hash[:provider] = provider_info if defined? provider_info
+    end
+  end
+
+  subject(:provider) do
+    directory.provider
+  end
+
+  after do
+    directory.delete
+    application.delete
+  end
+
+  shared_examples 'a provider directory' do
+    it { should be_kind_of Stormpath::Provider::Provider }
+
+    it "assign provider directory to an application" do
+      expect(application.account_store_mappings.count).to eq(0)
+      expect(account_store_mapping.application).to eq(application)
+      expect(account_store_mapping.account_store).to eq(directory)
+      expect(application.account_store_mappings.count).to eq(1)
+    end
+
+    it 'should properly respond to attributes' do
+      expect(provider.provider_id).to eq(provider_id)
+      expect(provider.created_at).to be
+      expect(provider.modified_at).to be
+      expect(provider.href).to eq(directory.href + "/provider")
+
+      provider_clazz = "Stormpath::Provider::#{provider_id.capitalize}Provider".constantize
+      expect(provider).to be_instance_of(provider_clazz)
+
+      if provider_id == "google" || provider_id == "facebook"
+        expect(provider.client_id).to eq(client_id)
+        expect(provider.client_secret).to eq(client_secret)
+      end
+
+      if provider_id == "google"
+        expect(provider.redirect_uri).to eq(redirect_uri)
+      end
+    end
+  end
+
+  shared_examples 'a syncrhonizeable directory' do
+    it 'should be able to store provider accounts' do
+      account_store_mapping
+
+      access_token = "xyz"
+      request = Stormpath::Provider::AccountRequest.new(provider_id, :access_token, access_token)
+
+      stub_request(:post, application.href + "/accounts").to_return(body: Stormpath::Test.mocked_account(provider_id), status: 201)
+      result = application.get_provider_account(request)
+      expect(result.is_new_account?).to be
+      expect(result.account).to be_kind_of(Stormpath::Resource::Account)
+
+      stub_request(:get, result.account.href + "/providerData").to_return(body: Stormpath::Test.mocked_provider_data(provider_id))
+
+      expect(result.account.provider_data).to be_kind_of(Stormpath::Provider::ProviderData)
+      provider_data_clazz = "Stormpath::Provider::#{provider_id.capitalize}ProviderData".constantize
+      expect(result.account.provider_data).to be_instance_of(provider_data_clazz)
+
+      expect(result.account.provider_data.provider_id).to eq(provider_id)
+      expect(result.account.provider_data.created_at).to be
+      expect(result.account.provider_data.modified_at).to be
+      expect(result.account.provider_data.access_token).to be
+
+      if provider_id == 'google'
+        expect(result.account.provider_data.refresh_token).to be
+      end
+
+      stub_request(:post, application.href + "/accounts").to_return(body: Stormpath::Test.mocked_account(provider_id), status: 200)
+      new_result = application.get_provider_account(request)
+      expect(new_result.is_new_account).not_to be
+    end
+  end
+
+  describe 'create stormpath directory with empty provider credentials' do
+    let(:name) { random_directory_name('Stormpath') }
+    let(:description) { 'Directory for testing Stormpath directories.' }
+    let(:provider_id) { "stormpath" }
+
+    it_behaves_like 'a provider directory'
+
+    it 'should be able to retrieve provider data from a regular account' do
+      account = directory.accounts.create({
+        given_name: 'John',
+        surname: 'Smith',
+        email: 'john.smith@example.com',
+        username: 'johnsmith',
+        password: '4P@$$w0rd!'
+      })
+
+      expect(account.provider_data).to be_kind_of(Stormpath::Provider::ProviderData)
+      expect(account.provider_data.provider_id).to eq(provider_id)
+      expect(account.provider_data.created_at).to be
+      expect(account.provider_data.modified_at).to be
+      expect(account.provider_data).to be_instance_of(Stormpath::Provider::StormpathProviderData)
+    end
+  end
+
+  describe 'create facebook directory with provider credentials' do
+    let(:name) { random_directory_name('Facebook') }
+    let(:description) { 'Directory for testing Facebook directories.' }
+
+    let(:provider_id) { "facebook" }
+    let(:client_id) { 'FACEBOOK_APP_ID' }
+    let(:client_secret) { 'FACEBOOK_APP_SECRET' }
+    let(:provider_info) do
+      { provider_id: provider_id, client_id: client_id, client_secret: client_secret }
+    end
+
+    it_behaves_like 'a provider directory'
+    it_behaves_like 'a syncrhonizeable directory'
+  end
+
+  describe 'create google directory with provider credentials' do
+    let(:name) { random_directory_name('Google') }
+    let(:description) { 'Directory for testing Google directories.' }
+
+    let(:provider_id) { "google" }
+    let(:client_id) { 'GOOGLE_CLIENT_ID' }
+    let(:client_secret) { 'GOOGLE_CLIENT_SECRET' }
+    let(:redirect_uri) { 'GOOGLE_REDIRECT_URI' }
+    let(:provider_info) do
+      { provider_id: provider_id, client_id: client_id, client_secret: client_secret, redirect_uri: redirect_uri }
+    end
+
+    it_behaves_like 'a provider directory'
+    it_behaves_like 'a syncrhonizeable directory'
+  end
+end