user_mgmt 1.0.2 → 1.0.3
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/app/controllers/user_mgmt/sessions_controller.rb +0 -12
- data/lib/user_mgmt/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: b6bd5c94fc6ca79e27231a6af586125ffc51f017
|
|
4
|
+
data.tar.gz: 2d2dec2b53ea07e64a86b2bfe424c8202f67875c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4f7c54e18c928b3cc436cf03a5a88767487878a6c6a7ee08203588fc22dffef264f5adf4a89201a607525f4116d188aa35a51f1688c6cd20073ed1ab5682e0a8
|
|
7
|
+
data.tar.gz: 7ffda79c08af97c3379ed73a3f6fe2ebdf810f174b70b2aa15503f9843002c872b9bb580cb14351eaceb3fee081eb3f979fb63d76db7d3f3cbc7e21f13639be0
|
|
@@ -53,11 +53,7 @@ module UserMgmt
|
|
|
53
53
|
if @umid
|
|
54
54
|
redirect_to main_app.root_path, flash: { error: "User already signed up for the app!" }
|
|
55
55
|
else
|
|
56
|
-
<<<<<<< HEAD
|
|
57
|
-
session[:user_session_id] = response[:body]["session"]
|
|
58
|
-
=======
|
|
59
56
|
session.permanent[:user_session_id] = response[:body]["session"]
|
|
60
|
-
>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
|
|
61
57
|
redirect_to main_app.root_path, flash: { success: "User logged in!" }
|
|
62
58
|
end
|
|
63
59
|
elsif @umid
|
|
@@ -77,11 +73,7 @@ module UserMgmt
|
|
|
77
73
|
redirect_to sign_up_path, flash: { error: response[:body] }
|
|
78
74
|
else
|
|
79
75
|
response = log_in_oauth params["uid"], params["provider"].to_sym
|
|
80
|
-
<<<<<<< HEAD
|
|
81
|
-
session[:user_session_id] = response[:body]["session"]
|
|
82
|
-
=======
|
|
83
76
|
session.permanent[:user_session_id] = response[:body]["session"]
|
|
84
|
-
>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
|
|
85
77
|
redirect_to main_app.root_path, flash: { success: "User logged in!" }
|
|
86
78
|
end
|
|
87
79
|
|
|
@@ -89,11 +81,7 @@ module UserMgmt
|
|
|
89
81
|
|
|
90
82
|
# GET /user/log_out
|
|
91
83
|
def destroy
|
|
92
|
-
<<<<<<< HEAD
|
|
93
|
-
session[:user_session_id] = nil
|
|
94
|
-
=======
|
|
95
84
|
session.delete(:user_session_id)
|
|
96
|
-
>>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
|
|
97
85
|
redirect_to main_app.root_path, flash: { success: "Logged out!" }
|
|
98
86
|
end
|
|
99
87
|
|
data/lib/user_mgmt/version.rb
CHANGED