user_mgmt 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3add706e831afa5f7416a914a270efc137f8f0fa
-  data.tar.gz: eb9e64ade516b588640f8b0af8a4f07026b00b7a
+  metadata.gz: b6bd5c94fc6ca79e27231a6af586125ffc51f017
+  data.tar.gz: 2d2dec2b53ea07e64a86b2bfe424c8202f67875c
 SHA512:
-  metadata.gz: 53a777bd371e5e8cb87dcaf67b31357217d82a358c84579b808e00e7f37dedd4094e2c3295e60fd7272eeadb648c45edb4405fb641a324e2640f1eecd10a4066
-  data.tar.gz: ebf40dbee4bae377902425ae2c7ce6d6669568fadf6baa60f2b07b68af4ad52512f56d1d1c28ffbc3becadee0cb38313d19735053bb60f05deddf9ae8dd6c28d
+  metadata.gz: 4f7c54e18c928b3cc436cf03a5a88767487878a6c6a7ee08203588fc22dffef264f5adf4a89201a607525f4116d188aa35a51f1688c6cd20073ed1ab5682e0a8
+  data.tar.gz: 7ffda79c08af97c3379ed73a3f6fe2ebdf810f174b70b2aa15503f9843002c872b9bb580cb14351eaceb3fee081eb3f979fb63d76db7d3f3cbc7e21f13639be0

data/app/controllers/user_mgmt/sessions_controller.rb

@@ -53,11 +53,7 @@ module UserMgmt
             if @umid
                 redirect_to main_app.root_path, flash: { error: "User already signed up for the app!" }
             else
-<<<<<<< HEAD
-                session[:user_session_id] = response[:body]["session"]
-=======
                 session.permanent[:user_session_id] = response[:body]["session"]
->>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
                 redirect_to main_app.root_path, flash: { success: "User logged in!" }
             end
         elsif @umid
@@ -77,11 +73,7 @@ module UserMgmt
             redirect_to sign_up_path, flash: { error: response[:body] }
         else
             response = log_in_oauth params["uid"], params["provider"].to_sym
-<<<<<<< HEAD
-            session[:user_session_id] = response[:body]["session"]
-=======
             session.permanent[:user_session_id] = response[:body]["session"]
->>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
             redirect_to main_app.root_path, flash: { success: "User logged in!" }
         end
 
@@ -89,11 +81,7 @@ module UserMgmt
 
     # GET /user/log_out
     def destroy
-<<<<<<< HEAD
-        session[:user_session_id] = nil
-=======
         session.delete(:user_session_id)
->>>>>>> ad0fd9cf191cb4a0bb0dc01fe3cfc5737ea76786
         redirect_to main_app.root_path, flash: { success: "Logged out!" }
     end
 

data/lib/user_mgmt/version.rb

@@ -1,3 +1,3 @@
 module UserMgmt
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: user_mgmt
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Danilo Faria, Fernando Gorodscy, Josh Leslie