clerk-sdk-ruby 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f285e5ca6280db100eed30796279e412901f157a3fd43d16a41a64d9c0cd85f
-  data.tar.gz: 32d0fab6c78b57c0f06fa9d3ef077f077cb6533ada6a400f98bec6a087d939e8
+  metadata.gz: 348624d72466db1c264e0ba1044b4dcda33e1d7327791bc1732266d45a84ca00
+  data.tar.gz: 1f4732763f8b27000fc55949652bad8d8ed36b54bb52ee8d43c0875b9c61e272
 SHA512:
-  metadata.gz: 7721083974266f6b18c6ceb1e1a14abc623caad474a7fcf7a065aafa4ac51c11f732f12db257fa46e3f903a4c9985eb0e6c21e451d3ffc877b7f434ba482fe91
-  data.tar.gz: b6a5689badfc699d7d03accb5a301a3504adf8eae009ef450b462fee9a20f995c2ec255ec9b771175fd76209ba991544a51a9e8cd6f0a14f82d6342a922942fb
+  metadata.gz: de828320ec3e92b3e3d0b5b9f584058fff86fe8b632616fd82af3de5a5398c5459b747262deed243c83319641e5a294d0c01b30bd1714e4711d72007d3b5e722
+  data.tar.gz: e65292535f0d1fa5a0a01e24d832af97b467c8a563cff73c08eb64b54a9946440c2888bcf18125dbdc7fc7b97404aa69d85bb3e982b1a826567fa7e63affb25a

data/lib/clerk/authenticatable.rb

@@ -6,11 +6,11 @@ module Clerk
 
     protected
     def clerk_session
-      request.env["clerk_session"]
+      request.env["clerk"].session
     end
 
     def clerk_user
-      request.env["clerk_user"]
+      request.env["clerk"].user
     end
 
     def clerk_user_signed_in?

data/lib/clerk/rack_middleware.rb

@@ -8,48 +8,75 @@ module Clerk
 
     def call(env)
       req = Rack::Request.new(env)
-      token = req.cookies["__session"]
+      env["clerk"] = Proxy.new(env)
+      @app.call(env)
+    end
+  end
 
-      if token
-        sess_id = req.params["_clerk_session_id"]
-        begin
-          env["clerk_session"] = fetch_session(token, sess_id)
-        rescue Errors::Authentication => e
-          env["clerk_error"] = e
-        end
-      end
-      if sess = env["clerk_session"]
-        env["clerk_user"] = fetch_user(sess["user_id"])
+  class Proxy
+    attr_reader :session_id, :error
+    def initialize(env)
+      req = Rack::Request.new(env)
+      @token = req.cookies["__session"]
+      @session_id = req.params["_clerk_session_id"]
+      @session = nil
+      @user_id = nil
+      @user = nil
+    end
+
+    def session
+      return nil if @token.nil?
+      return @session if @session
+
+      begin
+        @session = fetch_session
+      rescue Errors::Authentication => e
+        @error = e
       end
-      @app.call(env)
+      @session
+    end
+
+    def user_id
+      @user_id ||= session.dig("user_id")
+    end
+
+    def user
+      return nil if session.nil?
+      @user ||= fetch_user(user_id)
+    end
+
+    def debug
+      (instance_variables - [:@sdk]).map do |ivar|
+        [ivar.to_s, instance_variable_get(ivar)]
+      end.to_h
     end
 
     private
-    def clerk_sdk
-      SDK.new
+    def sdk
+      @sdk ||= SDK.new
+    end
+
+    def cache_key
+      @cache_key ||= @token.split(".")[1]
     end
 
-    def fetch_session(token, sess_id)
-      cache_key = token.split(".")[1]
-      if sess_id
-        session = cached_fetch("clerk_session:#{sess_id}:#{cache_key}") do
-          sdk = clerk_sdk
-          sdk.sessions.verify_token(sess_id, token)
+    def fetch_session
+      if session_id
+        cached_fetch("clerk_session:#{session_id}:#{cache_key}") do
+          sdk.sessions.verify_token(session_id, @token)
         end
       else
-        session = cached_fetch("clerk_session:#{cache_key}") do
-          sdk = clerk_sdk
-          client = sdk.clients.verify_token(token)
-          sess_id = client["last_active_session_id"]
+        cached_fetch("clerk_session:#{cache_key}") do
+          client = sdk.clients.verify_token(@token)
+          @session_id = client["last_active_session_id"]
           client["sessions"].find do |sess|
-            sess["id"] == sess_id
+            sess["id"] == @session_id
           end
         end
       end
     end
 
     def fetch_user(user_id)
-      sdk = clerk_sdk
       cached_fetch("clerk_user:#{user_id}") do
         sdk.users.find(user_id)
       end

data/lib/clerk/railtie.rb

@@ -7,11 +7,5 @@ module Clerk
     initializer "clerk_railtie.configure_rails_initialization" do |app|
       app.middleware.use Clerk::RackMiddleware
     end
-
-    config.to_prepare do
-      Clerk.configure do |c|
-        c.middleware_cache_store ||= Rails.cache
-      end
-    end
   end
 end

data/lib/clerk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clerk
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clerk-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Clerk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,6 +44,7 @@ files:
 - lib/clerk.rb
 - lib/clerk/authenticatable.rb
 - lib/clerk/errors.rb
+- lib/clerk/proxy.rb
 - lib/clerk/rack_middleware.rb
 - lib/clerk/railtie.rb
 - lib/clerk/resources.rb