omniauth-applicaster 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfb4391ae209e39c4f8696aa9739272c001d869b
-  data.tar.gz: e1bacf27810817e764814c017987dfda3c2c06b6
+  metadata.gz: 4d0a3317532707cf06cf526f9fd1415f42192319
+  data.tar.gz: 5d82821d7a9f287c4323992430277ce271eba424
 SHA512:
-  metadata.gz: 58764a8664b29e35dc140db06f17777fe3c813ef961b6033d8239c1723ec4cbc7b394f1dd89b0ca3bbaca5ceb74d9f521266575638692dd4bfe68b027b1502ce
-  data.tar.gz: 955089493db46cba1ae86a5b59849ede304c9ea12b43a4c4cc5e504187fe7cd47f86976badf489b8963910645e1352f525a5d7f86a2fd186b139754dbf6bb92e
+  metadata.gz: bb5b8fbcdad31b8183625d25720d07645eacc6bc17a67147ad9d7238665e3dab674a9d25166a428525bdfb19e529624d3b8cc5e7fc5bf58529c472acc589e08b
+  data.tar.gz: 044fd3eade0aba820f4ef97b91bf1b2b5dd1492d04f81e267b8c859dc531a4360f38d87eaa4c72559cc08684fb65933a42d101cfa25f75db6e60d9baaa3ab6f3

data/lib/applicaster/accounts.rb

@@ -55,6 +55,12 @@ module Applicaster
             .get("/api/v1/users/current.json")
             .body
         )
+      rescue Faraday::ClientError => e
+        if e.response[:status] == 401
+          nil
+        else
+          raise e
+        end
       end
     end
 

data/lib/applicaster/auth_helpers.rb

@@ -1,5 +1,3 @@
-require_relative "user"
-
 module Applicaster
   module AuthHelpers
     def current_user
@@ -23,13 +21,8 @@ module Applicaster
       return nil unless session[:omniauth_credentials]
 
       token = session[:omniauth_credentials][:token]
-      Applicaster::Accounts.user_from_token(token)
-    rescue Faraday::ClientError => e
-      if e.response[:status] == 401
-        session.delete(:omniauth_credentials)
-        nil
-      else
-        raise e
+      Applicaster::Accounts.user_from_token(token).tap do |user|
+        session.delete(:omniauth_credentials) unless user
       end
     end
   end

data/lib/omniauth-applicaster/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Applicaster
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/lib/applicaster/accounts_spec.rb

@@ -33,56 +33,6 @@ RSpec.describe Applicaster::Accounts do
     end
   end
 
-  describe "#initialize" do
-    it "accepts client_id and client_secret" do
-      service = Applicaster::Accounts.new("my_client_id", "my_client_secret")
-
-      expect(service.client_id).to eq("my_client_id")
-      expect(service.client_secret).to eq("my_client_secret")
-    end
-
-    it "takes default values from ENV vars" do
-      expect(accounts_service.client_id).to eq("client_id")
-      expect(accounts_service.client_secret).to eq("client_secret")
-    end
-  end
-
-  describe "#accounts" do
-    before do
-      stub_client_credentials_request
-      stub_accounts_index_request
-    end
-
-    it "returns an array of Account objects" do
-      expect(return_value).to be_kind_of(Array)
-      expect(return_value.size).to eq(2)
-      expect(return_value.first).to be_kind_of(Applicaster::Accounts::Account)
-    end
-
-    def return_value
-      @return_value ||= accounts_service.accounts
-    end
-
-    def stub_accounts_index_request
-      stub_request(:get, "https://accounts2.applicaster.com/api/v1/accounts.json").
-         with(query: { access_token: "client-credentials-token" }).
-         to_return(successful_json_response(mock_accounts_response))
-    end
-
-    def mock_accounts_response
-      [
-        {
-          id: "1-account-1",
-          name: "Account 1",
-        },
-        {
-          id: "2-account-2",
-          name: "Account 2",
-        },
-      ]
-    end
-  end
-
   describe ".connection" do
     let(:remote_url) { "https://accounts2.applicaster.com/test.json" }
     let(:request_stub) { stub_request(:get, remote_url) }
@@ -137,6 +87,80 @@ RSpec.describe Applicaster::Accounts do
     end
   end
 
+  describe ".user_from_token" do
+    let(:return_value) { Applicaster::Accounts.user_from_token(token) }
+
+    before do
+      stub_current_user_requests
+    end
+
+    context "when token is valid" do
+      let(:token) { "valid-access-token" }
+
+      it "returns an Applicaster::Accounts::User instance" do
+        expect(return_value).to be_kind_of(Applicaster::Accounts::User)
+      end
+    end
+
+    context "when token is invalid" do
+      let(:token) { "invalid-access-token" }
+
+      it "returns nil" do
+        expect(return_value).to be nil
+      end
+    end
+  end
+
+  describe "#initialize" do
+    it "accepts client_id and client_secret" do
+      service = Applicaster::Accounts.new("my_client_id", "my_client_secret")
+
+      expect(service.client_id).to eq("my_client_id")
+      expect(service.client_secret).to eq("my_client_secret")
+    end
+
+    it "takes default values from ENV vars" do
+      expect(accounts_service.client_id).to eq("client_id")
+      expect(accounts_service.client_secret).to eq("client_secret")
+    end
+  end
+
+  describe "#accounts" do
+    before do
+      stub_client_credentials_request
+      stub_accounts_index_request
+    end
+
+    it "returns an array of Account objects" do
+      expect(return_value).to be_kind_of(Array)
+      expect(return_value.size).to eq(2)
+      expect(return_value.first).to be_kind_of(Applicaster::Accounts::Account)
+    end
+
+    def return_value
+      @return_value ||= accounts_service.accounts
+    end
+
+    def stub_accounts_index_request
+      stub_request(:get, "https://accounts2.applicaster.com/api/v1/accounts.json").
+         with(query: { access_token: "client-credentials-token" }).
+         to_return(successful_json_response(mock_accounts_response))
+    end
+
+    def mock_accounts_response
+      [
+        {
+          id: "1-account-1",
+          name: "Account 1",
+        },
+        {
+          id: "2-account-2",
+          name: "Account 2",
+        },
+      ]
+    end
+  end
+
   def with_base_url(url)
     value_bofre, ENV["ACCOUNTS_BASE_URL"] = ENV["ACCOUNTS_BASE_URL"], url
     yield

data/spec/lib/applicaster/auth_helpers_spec.rb

@@ -99,20 +99,4 @@ RSpec.describe Applicaster::AuthHelpers do
       }
     }
   end
-
-  def stub_current_user_requests
-    stub_request(:get, "https://accounts2.applicaster.com/api/v1/users/current.json")
-      .with(query: { access_token: "valid-access-token" })
-      .to_return(successful_json_response(mock_user_response))
-
-    stub_request(:get, "https://accounts2.applicaster.com/api/v1/users/current.json")
-      .with(query: { access_token: "invalid-access-token" })
-      .to_return(status: 401, body: "")
-  end
-
-  def mock_user_response
-    {
-      id: "123"
-    }
-  end
 end

data/spec/support/webmock_stubs_helper.rb

@@ -4,18 +4,38 @@ module WebmockStubsHelper
   end
 
   def stub_client_credentials_request
-    stub_request(:post, "https://client_id:client_secret@accounts2.applicaster.com/oauth/token").
-       with(:body => {"grant_type"=>"client_credentials"}).
-       to_return(successful_json_response(access_token: "client-credentials-token"))
+    stub_request(:post, "https://client_id:client_secret@#{accounts_host}/oauth/token")
+      .with(:body => {"grant_type"=>"client_credentials"})
+      .to_return(successful_json_response(access_token: "client-credentials-token"))
   end
 
-    def successful_json_response(body)
-      {
-        status: 200,
-        body: body.to_json,
-        headers: {
-          "Content-Type" => "application/json"
-        }
+  def stub_current_user_requests
+    stub_request(:get, "https://#{accounts_host}/api/v1/users/current.json")
+      .with(query: { access_token: "valid-access-token" })
+      .to_return(successful_json_response(mock_user_response))
+
+    stub_request(:get, "https://#{accounts_host}/api/v1/users/current.json")
+      .with(query: { access_token: "invalid-access-token" })
+      .to_return(status: 401, body: "")
+  end
+
+  def accounts_host
+    "accounts2.applicaster.com"
+  end
+
+  def mock_user_response
+    {
+      id: "123"
+    }
+  end
+
+  def successful_json_response(body)
+    {
+      status: 200,
+      body: body.to_json,
+      headers: {
+        "Content-Type" => "application/json"
       }
-    end
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-applicaster
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Neer Friedman
@@ -140,7 +140,6 @@ files:
 - lib/applicaster/accounts/user.rb
 - lib/applicaster/auth_helpers.rb
 - lib/applicaster/sessions_controller_mixin.rb
-- lib/applicaster/user.rb
 - lib/omniauth-applicaster.rb
 - lib/omniauth-applicaster/version.rb
 - lib/omniauth/strategies/applicaster.rb

data/lib/applicaster/user.rb

@@ -1,37 +0,0 @@
-module Applicaster
-  class User
-    attr_accessor :user_json
-
-    def initialize(user_json)
-      @user_json = user_json.symbolize_keys
-    end
-
-    def id
-      user_json[:id]
-    end
-
-    def name
-      user_json[:name]
-    end
-
-    def email
-      user_json[:email]
-    end
-
-    def global_roles
-      user_json[:global_roles]
-    end
-
-    def permissions
-      user_json[:permissions]
-    end
-
-    def admin
-      user_json[:admin]
-    end
-
-    def admin?
-      !!admin
-    end
-  end
-end