clerk-rails 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f72756f43933b36d6bfb6ef4cab2e0502ce66016736245e9c8c2aac0de2efab
-  data.tar.gz: a8b4f069a37a4cfb0011dcc36ff83118537bcfe589e28105c298abaee96ab0a1
+  metadata.gz: cafada07a7c556113d90ac25bde235e5cb482c59985eca672597d04bee71f52c
+  data.tar.gz: 373a270635cc36b2c894ea2824e47aa32d9deffe1cc105c69bb5543aafbb9dae
 SHA512:
-  metadata.gz: d5fba368e3b1113fc060cb89329ed71d8376526f2efc78a45baecfb820202811d4578ce3a951e5acb241f8654ce74c2cc31486aacbc0c7b65d254aeebcaafb0a
-  data.tar.gz: 32f1ae8f3a00f3df6150e6658df3616d07c5810bfa7b0430d6d746da5eafdfab89984acdb377d1acdfda2697757a227788eeb0013c26e51e3ea9c6abe8bd18e9
+  metadata.gz: 745d78b935c69a216c814b32187a3429893d394320d57a24dc77ab8ddae3cb1a36cfc07fc0b7d37c0433d857f07d2d609a59486b38e21ba024336f17a1d2a19b
+  data.tar.gz: aa9781a39510692c074b20fe30304f36e74e3781eabbbbaf1ec5b8cca046719e8592d355d1a398e085b316e17eb50e1a221ed79c2facd7b041f8321818cd0fe2

data/app/controllers/clerk/application_controller.rb

@@ -1,15 +1,4 @@
 module Clerk
   class ApplicationController < ActionController::Base
-    def remote_cookie_accessor
-      # TODO: Only drop cookie if signature verifies
-      # TODO: Hide route entirely if client doesn't use remote cookies
-      cookie_domain = (request.host.include?(".") ? ".#{request.host}" : nil)
-      if params[:value].blank?
-        cookies.delete :clerk_session, domain: cookie_domain
-      else
-        cookies[:clerk_session] = {value: params[:value], domain: cookie_domain, expires: 20.years}
-      end
-      redirect_to params[:redirect]
-    end
   end
 end

data/config/initializers/add_application_helpers.rb

@@ -1,2 +1,4 @@
-::ActionController::Base.send :helper, Clerk::Helpers
-::ActionController::Base.send :include, Clerk::Helpers
+::ActionController::Base.send :helper, Clerk::Helpers::View
+::ActionController::Base.send :include, Clerk::Helpers::Controller
+::ActionController::Base.send :helper, Clerk::Helpers::ViewAndController
+::ActionController::Base.send :include, Clerk::Helpers::ViewAndController

data/config/routes.rb

@@ -1,3 +1,2 @@
 Clerk::Engine.routes.draw do
-  get 'remote_cookie_accessor', to: 'clerk/application#remote_cookie_accessor'
 end

data/lib/clerk-rails.rb

@@ -72,7 +72,7 @@ module Clerk
       :app_host,
       :cipher_key,
       :database_url, 
-      :last_account, 
+      :email_address_verification,      
       :ngrok_authtoken, 
       :tunnel_cert, 
       :tunnel_key

data/lib/clerk/engine.rb

@@ -1,5 +1,8 @@
 module Clerk
   class Engine < ::Rails::Engine
+    isolate_namespace Clerk
+    engine_name "clerk"
+
     config.before_configuration do 
       if Rails.env.development?
         require 'dotenv'
@@ -7,19 +10,20 @@ module Clerk
       end
 
       if Clerk.key.nil?
-        raise "Clerk is installed but not configured.  Add your CLERK_KEY to the application root."
+        raise "Clerk is installed but not configured.  Set your CLERK_KEY as an environment variable."
       end
 
       begin
         config_data = Clerk.api.get('/api/environment').data
         Clerk.configure do |config|
-          config.accounts_host    = config_data[:ACCOUNTS_HOST]
-          config.app_host         = config_data[:APP_HOST]
-          config.cipher_key       = config_data[:CIPHER_KEY]
-          config.database_url     = config_data[:DATABASE_URL]
-          config.ngrok_authtoken  = config_data[:NGROK_AUTHTOKEN]
-          config.tunnel_cert      = config_data[:TUNNEL_CERT]
-          config.tunnel_key       = config_data[:TUNNEL_KEY]
+          config.accounts_host              = config_data[:ACCOUNTS_HOST]
+          config.app_host                   = config_data[:APP_HOST]
+          config.cipher_key                 = config_data[:CIPHER_KEY]
+          config.database_url               = config_data[:DATABASE_URL]
+          config.email_address_verification = config_data[:EMAIL_ADDRESS_VERIFICATION]
+          config.ngrok_authtoken            = config_data[:NGROK_AUTHTOKEN]
+          config.tunnel_cert                = config_data[:TUNNEL_CERT]
+          config.tunnel_key                 = config_data[:TUNNEL_KEY]
         end
       rescue => e
         raise "Clerk could not be loaded. #{e} #{config_data}"
@@ -30,5 +34,25 @@ module Clerk
         Clerk::Tunnel.start!
       end
     end
+
+    accounts_routes = {
+      sign_out:             "/sign_out",
+      sign_in:              "/",
+      sign_up:              "/sign_up",
+      verify_email_address: "/verify_email_address",
+    }
+
+
+    initializer 'clerk.configuration' do |app|
+      app.routes.append do
+        mount Clerk::Engine => "/"
+
+        accounts_routes.each do |k, v|
+          direct k do
+            "#{Clerk.accounts_url}#{v}"
+          end
+        end
+      end
+    end        
   end
 end

data/lib/clerk/helpers.rb

@@ -3,35 +3,47 @@
 # https://stackoverflow.com/questions/29636334/a-copy-of-xxx-has-been-removed-from-the-module-tree-but-is-still-active
 module Clerk
   module Helpers
-    def current_account
-      if cookies[:clerk_session]
-        @clerk_current_account ||= SessionToken.find_account(
-          cookie: cookies[:clerk_session]
-        )
-      elsif request.headers['Authorization']
-        token = request.headers['Authorization'].slice(7..-1)
-        @clerk_current_account ||= SessionToken.find_account(
-          cookie: token
-        )
-      else
-        return nil
-      end
+    module View
     end
 
-    def clerk_sign_out_path
-      "#{Clerk.accounts_url}/sign_out"
+    module Controller
+      def authenticate_account!
+        if account_signed_in?
+          if Clerk.config.email_address_verification == "forced" and !current_account.verified_email_address
+            redirect_to verify_email_address_url and return
+          end
+        else
+          redirect_to sign_in_url and return
+        end
+      end
     end
 
-    def clerk_sign_in_path
-      "#{Clerk.accounts_url}"
-    end
+    module ViewAndController
+      def account_signed_in?
+        !current_account.nil?
+      end
 
-    def clerk_sign_up_path
-      "#{Clerk.accounts_url}/sign_up"
-    end
+      def current_account
+        @clerk_current_account ||= begin
+          if cookies[:clerk_session]
+            SessionToken.find_account(
+              cookie: cookies[:clerk_session]
+            )
+          elsif request.headers['Authorization']
+            token = request.headers['Authorization'].slice(7..-1)
+            SessionToken.find_account(
+              cookie: token
+            )
+          else
+            nil
+          end
+        end
+      end     
 
-    def clerk_add_card_path(account_id:, redirect_path:)
-      "#{Clerk.accounts_url}/add_card?account_id=#{account_id}&redirect_path=#{redirect_path}"
+      # def clerk_add_card_path(account_id:, redirect_path:)
+      #   "#{Clerk.accounts_url}/add_card?account_id=#{account_id}&redirect_path=#{redirect_path}"
+      # end
     end
+
   end
 end

data/lib/clerk/tunnel.rb

@@ -65,6 +65,8 @@ module Clerk
       end
 
       File.delete(ngrok_zip_path) 
+
+      puts "=> [Clerk] Setup done."
     end
 
     def self.save_tunnel_cert_locally!
@@ -75,13 +77,12 @@ module Clerk
 
     def self.start!
       if Clerk.config.tunnel_cert == nil || Clerk.config.tunnel_key == nil
-        raise "=> Sorry, your dev certificate isn't ready yet.  It may take up to 30 minutes to create."
+        raise "=> [Clerk] Sorry, your dev certificate isn't ready yet.  It may take up to 30 minutes to create."
       end
 
       save_tunnel_cert_locally!
 
       setup_ngrok! unless ngrok_ready?
-      puts "=> [Clerk] Setup done."
 
       self.patch_rack_requests
 
@@ -183,6 +184,8 @@ module Clerk
               fetch_urls
             end
 
+            puts " ngrok logging to #{@params[:log].path}"
+
             @status = :running
             @ngrok_url.gsub("tls", "https")
           end  

data/lib/clerk/version.rb

@@ -1,3 +1,3 @@
 module Clerk
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clerk-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Clerk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails