simply_auth 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a571fc9014ad945181c6bdf7be79bd56b3f9b340
-  data.tar.gz: 1176b358d6a9c819c7f8398f09757048c34c4688
+  metadata.gz: 19d39d6db1217f751baaf74b2fe5a026cd4640f1
+  data.tar.gz: 82598e3f989129584b8196b33ea9c104aa6b6d3c
 SHA512:
-  metadata.gz: 97ebeecba79b67a5bc90991884a9acaf2dab4860c8471e727fa452c002046c1778b106aa0985d5aa56a514f653adf50fff5230781b1561e4e02a29f51e3dfc1c
-  data.tar.gz: a76810f18f67fa8a72e65dc1ac78451b1045f6b57986b42d3ffb7bfc7c3ea11a37585444265d373e99822a848e52639f1ed5992db2266754047c862c673860f0
+  metadata.gz: 1f7b855c948a085af251243573d7f76baf879976b1a4732236ac082a876adb94e78047f42df04743db243a56a547695e234cf11f53c27b7e971005eef3087a13
+  data.tar.gz: 97b8c1a65cf492d7895aa28068841ec9fd65fc1c9bfe5502decb4c4b6d20b87e0e665ee524f4c8b4e9e25cdfcfbe57b11d2b0fe8df3ea736dc0d13f73da29105

data/app/models/simply_auth/model.rb

@@ -1,3 +1,5 @@
+require 'rest-client'
+
 module SimplyAuth
   class Model
     include ActiveModel::Model
@@ -38,38 +40,36 @@ module SimplyAuth
 
     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)
+        # Rails.logger.error([
+        #   persisted? ? :patch : :post,
+        #   "https://api.simplyauth.com#{persisted? ? instance_path : collection_path}",
+        #   {model_name.element.camelize(:lower) => attributes}.to_json,
+        #   {accept: :json,
+        #   content_type: :json}
+        # ].inspect)
         response = RestClient.send(
           persisted? ? :patch : :post,
           "https://api.simplyauth.com#{persisted? ? instance_path : collection_path}",
-          attributes.to_json,
+          {model_name.element.camelize(:lower) => attributes}.to_json,
           accept: :json,
           content_type: :json
         )
-        Rails.logger.error("3")
-        body = JSON.parse(response.body)
+        body = JSON.parse(response.body)[model_name.element.camelize(:lower)]
         body = body.deep_transform_keys { |key| key.to_s.underscore }
-        Rails.logger.error("4")
-        self.attributes = body
+        self.attributes = self.class.new.attributes.merge(body)
         changes_applied
         self.persisted = true
-        Rails.logger.error("5")
         true
       else
-        Rails.logger.error("6")
         false
       end
     end
 
     def self.owner_class
+      @owner_class_set ||= false
       return @owner_class if @owner_class_set
-      @owner_class = "SimplyAuth::#{self.owner_class_name}".constantize if self.owner_class_name
+      return nil unless self.owner_class_name
+      @owner_class = "SimplyAuth::#{self.owner_class_name}".constantize
       @owner_class_set = true
       @owner_class
     end
@@ -125,7 +125,7 @@ module SimplyAuth
         "https://api.simplyauth.com#{instance_path(ids)}",
         accept: :json
       )
-      body = JSON.parse(response.body)
+      body = JSON.parse(response.body)[model_name.element.camelize(:lower)]
       body = body.deep_transform_keys { |key| key.to_s.underscore }
       new(body).tap do |r|
         r.persisted = true

data/app/models/simply_auth/session.rb

@@ -1,6 +1,6 @@
 module SimplyAuth
   class Session < Model
-    attr_accessor :email, :password, :user
+    attr_accessor :email, :password, :user, :user_pool_id
     validates :email, format: /[^@]+@[^@]+/
     validates :password, length: 6..72
     def attributes
@@ -12,6 +12,9 @@ module SimplyAuth
     def self.owner_class_name
       "UserPool"
     end
+    def owner_id
+      user_pool_id
+    end
     def destroy
       response = RestClient.delete(
         "https://api.simplyauth.com#{instance_path}",

data/app/models/simply_auth/user.rb

@@ -1,9 +1,13 @@
 module SimplyAuth
   class User < Model
     attr_accessor :name, :email, :password, :user_pool_id
-    validates :name, presence: true
     validates :email, format: /[^@]+@[^@]+/
-    validates :password, length: 6..72, if: :password
+    validates :password, length: 6..72, if: :password_or_new_record?
+
+    def password_or_new_record?
+      password || !persisted?
+    end
+
     def attributes
       super.merge(name: name, email: email, password: password)
     end
@@ -21,7 +25,7 @@ module SimplyAuth
         "https://api.simplyauth.com#{collection_path(ids)}",
         accept: :json
       )
-      body = JSON.parse(response.body)
+      body = JSON.parse(response.body)[model_name.element.pluralize.camelize(:lower)]
       body.map do |data|
         data = data.deep_transform_keys { |key| key.to_s.underscore }
         new(data)

data/app/models/simply_auth/user_pool.rb

@@ -1,5 +1,6 @@
 module SimplyAuth
   class UserPool < Model
+    validates :name, presence: true
     attr_accessor :name
     def attributes
       super.merge(name: name)
@@ -18,7 +19,7 @@ module SimplyAuth
         "https://api.simplyauth.com#{collection_path}",
         accept: :json
       )
-      body = JSON.parse(response.body)
+      body = JSON.parse(response.body)[model_name.element.pluralize.camelize(:lower)]
       body.map do |data|
         data = data.deep_transform_keys { |key| key.to_s.underscore }
         new(data)

data/lib/simply_auth/version.rb

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

data/lib/simply_auth.rb

@@ -1,6 +1,20 @@
 require "simply_auth/engine"
 require "simply_auth/version"
 require "simply_auth/controller_helpers"
+require 'rest-client'
+require 'http_signatures'
 
 module SimplyAuth
 end
+
+RestClient.add_before_execution_proc do |req, args|
+  if req.uri.host == "api.simplyauth.com"
+    req["Date"] = Time.now.rfc822
+    req["Content-Length"] = args[:payload] ? args[:payload].length.to_s : "0"
+    HttpSignatures::Context.new(
+      keys: {SimplyAuth::Config.api_key_id => SimplyAuth::Config.api_key_secret},
+      algorithm: "hmac-sha256",
+      headers: ["Date", "Content-Length"],
+    ).signer.sign(req)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simply_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Fogle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,17 +25,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http_signatures
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -57,7 +71,6 @@ 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

data/app/models/simply_auth/api_key.rb

@@ -1,28 +0,0 @@
-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