json_voorhees 0.4.7 → 0.4.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/generators/json_voorhees/app_make_user/templates/user/specs/request_specs.rb +1 -1
- data/lib/generators/json_voorhees/app_make_user/templates/user/user_controller.rb +9 -1
- data/lib/generators/json_voorhees/app_make_user/templates/user/user_model.rb +3 -0
- data/lib/json_voorhees/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d99d45cb86a7acddb83e22894e2d08384430f31f
|
|
4
|
+
data.tar.gz: 02004c049cf3c22ab3adf73c82a9d9fa48230d17
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c72e8bab396eb18760722a165739284cd69f5d658c9c2f6b89d10a3626b16f1dc21692681b5cd39688fe8f776b60ded0f1f5c1af73f30b9ecd4b55161d37c877
|
|
7
|
+
data.tar.gz: 458a81cb1c89a3b0ad89cabde7189fc4fcd18786a9c67758d2db66520feb371714d399c0f249bacd504f94499e6a783c0e46122bcda9327b3ed3eb6f40f1f83e
|
|
@@ -47,7 +47,7 @@ RSpec.describe ::People::V1::User, :type => :request do
|
|
|
47
47
|
#This uses users 1 header
|
|
48
48
|
put 'api/1/users/1', hash, @header
|
|
49
49
|
expect(response.status).to eq(200) #ok
|
|
50
|
-
expect(json["user"]["email"]).to eq("
|
|
50
|
+
expect(json["user"]["email"]).to eq("cole@launchu.com")
|
|
51
51
|
end
|
|
52
52
|
it "makes sure a user cannot alter another users information" do
|
|
53
53
|
FactoryGirl.create(:people_user_1)
|
|
@@ -36,7 +36,7 @@ module People
|
|
|
36
36
|
def login
|
|
37
37
|
#Should I delete the current token or ignore it?
|
|
38
38
|
#Find user from email and password. Create and return a new token
|
|
39
|
-
user = ::People::V1::User.find_by(email:
|
|
39
|
+
user = ::People::V1::User.find_by(email: get_email)
|
|
40
40
|
if user && user.authenticate(params[:password])
|
|
41
41
|
token = user.tokens.create
|
|
42
42
|
::Arcadex::Create.set_token(token,360,request)
|
|
@@ -80,6 +80,14 @@ module People
|
|
|
80
80
|
private
|
|
81
81
|
# Use callbacks to share common setup or constraints between actions.
|
|
82
82
|
|
|
83
|
+
def get_email
|
|
84
|
+
if !params[:email].nil?
|
|
85
|
+
return params[:email].downcase
|
|
86
|
+
else
|
|
87
|
+
return nil
|
|
88
|
+
end
|
|
89
|
+
end
|
|
90
|
+
|
|
83
91
|
def set_user
|
|
84
92
|
@user = ::People::V1::User.find_by_id(params[:id])
|
|
85
93
|
if @user.nil?
|
|
@@ -3,6 +3,9 @@ require 'type_cartographer'
|
|
|
3
3
|
module People
|
|
4
4
|
class V1::User < ActiveRecord::Base
|
|
5
5
|
self.table_name = 'people_users'
|
|
6
|
+
|
|
7
|
+
before_save { self.email = email.downcase }
|
|
8
|
+
before_save { self.username = username.downcase }
|
|
6
9
|
|
|
7
10
|
<% if options.arcadex? %>
|
|
8
11
|
has_many :tokens, :as => :imageable, :class_name => "::Arcadex::Token"
|