jj-middleware 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e959ec144f88497c8f742f16d23957964a96aa41
-  data.tar.gz: c5cf533b9a706ef8fe6c1c0dce1142314abc0eb8
+  metadata.gz: 54113726efff4acd9e0bc11693bb9e6e420cc6d4
+  data.tar.gz: 38d9b764429f1d9ecd643d94c28587ca53d406ba
 SHA512:
-  metadata.gz: b5dec34b315931c2e3ac67bc20acfe672f56d4a6d14d3ff6cfa3d86c04a035aa50d7df9e63c810d6dbd79b2a4465ea51a17f0aaa6ae1f7eeba102017e43b5a42
-  data.tar.gz: 852538ad599e95875aea8353789d50e06da36f659d184279f8b0524fe61d4e9b0c539d9aa5cb1a5f28294de72717343eb8b185513cdcc172d82cdb1f16763e3d
+  metadata.gz: ae7b8fec145fd36d705c99147e52deae4b6428b164b6a86f2b2bdcf7fb0801f08f28654dbd29dbfb8c5a81d3281fb22ccce075d8c2e6b9fd84e9252c51dafdbf
+  data.tar.gz: 8f26c9470e0579cb39b7d87a0096612e16f7ded51ba3a2bf4941db02fad4686e7eaf01d79937ca1870dce3d6498cb8c4c4caedf66bcbc6679d14a113f0337528

data/lib/jj/middleware.rb

@@ -1,5 +1,5 @@
 module JJ
   module Middleware
-    VERSION = "0.3.1".freeze
+    VERSION = "0.4.0".freeze
   end
 end

data/lib/jj/middleware/auth.rb

@@ -27,8 +27,8 @@ module JJ
           return false
         end
 
-        unless user.id && user.email && user.model
-          log.warn("[JJ::Auth] User ID/Email/Model doesn't exist in session.")
+        unless user.id && user.email
+          log.warn("[JJ::Auth] User ID/Email doesn't exist in session.")
           return false
         end
 

data/lib/jj/middleware/onboarding.rb

@@ -10,21 +10,17 @@ module JJ
       end
 
       def call(env)
-        sess = Session.new(env).fetch("user")
+        sess = Session.new(env)
+        user = sess.fetch("user")
 
-        if sess.nil?
-          log.warn("[JJ::Onboarding] Session does not exist.")
-          return redirect("/login")
-        end
-
-        unless user_exist?(sess.id)
+        unless user_exist?(user.id)
           log.info("[JJ::Onboarding] User record not yet created.")
-          create_user!(sess.id)
-          log.info("[JJ::Onboarding] Redirect to Onboarding.")
+          record = create_user!(user.id)
+          sess.set_model(record)
           return redirect("/onboarding")
         end
 
-        unless sess.model.onboarded
+        unless user.model.onboarded
           log.info("[JJ::Onboarding] User yet to complete onboarding.")
           return redirect("/onboarding")
         end
@@ -35,8 +31,8 @@ module JJ
       private
 
       def create_user!(user_id)
-        Wes::Data::API::CreatorUser.create(:auth0_id => user_id)
         log.info("[JJ::Onboarding] Created user record.")
+        Wes::Data::API::CreatorUser.create(:auth0_id => user_id)
       end
 
       def user_exist?(user_id)

data/lib/jj/middleware/session.rb

@@ -14,6 +14,10 @@ module JJ
           return s[key] unless key.nil?
         end
       end
+
+      def set_model(record)
+        @env["rack.session"].to_hash["user"].model = record
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jj-middleware
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - ''