json_voorhees 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d99d45cb86a7acddb83e22894e2d08384430f31f
-  data.tar.gz: 02004c049cf3c22ab3adf73c82a9d9fa48230d17
+  metadata.gz: 62e3de527de847411513b2544485a74289875b71
+  data.tar.gz: c732997e8017ebabb075519a3638d12ff5e02c37
 SHA512:
-  metadata.gz: c72e8bab396eb18760722a165739284cd69f5d658c9c2f6b89d10a3626b16f1dc21692681b5cd39688fe8f776b60ded0f1f5c1af73f30b9ecd4b55161d37c877
-  data.tar.gz: 458a81cb1c89a3b0ad89cabde7189fc4fcd18786a9c67758d2db66520feb371714d399c0f249bacd504f94499e6a783c0e46122bcda9327b3ed3eb6f40f1f83e
+  metadata.gz: 5254c78efd1c3f675a86a73fb60b1043d28f097d690b5fa3d54a862cd4475e39f17499afffe89d41de5627c9fa53df1960426fb9fd8f2a280ed3c1a477e47e14
+  data.tar.gz: 1e8ec6c058e6781e8a4f66fbffdbdf58427765a1627efc824848263e412cc799c79c912264360c33540a7a7db8ea3cbd851d48a829f7d2764eba384dea0125da

data/lib/generators/json_voorhees/app_make_user/templates/user/specs/request_specs.rb

@@ -84,14 +84,7 @@ RSpec.describe ::People::V1::User, :type => :request do
       token = ::People::V1::User.find(1).tokens[0]
       expect(json["token"]["auth_token"]).to eq(token.auth_token)
     end
-  end
-end
-RSpec.describe ::People::V1::User, :type => :request do
-  describe "Login" do
-    before(:example) do
-      @attrs = FactoryGirl.attributes_for(:people_user_1)
-    end
-    # post /api/1/users/login
+    # post /api/1/users/register
     it "checks response of a register request with mismatched passwords" do
       @attrs["password"] = "password1"
       @attrs["password_confirmation"] = "password2"
@@ -101,6 +94,13 @@ RSpec.describe ::People::V1::User, :type => :request do
       #Errors need to be returned
       expect(json["errors"]).to_not eq(nil)
     end
+  end
+end
+RSpec.describe ::People::V1::User, :type => :request do
+  describe "Login" do
+    before(:example) do
+      @attrs = FactoryGirl.attributes_for(:people_user_1)
+    end
     # post /api/1/users/login
     it "checks response of a valid login request" do
       @attrs["password"] = "password123"
@@ -108,7 +108,8 @@ RSpec.describe ::People::V1::User, :type => :request do
       user = FactoryGirl.create(:people_user_1,@attrs)
       old_auth_token = user.tokens[0].auth_token
       #It needs to send an email and password
-      post 'api/1/users/login', @attrs
+      hash = {"user" => @attrs}
+      post 'api/1/users/login', hash
       expect(response.status).to eq(200) #ok
       #A valid and new token need to be returned
       expect(json["token"]["auth_token"]).to_not eq(old_auth_token)
@@ -123,8 +124,9 @@ RSpec.describe ::People::V1::User, :type => :request do
       user = FactoryGirl.create(:people_user_1,@attrs)
       #The password needs to be invalid
       @attrs["password"] = "wrongPassword"
+      hash = {"user" => @attrs}
       #It needs to send an email and password
-      post 'api/1/users/login', @attrs
+      post 'api/1/users/login', hash
       expect(response.status).to eq(401) #unauthorized
       #Errors need to be returned
       expect(json["errors"]).to_not eq(nil)
@@ -148,6 +150,32 @@ RSpec.describe ::People::V1::User, :type => :request do
     end
   end
 end
+RSpec.describe ::People::V1::User, :type => :request do
+  describe "Authenticate" do
+    before(:example) do
+      @attrs = FactoryGirl.attributes_for(:people_user_1)
+    end
+    # post /api/1/users/authenticate
+    it "checks a valid authenticate request" do
+      user = FactoryGirl.create(:people_user_1,@attrs)
+      token = user.tokens[0].auth_token
+      header = {"Auth-Token" => token, "Email" => user.email}
+      hash = {"user" => @attrs}
+      post "api/1/users/authenticate/#{user.id}", hash, header
+      expect(response.status).to eq(200) #ok
+    end
+    # post /api/1/users/authenticate
+    it "checks an invalid authenticate request" do
+      user = FactoryGirl.create(:people_user_1,@attrs)
+      token = user.tokens[0].auth_token
+      header = {"Auth-Token" => token, "Email" => user.email}
+      @attrs["password"] = "false_password"
+      hash = {"user" => @attrs}
+      post "api/1/users/authenticate/#{user.id}", hash, header
+      expect(response.status).to eq(401) #unauthorized
+    end
+  end
+end
 #-#-#-#-#Serialization#-#-#-#-#
 RSpec.describe ::People::V1::User, :type => :request do
   describe "Serialization" do

data/lib/generators/json_voorhees/app_make_user/templates/user/specs/route_specs.rb

@@ -22,6 +22,13 @@ RSpec.describe "Users sign up process routing", :type => :routing do
 			:action => "logout"
 		)
 	end
+	it "routes to authenticate" do
+		expect(:post => "/api/1/users/authenticate/1").to route_to(
+			:controller => "people/api/v1/users",
+			:action => "authenticate",
+			:id => "1"
+		)
+	end
 end
 <% end %>
 #The standard rest routes for the user controller

data/lib/generators/json_voorhees/app_make_user/templates/user/user_controller.rb

@@ -6,7 +6,7 @@ module People
     <% if options.arcadex? %>
     skip_before_filter :authenticate_user, :only => [:register, :login]
     <% end %>
-    before_action :set_user, only: [:show, :edit, :update]
+    before_action :set_user, only: [:show, :edit, :update, :authenticate]
     before_action :register_authorize, only: [:register]
     before_action :login_authorize, only: [:login]
     before_action :logout_authorize, only: [:logout]
@@ -37,7 +37,7 @@ module People
       #Should I delete the current token or ignore it?
       #Find user from email and password. Create and return a new token
       user = ::People::V1::User.find_by(email: get_email)
-      if user && user.authenticate(params[:password])
+      if user && user.authenticate(params[:user][:password])
         token = user.tokens.create
         ::Arcadex::Create.set_token(token,360,request)
         userHash = {id: user.id, username: user.username, email: user.email}
@@ -57,6 +57,14 @@ module People
     end
     <% end %>
 
+    # POST /api/1/users/authenticate
+    def authenticate
+      if authenticate_password
+        return
+      end
+      render json: {}
+    end
+
     # GET /api/1/users
     def index
       @users = ::People::V1::User.all
@@ -70,6 +78,9 @@ module People
 
     # PATCH/PUT /api/1/users/1
     def update
+      if authenticate_password
+        return
+      end
       if @user.update(user_params)
         render json: @user
       else
@@ -80,9 +91,17 @@ module People
     private
       # Use callbacks to share common setup or constraints between actions.
 
+      def authenticate_password
+        if !@user.authenticate(params[:user][:password])
+          render :json => {errors: "Email and/or Password is incorrect"}, status: :unauthorized 
+          return true
+        end
+        return false
+      end
+
       def get_email
-        if !params[:email].nil?
-          return params[:email].downcase
+        if !params[:user][:email].nil?
+          return params[:user][:email].downcase
         else
           return nil
         end

data/lib/generators/json_voorhees/app_make_user/templates/user/user_routes.rb

@@ -19,6 +19,8 @@ People::Engine.routes.draw do
 					post 'login', to: "api/v1/users#login"
 					# /api/1/users/logout
 					post 'logout', to: "api/v1/users#logout"
+					# /api/1/users/logout
+					post 'authenticate/:id', to: "api/v1/users#authenticate"
 				end
 				<% end %>
 	  	end

data/lib/generators/json_voorhees/setup_app/templates/api_controller_with_arcadex.rb

@@ -11,23 +11,31 @@ class Api::V1::ApiController < ::ActionController::API
   private
 
     def authenticate_user
-      #["current_user","current_token"] Make this true to check for email also
-      @instance_hash = ::Arcadex::Authentication.full_authentication(params,request,false)
+      set_hash
       if @instance_hash.nil?
         render :json => {errors: "User is not logged in, register or log in"} , status: :unauthorized
       end
     end
 
+    def set_hash
+      #["current_user","current_token"] Make this true to check for email also
+      @instance_hash = ::Arcadex::Authentication.full_authentication(params,request,false)
+    end
+
     def current_user
-    	if !@instance_hash.nil?
-    		@instance_hash["current_user"]
-    	end
+      if !@instance_hash.nil?
+        return @instance_hash["current_user"]
+      else
+        return nil
+      end
     end
 
     def current_token
-    	if !@instance_hash.nil?
-    		@instance_hash["current_token"]
-    	end
+      if !@instance_hash.nil?
+        return @instance_hash["current_token"]
+      else
+        return nil
+      end
     end
 
     def cors_set_access_control_headers

data/lib/json_voorhees/version.rb

@@ -1,3 +1,3 @@
 module JsonVoorhees
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_voorhees
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Cleophus Robinson