lobby 0.0.13 → 0.0.14

data/app/controllers/lobby/sessions_controller.rb

@@ -27,7 +27,7 @@ module Lobby
 
     def destroy
       session[:user_id] = nil
-      redirect_to root_url, flash: {success: t( '.success' ) }
+      redirect_to main_app.root_url, flash: {success: t( '.success' ) }
     end
   end
 end

data/app/controllers/lobby/sessions_controller.rb~

@@ -0,0 +1,33 @@
+module Lobby
+  class SessionsController < ApplicationController
+    def new
+    end
+
+    def create
+      @user = User.where('email = ? OR username = ?', params[:email], params[:email]).first
+      if @user && @user.authenticate(params[:password])
+        if @user.confirmed?
+          if @user.active?
+            session[:user_id] = @user.id
+            flash.now[:success] = t( '.flash.success' )
+            redirect_to root_url
+          else
+            flash.now[:danger] = t( '.flash.error.not_active' )
+            redirect_to log_in_url
+          end
+        else
+          flash.now[:danger] = t( '.flash.error.not_confirmed' )
+          redirect_to confirm_url( :action => "registration" )
+        end
+      else
+        flash.now[:danger] = t( '.flash.error.wrong_password_or_email' )
+        render :new
+      end
+    end
+
+    def destroy
+      session[:user_id] = nil
+      redirect_to root_url, flash: {success: t( '.success' ) }
+    end
+  end
+end

data/lib/lobby/version.rb

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/lobby/version.rb~

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobby
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -233,6 +233,7 @@ files:
 - app/assets/javascripts/lobby/application.js
 - app/controllers/lobby/application_controller.rb
 - app/controllers/lobby/confirmation_controller.rb
+- app/controllers/lobby/sessions_controller.rb~
 - app/controllers/lobby/users_controller.rb
 - app/controllers/lobby/sessions_controller.rb
 - app/controllers/lobby/application_controller.rb~