user_mgmt 0.9.3 → 1.0
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 35a361a3b80bf695a8214c749bf7120693dee0c6
|
4
|
+
data.tar.gz: d3e63cfe8ef91ce9037b026b4f4b3e79451559d3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 414209f2cb3337934a932838eb2770aabccb71c722c0db7497a0ad0617db042015e06eafe6f7a1e4de8e3cbf1ae951d0034cfe1c0b038c99134492c4800a616d
|
7
|
+
data.tar.gz: 05316bb64de8e3e63dc2c6bb0120682591d76f1068eb4ca33149a9b5bf31689b81c8f34db90e0f991ddc91980a0ea81fcbc45e526722b4144dbc9e32c57b2b28
|
@@ -16,6 +16,7 @@ module UserMgmt
|
|
16
16
|
if response[:status] == "200"
|
17
17
|
flash[:success] = "User was created succesfully!"
|
18
18
|
session[:user_session_id] = response[:body]["session"]
|
19
|
+
session.permanent[:user_session_id] = response[:body]["session"]
|
19
20
|
redirect_to main_app.root_path
|
20
21
|
else
|
21
22
|
flash[:error] = response[:body]
|
@@ -18,6 +18,7 @@ module UserMgmt
|
|
18
18
|
if response[:status] == "200"
|
19
19
|
flash[:success] = "User logged in!"
|
20
20
|
session[:user_session_id] = response[:body]["session"]
|
21
|
+
session.permanent[:user_session_id] = response[:body]["session"]
|
21
22
|
redirect_to main_app.root_path
|
22
23
|
else
|
23
24
|
flash[:error] = response[:body]
|
@@ -52,7 +53,11 @@ module UserMgmt
|
|
52
53
|
if @umid
|
53
54
|
redirect_to main_app.root_path, flash: { error: "User already signed up for the app!" }
|
54
55
|
else
|
56
|
+
<<<<<<< HEAD
|
55
57
|
session[:user_session_id] = response[:body]["session"]
|
58
|
+
=======
|
59
|
+
session.permanent[:user_session_id] = response[:body]["session"]
|
60
|
+
>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
|
56
61
|
redirect_to main_app.root_path, flash: { success: "User logged in!" }
|
57
62
|
end
|
58
63
|
elsif @umid
|
@@ -72,7 +77,11 @@ module UserMgmt
|
|
72
77
|
redirect_to sign_up_path, flash: { error: response[:body] }
|
73
78
|
else
|
74
79
|
response = log_in_oauth params["uid"], params["provider"].to_sym
|
80
|
+
<<<<<<< HEAD
|
75
81
|
session[:user_session_id] = response[:body]["session"]
|
82
|
+
=======
|
83
|
+
session.permanent[:user_session_id] = response[:body]["session"]
|
84
|
+
>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
|
76
85
|
redirect_to main_app.root_path, flash: { success: "User logged in!" }
|
77
86
|
end
|
78
87
|
|
@@ -80,7 +89,11 @@ module UserMgmt
|
|
80
89
|
|
81
90
|
# GET /user/log_out
|
82
91
|
def destroy
|
92
|
+
<<<<<<< HEAD
|
83
93
|
session[:user_session_id] = nil
|
94
|
+
=======
|
95
|
+
session.delete(:user_session_id)
|
96
|
+
>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
|
84
97
|
redirect_to main_app.root_path, flash: { success: "Logged out!" }
|
85
98
|
end
|
86
99
|
|
@@ -7,11 +7,14 @@ module UserMgmt
|
|
7
7
|
if status == "200"
|
8
8
|
return true
|
9
9
|
else
|
10
|
-
session
|
10
|
+
session.delete(:user_session_id)
|
11
11
|
return false
|
12
12
|
end
|
13
13
|
end
|
14
14
|
|
15
|
+
def get_email umid, host=UserMgmt.external_database_URI
|
16
|
+
send_request :get, :user_info, { umid: umid }, host
|
17
|
+
|
15
18
|
def current_user
|
16
19
|
@current_user ||= user_info(session[:user_session_id])[:body] unless session[:user_session_id] == nil
|
17
20
|
end
|
data/lib/user_mgmt/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: user_mgmt
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0
|
4
|
+
version: '1.0'
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Danilo Faria, Fernando Gorodscy, Josh Leslie
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-03
|
11
|
+
date: 2014-04-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sqlite3
|