jj-middleware 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b41b197664e0fd6b79b8ff386ab11cf947ee358e
-  data.tar.gz: 05591a4106897935b6e1d008ccc149cec7c1ba5d
+  metadata.gz: b0c8817a2816a94bcd4485e8eb2567487861ce42
+  data.tar.gz: 653ff3a437c77d6d042972f3759cea3f8cd3ab61
 SHA512:
-  metadata.gz: 2549bc8ba1cfea0f9e45ca7f54aa90b4a461cc8627c49ebd7ad201c263af46579d194d48048e4f1eefe62bd0fda0fb8fd51d6b9fb15d50623e27e5e9487f1e27
-  data.tar.gz: db971e99686c62ef3bc93ac1c52fb437110b1642a32f69d3f791798e1b03c7df30c4c5c6e01d70812fd02e4ac62aac96a786b019e9665692621c3fa8b9719af2
+  metadata.gz: b1ee907a2e37923a147804fae15a720628bd38bbb7c8a9f95ed8ed5b76b4add1d8b112b33c272a6c99b1b01c7291ccb812254c4e343556b2a37da8b68d074e6a
+  data.tar.gz: 873935f4e6e40a7efb442f861bc9e7ed4c39ddccd015367224a2083d52bc3012fe14cf6f66a7aea4b5d72fe95076b15dd4f9752029fd769be04ddce4d228fe03

data/jj-middleware.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency "json"
+  spec.add_dependency "wes-data-api", "~> 5"
 end

data/lib/jj/middleware/auth.rb

@@ -1,4 +1,5 @@
 require "jj/middleware/base"
+require "jj/middleware/session"
 
 module JJ
   module Middleware
@@ -8,18 +9,16 @@ module JJ
       end
 
       def call(env)
-        logged_in?(env) ? @app.call(env) : redirect
+        sess = Session.new(env)
+        logged_in?(sess) ? @app.call(env) : redirect("/login")
       end
 
       private
 
-      def logged_in?(env)
-        s = session(env)
-        s && s["user"] && s["user"].email && s["user"].data_api
-      end
-
-      def redirect
-        [302, { "Location" => "/login", "Content-Type" => "text/html" }, []]
+      def logged_in?(sess)
+        return false unless sess.exist?
+        user = sess.fetch("user")
+        user && user.id && user.email && user.data_api
       end
     end
   end

data/lib/jj/middleware/base.rb

@@ -3,8 +3,8 @@ module JJ
     class Base
       protected
 
-      def session(env)
-        env["rack.session"].to_hash
+      def redirect(path, code = 302)
+        [code, { "Location" => path, "Content-Type" => "text/html" }, []]
       end
     end
   end

data/lib/jj/middleware/onboarding.rb

@@ -0,0 +1,42 @@
+require "jj/middleware/base"
+require "jj/middleware/session"
+require "wes/data/api/creator_user"
+
+module JJ
+  module Middleware
+    class Onboarding < Base
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        sess = Session.new(env).fetch("user")
+
+        if sess.nil?
+          return redirect("/login")
+        end
+
+        unless user_exist?(sess.id)
+          create_user!(sess.id)
+          return redirect("/onboarding")
+        end
+
+        complete = sess.data_api["onboarding_complete"]
+        return redirect("/onboarding") unless complete
+
+        @app.call(env)
+      end
+
+      private
+
+      def create_user!(user_id)
+        Wes::Data::API::CreatorUser.create(:auth0_id => user_id)
+      end
+
+      def user_exist?(user_id)
+        user = Wes::Data::API::CreatorUser.find(:id, user_id)
+        user && (user.auth0_id == user_id)
+      end
+    end
+  end
+end

data/lib/jj/middleware/session.rb

@@ -0,0 +1,19 @@
+module JJ
+  module Middleware
+    class Session
+      def initialize(env)
+        @env = env
+      end
+
+      def exist?
+        @env.key?("rack.session")
+      end
+
+      def fetch(key = nil)
+        @env["rack.session"].to_hash.tap do |s|
+          return s[key] unless key.nil?
+        end
+      end
+    end
+  end
+end

data/lib/jj/middleware.rb

@@ -1,5 +1,5 @@
 module JJ
   module Middleware
-    VERSION = "0.1.0".freeze
+    VERSION = "0.2.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jj-middleware
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wes-data-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: 
 email:
 - ''
@@ -92,6 +106,8 @@ files:
 - lib/jj/middleware.rb
 - lib/jj/middleware/auth.rb
 - lib/jj/middleware/base.rb
+- lib/jj/middleware/onboarding.rb
+- lib/jj/middleware/session.rb
 homepage: ''
 licenses: []
 metadata: {}