user_mgmt 0.9.1 → 0.9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6a52073104bb38a80617fef51aed42509807ff
-  data.tar.gz: bd959bd31fa90f1839b00a89bebab4f9e2e10f47
+  metadata.gz: c2fcb1d160ddace35d83ecbf4dfb6530ca3a0ddb
+  data.tar.gz: 346776791db5b53089be3d4e66b999cf1918ab2a
 SHA512:
-  metadata.gz: 945e71852a656ef95b080b396008548ed7b48905d0749b53d3c42776e7ebf5576ab8a1c227e99e02fc680bdde16ce35d00ce6c60125552bf46ba5fe6598439c0
-  data.tar.gz: e9c438b65fbdd00199ccca061bfa6f2ec17de9f4556dcc0387b460247b38a4c3e903ba5bd349871d3ba5fbeb07afb4cf3da81873ff6f14b604090d1f9d644169
+  metadata.gz: f7b68783c380219488e1c3659af4e729922cde2df68469dd4bc9289687f43173991a90ef46421457f7c86763ffb0b9cad84bbdd3586cf7adcac117dbf654f2b7
+  data.tar.gz: c35bc5a5d167ad7f81b3962f084223e8551a858cba38c500422230b63e4a066c46580121a64f1a7d834bb37f45ff1bc8ef951b0ad6800ab295f8589c705cbc2e

data/app/controllers/user_mgmt/registrations_controller.rb

@@ -29,6 +29,9 @@ module UserMgmt
 
     end
 
+    def add_strategy
+    end
+
     def password_reset
     end
 

data/app/controllers/user_mgmt/sessions_controller.rb

@@ -41,14 +41,23 @@ module UserMgmt
             @provider = "windows_live"
         end
 
+        @umid = current_user["umid"] if user_logged_in?
+
         response = log_in_oauth @uid, @provider
         
         # if user logged in succesfully, just redirect to main page,
         # otherwise it means the user doesn't exist yet, so continue 
         # normaly (user will be asked for his email).
         if response[:status] == "200"
-            cookies.permanent[:user_session_id] = response[:body]["session"]
-            redirect_to main_app.root_path, flash: { success: "User logged in!" } 
+            if @umid
+                redirect_to main_app.root_path, flash: { error: "User already signed up for the app!" }
+            else
+                cookies.permanent[:user_session_id] = response[:body]["session"]
+                redirect_to main_app.root_path, flash: { success: "User logged in!" }
+            end
+        elsif @umid
+            add_strategy @uid, @provider, @umid, cookies[:user_session_id]
+            redirect_to main_app.root_path, flash: { success: "Strategy added successfully!" }
         end
 
     end

data/app/views/user_mgmt/sessions/new.html.haml

@@ -24,8 +24,4 @@
         = link_to image_tag('user_mgmt/normal/yahoo-copied.jpg', class: "menu_icon", height: '45', width: '45'), "auth/yahoo" 
         = link_to image_tag('user_mgmt/normal/gmail-copied.png', class: "menu_icon", height: '45', width: '45'), "auth/google_oauth2" 
     .password_reset
-      = link_to 'forgot your password?', password_reset_request_path
-
-
-
-
+      = link_to 'forgot your password?', password_reset_request_path

data/config/routes.rb

@@ -12,6 +12,7 @@ UserMgmt::Engine.routes.draw do
   post '/send_password_reset' => 'registrations#send_password_reset', as: 'send_password_reset'
   get '/password_reset_request' => 'registrations#password_reset_request', as: 'password_reset_request'
   post '/send_reset_request' => 'registrations#send_reset_request', as: 'send_reset_request'
+  get '/add_strategy' => 'registrations#add_strategy', as: 'add_strategy'
 
   get 'auth/:provider/callback' => 'sessions#oauth_email', as: 'oauth_email'
   get 'auth/failure' => 'application#main_page', as: 'cancel'

data/lib/user_mgmt/version.rb

@@ -1,3 +1,3 @@
 module UserMgmt
-  VERSION = "0.9.1"
+  VERSION = "0.9.1.1"
 end

metadata

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