simply_auth 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eee7f12215a55da586805281fcef95295c81f71
-  data.tar.gz: 0f116bbfa9e6b7e473b4f07c81619d7ecf668f2d
+  metadata.gz: a571fc9014ad945181c6bdf7be79bd56b3f9b340
+  data.tar.gz: 1176b358d6a9c819c7f8398f09757048c34c4688
 SHA512:
-  metadata.gz: bf9a8642239c96b488d94a83654682580584f615ec6a0dafb7f0192b9d95176e2a3041a62fdeeb92e2c03a9ef0cd0c1d69b4a79cbdc9948fddb218f2e2818b75
-  data.tar.gz: a1fcdd2107a340214154e9faca3e59e3dc22fcc7966dd64949896772a4508e1b91af32172a098f1414f3e37cebf6dc05726a270f9ad3461639b0535d3208b2b2
+  metadata.gz: 97ebeecba79b67a5bc90991884a9acaf2dab4860c8471e727fa452c002046c1778b106aa0985d5aa56a514f653adf50fff5230781b1561e4e02a29f51e3dfc1c
+  data.tar.gz: a76810f18f67fa8a72e65dc1ac78451b1045f6b57986b42d3ffb7bfc7c3ea11a37585444265d373e99822a848e52639f1ed5992db2266754047c862c673860f0

data/app/controllers/simply_auth/registrations_controller.rb

@@ -4,19 +4,17 @@ module SimplyAuth
       @user = SimplyAuth::User.new
     end
 
+    def after_registration(user); end
+
     def create
       @user = SimplyAuth::User.new(user_params)
       if @user.save
-        # account_name = @user.data.company_name
-        # account_name = @user.name if account_name.blank?
-        # account = Account.create(name: account_name)
-        # @user.data.account_id = account.id
-        # @user.save
+        after_registration(@user)
 
         @session = SimplyAuth::Session.new(email: user_params[:email], password: user_params[:password])
         @session.save
         session[:simply_auth_session_id] = @session.id
-        redirect_to :root
+        redirect_to "/"
       else
         render :new
       end
@@ -25,7 +23,7 @@ module SimplyAuth
     private
 
     def user_params
-      params.require(:simply_auth_user).permit(:name, :email, :password, data: params[:simply_auth_user][:data].keys)
+      params.require(:user).permit(:name, :email, :password, data: params[:user][:data].try(:keys))
     end
   end
 end

data/app/controllers/simply_auth/sessions_controller.rb

@@ -8,7 +8,7 @@ module SimplyAuth
       @session = SimplyAuth::Session.new(session_params)
       if @session.save
         session[:simply_auth_session_id] = @session.id
-        redirect_to :root
+        redirect_to main_app.root_path
       else
         render :new
       end
@@ -17,13 +17,13 @@ module SimplyAuth
     def destroy
       current_session.destroy
       session.destroy
-      redirect_to :root
+      redirect_to main_app.root_path
     end
 
     private
 
     def session_params
-      params.require(:simply_auth_session).permit(:email, :password)
+      params.require(:session).permit(:email, :password)
     end
   end
 end

data/app/models/simply_auth/api_key.rb

@@ -0,0 +1,28 @@
+module SimplyAuth
+  class ApiKey < Model
+    attr_accessor :name, :id, :secret
+
+    def attributes
+      super.merge(name: name, id: id, secret: secret)
+    end
+
+    def self.all
+      response = RestClient.get(
+        "https://api.simplyauth.com#{collection_path}",
+        accept: :json
+      )
+      body = JSON.parse(response.body)
+      body.map do |data|
+        data = data.deep_transform_keys { |key| key.to_s.underscore }
+        new(data)
+      end
+    end
+
+    def destroy
+      RestClient.delete(
+        "https://api.simplyauth.com#{instance_path}",
+        accept: :json
+      )
+    end
+  end
+end

data/app/models/simply_auth/model.rb

@@ -5,6 +5,19 @@ module SimplyAuth
     include ActiveModel::Conversion
     attr_accessor :id
 
+    def initialize(*args)
+      super(*args)
+      @persisted = false
+    end
+
+    def persisted?
+      @persisted
+    end
+
+    def persisted=(val)
+      @persisted = val
+    end
+
     def data
       @data ||= OpenStruct.new
     end
@@ -20,24 +33,36 @@ module SimplyAuth
     end
 
     def attributes
-      {id: id, data: data}
+      {id: id, data: data.to_h}
     end
 
     def save
       if valid?
+        Rails.logger.error([
+          persisted? ? :patch : :post,
+          "https://api.simplyauth.com#{persisted? ? instance_path : collection_path}",
+          attributes.to_json,
+          {accept: :json,
+          content_type: :json}
+        ].inspect)
         response = RestClient.send(
           persisted? ? :patch : :post,
-          "https://api.simplyauth.com#{instance_path}",
+          "https://api.simplyauth.com#{persisted? ? instance_path : collection_path}",
           attributes.to_json,
           accept: :json,
           content_type: :json
         )
+        Rails.logger.error("3")
         body = JSON.parse(response.body)
         body = body.deep_transform_keys { |key| key.to_s.underscore }
+        Rails.logger.error("4")
         self.attributes = body
         changes_applied
+        self.persisted = true
+        Rails.logger.error("5")
         true
       else
+        Rails.logger.error("6")
         false
       end
     end
@@ -57,6 +82,10 @@ module SimplyAuth
       nil
     end
 
+    def owner_id
+      nil
+    end
+
     def self.collection_path(owner_ids = [])
       ids = [ids].flatten
       if self.owner_class
@@ -66,16 +95,28 @@ module SimplyAuth
       end
     end
 
+    def collection_path
+      if owner_id
+        self.class.collection_path(owner_id)
+      else
+        self.class.collection_path
+      end
+    end
+
     def instance_path
-      self.class.instance_path(id)
+      if owner_id
+        self.class.instance_path([owner_id, id])
+      else
+        self.class.instance_path(id)
+      end
     end
 
     def self.instance_path(ids = [])
       ids = [ids].flatten
       if self.owner_class
-        "#{self.owner_class.instance_path(ids.first(ids.length - 1))}/#{path_component}/#{ids.last}"
+        "#{self.owner_class.instance_path(ids.first(ids.length - 1))}/#{path_component}/#{ERB::Util.url_encode(ids.last)}"
       else
-        "/#{path_component}/#{ids.last}"
+        "/#{path_component}/#{ERB::Util.url_encode(ids.last)}"
       end
     end
 
@@ -86,7 +127,15 @@ module SimplyAuth
       )
       body = JSON.parse(response.body)
       body = body.deep_transform_keys { |key| key.to_s.underscore }
-      new(body)
+      new(body).tap do |r|
+        r.persisted = true
+      end
+    end
+
+    def self.create(attributes={})
+      r = new(attributes)
+      r.save()
+      r
     end
   end
 end

data/app/models/simply_auth/user.rb

@@ -3,11 +3,15 @@ module SimplyAuth
     attr_accessor :name, :email, :password, :user_pool_id
     validates :name, presence: true
     validates :email, format: /[^@]+@[^@]+/
-    validates :password, length: 6..72
+    validates :password, length: 6..72, if: :password
     def attributes
       super.merge(name: name, email: email, password: password)
     end
 
+    def owner_id
+      self.user_pool_id
+    end
+
     def self.owner_class_name
       "UserPool"
     end

data/lib/simply_auth/controller_helpers.rb

@@ -1,7 +1,7 @@
 module SimplyAuth
   module ControllerHelpers
     def current_session
-      SimplyAuth::Session.find(session[:simply_auth_session_id]) if session[:simply_auth_session_id]
+      Thread.current[:simply_auth_session] ||= find_session
     end
 
     def user_logged_in?
@@ -16,9 +16,17 @@ module SimplyAuth
       if user_logged_in?
         true
       else
-        redirect_to new_session_path
+        redirect_to simply_auth.new_session_path
         false
       end
     end
+
+    def find_session
+      begin
+        SimplyAuth::Session.find(session[:simply_auth_session_id]) if session[:simply_auth_session_id]
+      rescue RestClient::NotFound
+        nil
+      end
+    end
   end
 end

data/lib/simply_auth/engine.rb

@@ -6,6 +6,14 @@ module SimplyAuth
       ActiveSupport.on_load(:action_controller) do
         include SimplyAuth::ControllerHelpers
         helper_method :user_logged_in?, :current_user
+        
+
+        before_action do
+          Thread.current[:simply_auth_session] = nil
+        end
+        after_action do
+          Thread.current[:simply_auth_session] = nil
+        end
       end
     end
   end

data/lib/simply_auth/version.rb

@@ -1,3 +1,3 @@
 module SimplyAuth
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simply_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Fogle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,6 +57,7 @@ files:
 - app/helpers/simply_auth/application_helper.rb
 - app/jobs/simply_auth/application_job.rb
 - app/mailers/simply_auth/application_mailer.rb
+- app/models/simply_auth/api_key.rb
 - app/models/simply_auth/config.rb
 - app/models/simply_auth/model.rb
 - app/models/simply_auth/session.rb