cohesive_marketplace_middleware 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a34773a0133414482f6c51355c2fed3e3a74c115a5c7029311f93273983444a7
-  data.tar.gz: 13bd370b078dafd52eabb562df66580decd46c69916ff9a315128cc116329847
+  metadata.gz: 7f25619e09f201a527087188d66b5f91ceb0a7070c76cfca92db3a39c6c5d4b8
+  data.tar.gz: 4624f274f1b9f529af6dd91de378dc193f70c1784c253a1d8a20698eb4913e2e
 SHA512:
-  metadata.gz: e7882e14c2094dd1dd41d946596451144b6b2508a0e65af24a3e427257f9820217f9e0fd2c11f1474bcf9743012ddcd6ddd6f928d7ca9dbbdc978fb234cde5e8
-  data.tar.gz: 949f6ea4cda78f97492afffe2e17bb49db5274b84f68b4d530d533eba603d9058972a25146e48970d4f95cfbfa4e1c212cd5b6e7f9998f8e45e4c073c4d08021
+  metadata.gz: 05fc7672e47b2245f696d5422a5477c889694a7e1fafedfe091299f480b4ed51275fe08b4df6b09a2d6adc08b4cc58d56a8ad6607440b794d849d06af0f427a4
+  data.tar.gz: e838506ef7409bbe62797c21dc7dc3cd373f6d8ef0261236dd97d080b723a91ce66e48f7bd5e7ef53030cfd434f9532b45165aacd2b8492abacd20a1d97b6abe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cohesive_marketplace_middleware (0.1.4)
+    cohesive_marketplace_middleware (0.1.5)
       cohesive_marketplace_sdk (~> 0.1.1, >= 0.1.1)
       jwt (~> 1.5, >= 1.5.0)
 

data/lib/cohesive_marketplace_middleware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CohesiveMarketplaceMiddleware
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/cohesive_marketplace_middleware.rb

@@ -9,15 +9,19 @@ COHESIVE_MIDDLEWARE_LOGIN_PATH = "COHESIVE_MIDDLEWARE_LOGIN_PATH"
 COHESIVE_MIDDLEWARE_LOGIN_PATH_DEFAULT = "/cohesive_login"
 
 module CohesiveMarketplaceMiddleware
-  def getCohesiveAuthDetails(env)
+  def self.get_cohesive_auth_details(env)
     env[AUTH_DETAILS_ENV_KEY]
   end
 
-  def collect_ignore_paths
+  def self.collect_ignore_paths
     # Get the path prefixes to ignore from an environment variable.
     ignore_path_prefix_string = ENV[COHESIVE_MIDDLEWARE_IGNORE_PATH_PREFIX]
-    # Split the prefixes into an array.
-    result = ignore_path_prefix_string.split(",")
+    result = []
+    if ignore_path_prefix_string && ignore_path_prefix_string != "nil"
+      # Split the prefixes into an array.
+      result = ignore_path_prefix_string.split(",")
+    end
+
     # Output some information for debugging.
     puts("Cohesive middleware ignoring paths: ", result)
     result
@@ -31,12 +35,12 @@ module CohesiveMarketplaceMiddleware
     # @return [void]
     def initialize(app)
       @app = app
-      @ignore_paths = collect_ignore_paths
+      @ignore_paths = CohesiveMarketplaceMiddleware.collect_ignore_paths
     end
 
     def call(env)
       # Check if the current path should be ignored.
-      if !(@ignore_paths.any? { |prefix| env["REQUEST_PATH"].start_with?(prefix) })
+      if !(@ignore_paths.any? { |prefix| env["REQUEST_PATH"] && env["REQUEST_PATH"].start_with?(prefix) })
         authorization_header = env["HTTP_AUTHORIZATION"]
         if authorization_header&.start_with?("Bearer ")
           token = authorization_header.sub("Bearer ", "")
@@ -62,17 +66,17 @@ module CohesiveMarketplaceMiddleware
     # @return [void]
     def initialize(app)
       @app = app
-      @ignore_paths = collect_ignore_paths
+      @ignore_paths = CohesiveMarketplaceMiddleware.collect_ignore_paths
 
       # Get the login redirect URI from an environment variable.
       @redirect_uri = ENV[COHESIVE_MIDDLEWARE_LOGIN_PATH]
       # Set a default URI if the environment variable is not set.
-      if @redirect_uri == ""
+      if !@redirect_uri || @redirect_uri == ""
         @redirect_uri = COHESIVE_MIDDLEWARE_LOGIN_PATH_DEFAULT
       end
 
       # Add the login redirect URI to the list of ignored paths.
-      @ignore_paths.append(@redirect_uri)
+      @ignore_paths = @ignore_paths.append(@redirect_uri)
 
       # Output some information for debugging.
       puts("Cohesive middleware login redirect: ", @redirect_uri)
@@ -85,7 +89,7 @@ module CohesiveMarketplaceMiddleware
     # @return [Array] A Rack-compatible response triplet.
     def call(env)
       # Check if the current path should be ignored.
-      if !(@ignore_paths.any? { |prefix| env["REQUEST_PATH"].start_with?(prefix) })
+      if !(@ignore_paths.any? { |prefix| env["REQUEST_PATH"] && prefix && env["REQUEST_PATH"].start_with?(prefix) })
         # Create a new request object.
         request = ActionDispatch::Request.new(env)
         # Get the authentication token from the cookie.
@@ -101,7 +105,7 @@ module CohesiveMarketplaceMiddleware
           end
         else
           # Redirect the user to the login page if the token is missing.
-          return [301, {"Location" => "/cohesive_login", "Content-Type" => "text/plain"}, ["token not in cookie"]]
+          return [301, {"Location" => COHESIVE_MIDDLEWARE_LOGIN_PATH_DEFAULT, "Content-Type" => "text/plain"}, ["token not in cookie"]]
         end
       end
       # Call the next middleware or application in the chain.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cohesive_marketplace_middleware
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Chinmay Relkar
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt