strongmind-auth 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0de84646fc0bb458a34c17e3b6ba8e8f5754252cb5da1957822e75a7c52d4f
-  data.tar.gz: 3f944f111eb1b254ed97a13baf7b5e0d74401bb4edce2326ed36a94742af4499
+  metadata.gz: 5f8024e8a6ede6f16c3ab5a900c19e0aa736a703ac36d6668287b2a27ec61928
+  data.tar.gz: 7d63c841f85f811124902d077989ea5bc683923258048164f10d85f79ca41b06
 SHA512:
-  metadata.gz: cbba7ce9b16417331e9ec33a7b25225bb2ff3d3bc9651ac36936543197f1e95caec5c842100965b6564150c92015d46af23dfab26999db0f4847755d112eb775
-  data.tar.gz: 48fa3ec4e620252c4f1dfb88cd3f58df46f0054defe2f348d3282cfde28dc58829b628b6dfa5f054c5e2681b105b92b31e5c984a5711fdb68cfd1abd5b6cc7f0
+  metadata.gz: 836af65fff974d2ec9b16166a72e0203f41eb7a3b59cee6054bd32b53fb7e1980b6e9f4295586731a54ab20c20d5205ba4a91687cdfe68c01d269d979d74bbd3
+  data.tar.gz: d4195a3e2c67eeb856e6374d0d9386af87001fa730708ba578b3f3a92ee7a15b26fd3965df6597f91680ce660744d1642f2cb1b931937e3bdc609229fe905e93

data/app/controllers/concerns/jwt_utilities.rb

@@ -72,7 +72,7 @@ module JwtUtilities
   def validate_tokens(tokens)
     return unless tokens[:error] == 'invalid_grant' || !tokens[:refresh_token]
 
-    raise RefreshTokenExpired, tokens[:error]
+    raise Strongmind::Exceptions::RefreshTokenExpired, tokens[:error]
   end
 
   def generate_tokens(session_data)

data/app/controllers/concerns/strong_mind_nav.rb

@@ -1,4 +1,5 @@
 require "strongmind/common_nav_fetcher"
+require "strongmind/exceptions"
 
 module StrongMindNav
   extend ActiveSupport::Concern
@@ -10,7 +11,7 @@ module StrongMindNav
       @top_navbar_html = navbar[:top_navbar_html]
       @bottom_navbar_html = navbar[:bottom_navbar_html]
       @theme_css = navbar[:theme_css]
-    rescue Strongmind::CommonNavFetcher::TokenNotFoundError, Strongmind::CommonNavFetcher::UserNotFoundError => e
+    rescue Strongmind::Exceptions::TokenNotFoundError, Strongmind::Exceptions::UserNotFoundError => e
       Sentry.capture_exception(e)
       Rails.logger.error(e)
       flash[:alert] = e.inspect if Rails.env.development?
@@ -18,6 +19,7 @@ module StrongMindNav
       render 'logins/index'
     rescue Exception => e
       Sentry.capture_exception(e)
+      Rails.logger.error(e)
       @top_navbar_html = render_to_string(partial: 'layouts/loading_navbar').html_safe
     end
   end

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -10,6 +10,8 @@ module Users
       User.auth_token_cache = auth
       @user = User.with_credentials(auth)
 
+      render plain: "You do not have permission to access this application.", status: :unauthorized and return if @user.nil?
+
       session[:refresh_token] = request.env['omniauth.auth'].credentials['refresh_token']
       flash.delete(:notice)
 

data/app/controllers/users/sessions_controller.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 module Users
-  class RefreshTokenExpired < StandardError
-  end
 
   class SessionsController < Devise::SessionsController
     include JwtUtilities

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-
+require "strongmind/exceptions"
 require 'platform_sdk'
 
 module Strongmind
@@ -9,12 +9,8 @@ module Strongmind
 
     include Rails.application.routes.url_helpers
 
-    class TokenNotFoundError < StandardError; end
-
-    class UserNotFoundError < StandardError; end
-
     def initialize(user, request)
-      raise UserNotFoundError, 'User not found' unless user.present?
+      raise Strongmind::Exceptions::UserNotFoundError, 'User not found' unless user.present?
       raise ArgumentError, 'Request not found' unless request.present?
 
       @user = user
@@ -54,7 +50,7 @@ module Strongmind
       cache_data = Rails.cache.fetch(user.uid)
       cache_missing_message = " - check your caching settings (switch to file or redis)" if Rails.env.development?
       unless cache_data&.key?(:access_token)
-        raise TokenNotFoundError, "Token not found for user #{user.uid}#{cache_missing_message}"
+        raise Strongmind::Exceptions::TokenNotFoundError, "Token not found for user #{user.uid}#{cache_missing_message}"
       end
 
       cache_data[:access_token]
@@ -83,14 +79,12 @@ module Strongmind
     end
 
     def nav_item_data(item)
-      url = send(item[:path_method])
+      url = item[:url]
       {
         name: item[:name],
         icon: item[:icon],
-        url:,
-        is_disabled: item[:feature_flag] ? !user.feature_flag_enabled?(item[:feature_flag]) : false,
-        is_active: current_page?(url),
-        is_external: false
+        url: url,
+        is_active: current_page?(url)
       }
     end
   end

data/lib/strongmind/exceptions.rb

@@ -0,0 +1,9 @@
+module Strongmind
+  module Exceptions
+    class TokenNotFoundError < StandardError; end
+
+    class UserNotFoundError < StandardError; end
+
+    class RefreshTokenExpiredError < StandardError; end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Team Belding
@@ -128,6 +128,7 @@ files:
 - lib/strongmind/auth/engine.rb
 - lib/strongmind/auth/version.rb
 - lib/strongmind/common_nav_fetcher.rb
+- lib/strongmind/exceptions.rb
 - lib/tasks/rails/auth_tasks.rake
 - lib/tasks/strongmind/auth_tasks.rake
 homepage: https://www.strongmind.com