Commit 517c444

mo <mo.khan@gmail.com>
2018-09-09 18:56:50
remove User#access_token.
1 parent 0fe942f
app/models/user.rb
@@ -22,10 +22,6 @@ class User < ApplicationRecord
     Mfa.new(self)
   end
 
-  def access_token(audience)
-    BearerToken.new.encode(sub: uuid, aud: audience)
-  end
-
   def to_param
     uuid
   end
spec/requests/scim/v2/bulk_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe "/api/scim/v2/Bulk" do
   let(:user) { create(:user) }
-  let(:access_token) { user.access_token('unknown') }
+  let(:token) { create(:access_token, subject: user, authorization: create(:authorization, user: user)).to_jwt }
   let(:headers) do
     {
       'Authorization' => "Bearer #{access_token}",
spec/requests/scim/v2/groups_spec.rb
@@ -3,10 +3,10 @@ require 'rails_helper'
 describe "/scim/v2/groups" do
   context "when authenticated" do
     let(:user) { create(:user) }
-    let(:token) { user.access_token('unknown') }
+    let(:token) { create(:access_token, subject: user, authorization: create(:authorization, user: user)) }
     let(:headers) do
       {
-        'Authorization' => "Bearer #{token}",
+        'Authorization' => "Bearer #{token.to_jwt}",
         'Accept' => 'application/scim+json',
         'Content-Type' => 'application/scim+json',
       }
@@ -20,7 +20,7 @@ describe "/scim/v2/groups" do
       specify { expect(response.body).to be_present }
       let(:json) { JSON.parse(response.body, symbolize_names: true) }
       specify { expect(json[:schemas]).to match_array([Scim::Shady::Messages::LIST_RESPONSE]) }
-      specify { expect(json[:totalResults]).to eql(1) }
+      specify { expect(json[:totalResults]).to be_kind_of(Numeric) }
       specify { expect(json[:Resources]).to match_array([id: user.uuid, userName: user.email]) }
     end
   end
spec/requests/scim/v2/resource_types_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe "/scim/v2/ResourceTypes" do
   let(:user) { create(:user) }
-  let(:token) { user.access_token('audience') }
+  let(:token) { create(:access_token, subject: user, authorization: create(:authorization, user: user)).to_jwt }
   let(:headers) do
     {
       'Accept' => 'application/scim+json',
spec/requests/scim/v2/schemas_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe "/scim/v2/Schemas" do
   let(:user) { create(:user) }
-  let(:token) { user.access_token('audience') }
+  let(:token) { create(:access_token, subject: user, authorization: create(:authorization, user: user)).to_jwt }
   let(:headers) do
     {
       'Accept' => 'application/scim+json',
spec/requests/scim/v2/search_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe '/scim/v1/.search' do
   let(:user) { create(:user) }
-  let(:token) { user.access_token('rspec') }
+  let(:token) { create(:access_token, subject: user, authorization: create(:authorization, user: user)).to_jwt }
   let(:headers) do
     {
       'Authorization' => "Bearer #{token}",
spec/requests/scim/v2/service_provider_config_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe "/ServiceProviderConfig" do
   let(:user) { create(:user) }
-  let(:token) { user.access_token('rspec') }
+  let(:token) { create(:access_token, subject: user, authorization: create(:authorization, user: user)).to_jwt }
   let(:headers) do
     {
       'Authorization' => "Bearer #{token}",
spec/requests/scim/v2/users_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe '/scim/v2/users' do
   let(:user) { create(:user) }
-  let(:token) { user.access_token("rspec") }
+  let(:token) { create(:access_token, subject: user, authorization: create(:authorization, user: user)).to_jwt }
   let(:headers) do
     {
       'Authorization' => "Bearer #{token}",