[ tonton.rb to app.rm ]
This commit is contained in:
parent
5a18e3b334
commit
1903f6815a
1 changed files with 7 additions and 9 deletions
|
|
@ -4,17 +4,14 @@ require 'sinatra/flash'
|
||||||
require 'securerandom'
|
require 'securerandom'
|
||||||
require "sqlite3"
|
require "sqlite3"
|
||||||
|
|
||||||
class TonTon
|
TonTonWeb::User = Struct.new(:id, :username, :email, :name, :password)
|
||||||
end
|
|
||||||
|
|
||||||
TonTon::User = Struct.new(:id, :username, :email, :name, :password)
|
|
||||||
|
|
||||||
Warden::Manager.serialize_into_session do |user|
|
Warden::Manager.serialize_into_session do |user|
|
||||||
user.id
|
user.id
|
||||||
end
|
end
|
||||||
|
|
||||||
Warden::Manager.serialize_from_session do |id|
|
Warden::Manager.serialize_from_session do |id|
|
||||||
TonTon::App.find_user id
|
TonTonWeb::Wiki.find_user id
|
||||||
end
|
end
|
||||||
|
|
||||||
Warden::Manager.before_failure do |env,opts|
|
Warden::Manager.before_failure do |env,opts|
|
||||||
|
|
@ -31,7 +28,7 @@ Warden::Strategies.add(:password) do
|
||||||
def authenticate!
|
def authenticate!
|
||||||
user_params = params['user']
|
user_params = params['user']
|
||||||
|
|
||||||
user = TonTon::App.find_user_by_username user_params['username']
|
user = TonTonWeb::Wiki.find_user_by_username user_params['username']
|
||||||
|
|
||||||
if user and user.password == user_params['password']
|
if user and user.password == user_params['password']
|
||||||
success!(user)
|
success!(user)
|
||||||
|
|
@ -41,7 +38,7 @@ Warden::Strategies.add(:password) do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class TonTon::App < Precious::App
|
class TonTonWeb::Wiki < Precious::App
|
||||||
set :host_authorization, { permitted_hosts: ['localhost', 'mytonton.com.br'] }
|
set :host_authorization, { permitted_hosts: ['localhost', 'mytonton.com.br'] }
|
||||||
|
|
||||||
use Warden::Manager do |manager|
|
use Warden::Manager do |manager|
|
||||||
|
|
@ -62,7 +59,7 @@ class TonTon::App < Precious::App
|
||||||
user = nil
|
user = nil
|
||||||
|
|
||||||
@db.execute("select id, username, email, name, password from users where id = ?", id) do |row|
|
@db.execute("select id, username, email, name, password from users where id = ?", id) do |row|
|
||||||
user = TonTon::User.new(*row)
|
user = TonTonWeb::User.new(*row)
|
||||||
end
|
end
|
||||||
|
|
||||||
return user
|
return user
|
||||||
|
|
@ -72,7 +69,7 @@ class TonTon::App < Precious::App
|
||||||
user = nil
|
user = nil
|
||||||
|
|
||||||
@db.execute("select id, username, email, name, password from users where username = ?", username) do |row|
|
@db.execute("select id, username, email, name, password from users where username = ?", username) do |row|
|
||||||
user = TonTon::User.new(*row)
|
user = TonTonWeb::User.new(*row)
|
||||||
end
|
end
|
||||||
|
|
||||||
return user
|
return user
|
||||||
|
|
@ -98,6 +95,7 @@ class TonTon::App < Precious::App
|
||||||
end
|
end
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
puts request.path_info
|
||||||
if not env['warden'].authenticated?
|
if not env['warden'].authenticated?
|
||||||
@allow_editing = false
|
@allow_editing = false
|
||||||
else
|
else
|
||||||
Loading…
Add table
Add a link
Reference in a new issue