clerk-rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebd7434ec6b1e5d225ac7de149693f061e1204ca473ad4e17a5bfea5868a489
-  data.tar.gz: 5c75c18dad6e96ae75ef990eea3a1f37673153d91bc7c47b6885cc6d2a0ef885
+  metadata.gz: e595682c8db22e0199602650c5172b9e038576a93a00a86263a68b2bc3663d30
+  data.tar.gz: e61a165746679c0e148cd267e8a30acfc3f2de59c86e17829a0101e44eaf4874
 SHA512:
-  metadata.gz: 9b10930865c7a58a193845a2e5108915801142fb0172ea877e575481f9d44cfa8fd440bc30f7d15b8209166d06f1db6286f0721818a3f5ef39fb13b2904d1840
-  data.tar.gz: ec883cfa162d37fbf9aace0db5a43d011dd21ddc2dfd739a23b4e829054e1cb5bf54aeda39e865ba37ba84cc285c01635557a729a7282eb1cb507155f37438a7
+  metadata.gz: 2eeadea3edb895b7cc7e5ef12c4d1b82f605ee35429f860a968a73598d214b40349b971044bde01f7b38b44059147986cc2523987d4e97470bbe1c0b6f22a5e4
+  data.tar.gz: 5be6344c1ae185beeca74194a4d207fe35a58cec638fbfeab07cec18efd2660c08d01c0b81c3b84636864169fc545458b380e53ddb442d359d65d6e6436e7678

data/app/models/clerk/application_record.rb

@@ -4,7 +4,7 @@ module Clerk
     establish_connection Clerk.database_connection_url
     def self.clerk_table_name(table_name)
       version = Clerk::VERSION.split(".").map.with_index{|x, i| (i==2 ? "00" : x.rjust(2, '0')) }.join
-      "client.#{table_name}_#{version}_#{Clerk.key_secret}"
+      "instance.#{table_name}_#{version}_#{Clerk.key_secret}"
     end
 
     def self.clerk_table_name_nc(table_name)

data/config/initializers/patch_persistence.rb

@@ -37,5 +37,37 @@
     else
       _original_create_record(*args, &block)
     end
-  end        
+  end
+
+  alias_method :_original_update_row, :_update_row
+
+  def _clerk_update_row(attribute_names, attempted_action = "update")
+    response = self.class.clerk_persistence_api.patch(
+      "#{self.class.clerk_persistence_path}/#{id_in_database}", 
+      attributes_with_values(attribute_names).except("updated_at")
+    )
+
+    if response.status == 200
+      1 # Affected rows
+    elsif response.status == 422
+      response.data.each do |k, vs|
+        vs.each do |v|
+          self.errors.add(k, v)
+        end
+      end
+      raise ActiveRecord::RecordInvalid.new(self)
+    else
+      Rails.logger.fatal "Server Failed: #{response.data[:message]}"
+      raise ActiveRecord::RecordNotSaved.new("Failed to save the server record", self)
+    end
+  end
+
+  def _update_row(*args, &block)
+    if defined?(self.class.clerk_persistence_path)
+      _clerk_update_row(*args, &block)
+    else
+      _original_update_row(*args, &block)
+    end
+  end
+
 end

data/lib/clerk-rails.rb

@@ -51,6 +51,6 @@ module Clerk
   end
 
   class Configuration
-    attr_accessor :app_host, :accounts_host, :database_url, :tunnel_key, :environment, :session_mode, :last_account, :cookie_host
+    attr_accessor :app_host, :accounts_host, :database_url, :ngrok_authtoken, :environment, :session_mode, :last_account, :cookie_host, :tunnel_cert, :tunnel_key
   end
 end

data/lib/clerk/engine.rb

@@ -13,13 +13,15 @@ module Clerk
       begin
         config_data = Clerk.api.get('/api/environment').data
         Clerk.configure do |config|
-          config.app_host       = config_data[:APP_HOST]
-          config.accounts_host  = config_data[:ACCOUNTS_HOST]
-          config.database_url   = config_data[:DATABASE_URL]
-          config.tunnel_key     = config_data[:TUNNEL_KEY]
-        end        
+          config.app_host         = config_data[:APP_HOST]
+          config.accounts_host    = config_data[:ACCOUNTS_HOST]
+          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]
+        end
       rescue => e
-        raise "Clerk could not be loaded. #{config_data}"
+        raise "Clerk could not be loaded. #{e} #{config_data}"
       end
 
       if defined?(Rails::Server) and Rails.env.development?

data/lib/clerk/tunnel.rb

@@ -15,6 +15,7 @@ module Clerk
     def self.ngrok_path
       data_dir.join("clerk_#{executable_type}")
     end
+
     def self.ngrok_zip_path
       data_dir.join("clerk_#{executable_type}.zip")
     end
@@ -23,10 +24,6 @@ module Clerk
       data_dir.join("account.key")
     end
 
-    def self.ready?
-      crt_ready? and ngrok_ready?
-    end
-
     def self.crt_ready?
       File.exist? key_path and File.exist? crt_path
     end
@@ -35,12 +32,6 @@ module Clerk
       File.exist? ngrok_path
     end
 
-    def self.setup!
-      setup_crt! unless crt_ready?
-      setup_ngrok! unless ngrok_ready?
-      puts "=> [Clerk] Setup done."
-    end
-
     def self.setup_ngrok!
       ngrok_paths = {
         darwin_amd64: "/c/4VmDzA7iaHb/ngrok-stable-darwin-amd64.zip",
@@ -76,76 +67,20 @@ module Clerk
       File.delete(ngrok_zip_path) 
     end
 
-    def self.setup_crt!
-      puts "=> [Clerk] First boot detected. Initializing environment."
-      require 'acme-client'
-      require 'openssl'
-
-      Dir.mkdir(data_dir) unless Dir.exist? data_dir
-
-      puts "=> [Clerk] Authenticating with Let's Encrypt."
-      if File.exist? acc_path
-        acc_private_key = OpenSSL::PKey::RSA.new(File.read(acc_path))
-        client = ::Acme::Client.new(private_key: acc_private_key, directory: 'https://acme-v02.api.letsencrypt.org/directory')
-        client.kid #Load existing account
-      else 
-        acc_private_key = OpenSSL::PKey::RSA.new(4096)
-
-        client = ::Acme::Client.new(private_key: acc_private_key, directory: 'https://acme-v02.api.letsencrypt.org/directory')
-
-        account = client.new_account(contact: 'mailto:sidot3291@gmail.com', terms_of_service_agreed: true)
-        
-        File.write(acc_path, acc_private_key.to_pem)
-      end
-
-      puts "=> [Clerk] Beginning new certificate order for #{Clerk.config.app_host}."
-      order = client.new_order(identifiers: [Clerk.config.app_host])
-      challenge = order.authorizations.first.dns
-
-      puts "=> [Clerk] Completing DNS challenge."
-      record_name = "#{challenge.record_name}.#{Clerk.config.app_host.gsub(".clerkdev.com", "")}"      
-      config_data = Clerk.api.post('/api/acme_challenge', { 
-        name: record_name, 
-        type: challenge.record_type, 
-        content: challenge.record_content
-      })
-
-      puts "=> [Clerk] Waiting for DNS to process. This may take a few minutes."
-      confirm_url = URI.parse("https://dns.google.com/resolve?name=#{challenge.record_name}.#{Clerk.config.app_host}&type=TXT")
-      while true
-        confirm_check = JSON.parse(Net::HTTP.get(confirm_url))
-        break if confirm_check.dig("Answer", 0, "data")=="\"#{challenge.record_content}\""
-        sleep(5)
-        puts "=> [Clerk] Checking processing status..."
-      end
-
-      sleep(5) # Sometimes google returns correctly before.  Add an extra 10 seconds.
-      puts "=> [Clerk] Checking processing status..."
-      sleep(5)
-
-      puts "=> [Clerk] Validating DNS challenge."
-      challenge.request_validation
+    def self.save_tunnel_cert_locally!
+      File.write(crt_path, Clerk.config.tunnel_cert)
+      File.write(key_path, Clerk.config.tunnel_key)
+    end
 
-      while challenge.status == 'pending'
-        sleep(2)
-        puts "=> [Clerk] Checking validation status..."
-        challenge.reload
+    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."
       end
 
-      puts "=> [Clerk] Validation complete. Requesting certificate."
-      crt_private_key = OpenSSL::PKey::RSA.new(4096)
-      File.write(key_path, crt_private_key.to_pem)
-      
-      csr = Acme::Client::CertificateRequest.new(private_key: crt_private_key, subject: { common_name: Clerk.config.app_host })
-      order.finalize(csr: csr)
-      sleep(1) while order.status == 'processing'
+      save_tunnel_cert_locally!
 
-      File.write(crt_path, order.certificate)
-      puts "=> [Clerk] Certificate created."
-    end
-
-    def self.start!
-      setup! unless ready?
+      setup_ngrok! unless ngrok_ready?
+      puts "=> [Clerk] Setup done."
 
       self.patch_rack_requests
 
@@ -167,7 +102,7 @@ module Clerk
       puts "=> Booting https://#{Clerk.config.app_host} with Clerk"
       options = {
         addr: server_options[:Port],
-        authtoken: Clerk.config.tunnel_key,
+        authtoken: Clerk.config.ngrok_authtoken,
         hostname: Clerk.config.app_host,
         region: "us",
         crt: Rails.root.join(".clerk/dev.crt"),

data/lib/clerk/version.rb

@@ -1,3 +1,3 @@
 module Clerk
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

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