da-user-auth 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 453ccd82ecf5380d0f1e2929d910d28849c4dee8
-  data.tar.gz: 501f50f6df3b831bda592b2688b99f1422f8d7d9
+  metadata.gz: 688eaf232753fb14c940d1e28592868774a3d0e8
+  data.tar.gz: 237032e40e98382a550b0a0df2fc4b4240619f73
 SHA512:
-  metadata.gz: 4d34bfd4e8358cf4ca8f9b3f457563c2a911ce0eed07293b6aab8f1b810da6308c81d24c338c7c35c4ddd9b7be510716ea6f07fcfcb8793ad8bbb567bf72b4fe
-  data.tar.gz: fe6d6e5be9865cf432796b4ad3faf50a1ef32f41aecd2a479b386f06c58b644c9a64a8ec809f8d8ec79138e5c525163f9af0981435f85e97cb08bf1f4db8813a
+  metadata.gz: c9ea6553b7c07ad204cbcaa628e4f5edca7cedab3b7ec46ee8b1605d437ce95846715a609f69cdafeb97992b84143805d77adced4f0609d9819087564c33e7e4
+  data.tar.gz: bc7995fd435c7dc2218562c76aac3460646fce35fd3bbe37237fe28438c501594913c9c2e8510e0f980216cc5d38216de3c773f16eaea90a91ebf9fb1f87b033

data/.travis.yml

@@ -1,5 +1,15 @@
 sudo: false
 language: ruby
+cache: bundler
 rvm:
-  - 2.4.0
+  - 2.4.1
+addons:
+  postgresql: '9.4'
+env:
+- TEST_DATABASE_URL="postgres://localhost/travis_ci_test" JWT_SECRET_KEY=df4eb72858852f57d15d8d6dd53b305e
+before_script:
+- psql -c 'create database travis_ci_test;' -U postgres
 before_install: gem install bundler -v 1.15.0
+script:
+- bin/rake db:migrate APP_ENV=test
+- bin/rake ci:all

data/Rakefile

@@ -1,8 +1,9 @@
 require "bundler/gem_tasks"
-require "da/rake_tasks"
 
 # Add current path and lib to the load path
 $: << File.expand_path('../', __FILE__)
 $: << File.expand_path('../lib', __FILE__)
 
+Dir.glob('lib/tasks/*.rake').each { |r| import r }
+
 task default: ["ci:all"]

data/config.ru

@@ -1,9 +1,7 @@
 require_relative "./config/boot"
 require_relative "./lib/user_auth/api"
-require "da/web/exception_handling"
 require "rack/cors"
 
-use DA::Web::ExceptionHandling
 use Rack::Deflater
 use Rack::Cors do
   allow do

data/config/boot.rb

@@ -5,6 +5,22 @@ $: << File.expand_path("../../lib", __FILE__)
 # Default ENV to dev if not present
 ENV["APP_ENV"] ||= "development"
 
-require "da/core/environment"
-require "da/db"
-require "da/web"
+# Autoload common standard library features
+require "json"
+
+# Autoload gems from the Gemfile
+require "bundler/setup"
+require "dotenv"
+
+require "active_support/core_ext/object/blank" # blank? and present?
+require "active_support/core_ext/integer/time" # 1.week.ago etc
+require "active_support/core_ext/hash/slice" # params.slice(:one, :other)
+require "active_support/core_ext/hash/conversions" # params.symbolize_keys
+require "active_support/core_ext/hash/indifferent_access"
+
+# Load dev env vars
+Dotenv.load if %w[development test].include? ENV["APP_ENV"]
+
+# Autoload app dependencies
+path = File.join(__dir__, "initializers", "*.rb")
+(Dir[path].sort).uniq.each { |rb| require rb }

data/config/initializers/logger.rb

@@ -0,0 +1,28 @@
+require "logger"
+require "null_logger"
+
+$logger = begin
+  case ENV["APP_ENV"]
+  when "test"
+    NullLogger.new
+  else
+    # Log to a file
+    # Logger.new(File.expand_path(File.join(__dir__, "..", "..", "log", ENV.fetch('APP_ENV', 'development')+".log")))
+
+    # Log to STDOUT
+    Logger.new(STDOUT)
+  end
+end
+
+$logger.level = begin
+  case String(ENV["LOG_LEVEL"]).downcase
+  when "info"
+    Logger::INFO
+  when "warn"
+    Logger::WARN
+  when "error"
+    Logger::ERROR
+  else
+    Logger::DEBUG
+  end
+end

data/config/initializers/sequel.rb

@@ -0,0 +1,10 @@
+require "sequel"
+
+DB = Sequel.connect(ENV["APP_ENV"] == "test" ? ENV["TEST_DATABASE_URL"] : ENV["DATABASE_URL"], max_connections: Integer(ENV.fetch('MAX_THREADS', 5)) + 1)
+DB.extension :pg_array, :pg_json, :pagination
+DB.loggers << $logger
+DB.sql_log_level = :debug
+
+Sequel::Model.plugin :timestamps, update_on_create: true
+Sequel::Model.plugin :validation_helpers
+Sequel::Model.plugin :defaults_setter

data/config/initializers/warden.rb

@@ -0,0 +1,30 @@
+require "base64"
+require "user_auth/token"
+require "warden"
+require "ostruct"
+
+Warden::Manager.before_failure do |env,opts|
+  # Sinatra is very sensitive to the request method
+  # since authentication could fail on any type of method, we need
+  # to set it for the failure app so it is routed to the correct block
+  env["REQUEST_METHOD"] = "POST"
+end
+
+Warden::Strategies.add(:jwt) do
+  def valid?
+    env["HTTP_AUTHORIZATION"] || params["access_token"]
+  end
+
+  def authenticate!
+    token_str = params["access_token"]
+
+    if env["HTTP_AUTHORIZATION"]
+      token_str = env["HTTP_AUTHORIZATION"].sub(/^Bearer/, "").strip
+    end
+
+    payload = UserAuth::Token.new.parse(token_str)
+    success!(OpenStruct.new(payload))
+  rescue UserAuth::Token::ParseError => e
+    throw(:warden, message: "Auth token error: #{e.message}")
+  end
+end

data/lib/null_logger.rb

@@ -0,0 +1,7 @@
+require "logger"
+
+class NullLogger < Logger
+  def initialize
+    super("/dev/null")
+  end
+end

data/lib/tasks/ci.rake

@@ -0,0 +1,22 @@
+begin
+  require "bundler/audit/task"
+  require "rspec/core/rake_task"
+  require "rubocop/rake_task"
+
+  Bundler::Audit::Task.new
+  RSpec::Core::RakeTask.new(:spec)
+  RuboCop::RakeTask.new
+
+  namespace :ci do
+    task :all do
+      # Run rubocop on the current branches commit diff with master:
+      # rubocop:disable Metrics/LineLength
+      # system!("git diff-tree -r --no-commit-id --name-only master@\{u\} head | xargs ls -1 2>/dev/null | grep '\.rb$' | xargs rubocop")
+      Rake::Task["rubocop"].invoke
+      Rake::Task["spec"].invoke
+      Rake::Task["bundle:audit"].invoke
+    end
+  end
+rescue LoadError
+  puts "Can’t load CI task"
+end

data/lib/tasks/db.rake

@@ -0,0 +1,88 @@
+# rubocop:disable Metrics/BlockLength
+namespace :db do
+  task :environment do
+    ENV["APP_ENV"] ||= "development"
+    require "bundler/setup"
+    require "dotenv"
+    Dotenv.load if %w[development test].include? ENV["APP_ENV"]
+  end
+
+  task connect_db: :environment do
+    @root_dir = File.expand_path(File.join(__dir__, "..", ".."))
+    @migrations_dir = File.join(@root_dir, "db", "migrations")
+    require_relative "../../config/boot"
+    Sequel.extension :migration
+  end
+
+  desc "Create databases"
+  task create: :environment do
+    %w[DATABASE_URL TEST_DATABASE_URL].each do |db_url|
+      db_url = ENV[db_url]
+      puts "CREATE: #{db_url}"
+
+      if db_url.nil?
+        puts "#{db_url} not set!"
+        next
+      end
+
+      dbname = URI.parse(db_url).path[1..-1]
+      system("createdb #{dbname}")
+    end
+  end
+
+  desc "Run migrations"
+  task :migrate, [:version] => :connect_db do |_, args|
+    if args[:version]
+      Sequel::Migrator.run(DB, @migrations_dir, target: args[:version].to_i)
+    else
+      Sequel::Migrator.run(DB, @migrations_dir)
+    end
+
+    if ENV["APP_ENV"] == "development"
+      system("sequel -d #{ENV['DATABASE_URL']} > #{@root_dir}/db/schema.rb")
+    end
+
+    Rake::Task["db:version"].execute
+  end
+
+  desc "Rollback to migration"
+  task rollback: :connect_db do
+    version = if DB.tables.include?(:schema_migrations)
+                previous = DB[:schema_migrations].order(Sequel.desc(:filename)).limit(2).all[1]
+                previous ? previous[:filename].split("_").first : nil
+              end || 0
+
+    Sequel::Migrator.run(DB, @migrations_dir, target: version.to_i)
+
+    if ENV["APP_ENV"] == "development"
+      system("sequel -d #{ENV['DATABASE_URL']} > #{@root_dir}/db/schema.rb")
+    end
+
+    Rake::Task["db:version"].execute
+  end
+
+  desc "Create a migration"
+  task :create_migration, [:name] => :connect_db do |_, args|
+    require "date"
+    raise("Name required") unless args[:name]
+
+    timestamp = DateTime.now.strftime("%Y%m%d%H%M%S")
+    path = "db/migrations/#{timestamp}_#{args[:name]}.rb"
+
+    File.open("#{@root_dir}/#{path}", "w") do |f|
+      f.write("Sequel.migration do\n  up do\n  end\n\n  down do\n  end\nend")
+    end
+
+    puts "MIGRATION CREATED: #{path}"
+  end
+
+  desc "Prints current schema version"
+  task version: :connect_db do
+    version = if DB.tables.include?(:schema_migrations)
+                latest = DB[:schema_migrations].order(:filename).last
+                latest ? latest[:filename] : nil
+              end || 0
+
+    puts "Schema Version: #{version}"
+  end
+end

data/lib/token_failure_app.rb

@@ -0,0 +1,18 @@
+require "json"
+require "sinatra/base"
+
+class TokenFailureApp < ::Sinatra::Base
+  post "/unauthenticated" do
+    status :unauthorized
+    content_type :json
+    JSON.dump(error: "authentication_failed", message: error_message)
+  end
+
+  def error_message
+    if request.env["warden.options"]
+      message = request.env["warden.options"][:message]
+    end
+
+    message || request.env["warden.api.error"] || "Your credentials are invalid"
+  end
+end

data/lib/user_auth/api.rb

@@ -1,13 +1,25 @@
-require "da/web"
 require_relative "./models/refresh_token"
 require_relative "./models/user"
 require_relative "./web/helpers"
+require_relative "./token"
 require_relative "./password_verifier"
+require "rack/contrib"
+require "sinatra/base"
+require "token_failure_app"
 
 module UserAuth
-  class Api < DA::Web::BaseRoute
+  class Api < Sinatra::Base
+    use Rack::PostBodyContentTypeParser
     include UserAuth::Models
 
+    enable :raise_errors
+    disable :dump_errors, :show_exceptions, :logging, :static
+
+    use Warden::Manager do |manager|
+      manager.default_strategies :jwt
+      manager.failure_app = ::TokenFailureApp # lib/token_failure_app.rb
+    end
+
     helpers Web::Helpers
 
     get "/" do
@@ -105,16 +117,16 @@ module UserAuth
       json_user_token(current_user)
     end
 
-    error Sinatra::NotFound, Sequel::NoMatchingRow do
-      halt_not_found("Endpoint '#{request.path_info}' not found")
-    end
-
-    error Sequel::ValidationFailed do |e|
-      halt_unprocessible_entity(e)
+    error Sequel::ValidationFailed do |record|
+      halt 422, json(
+        errors: record.errors,
+        error_code: "validation_failed",
+        message: "Validation failed"
+      )
     end
 
-    error AuthToken::ParseError do |e|
-      halt_bad_request(e.message)
+    error Sinatra::NotFound, Sequel::NoMatchingRow do
+      halt 404, json(error_code: "not_found", message: "Endpoint '#{request.path}' not found")
     end
   end
 end

data/lib/user_auth/token.rb

@@ -0,0 +1,23 @@
+require "jwt"
+
+module UserAuth
+  class Token
+    def initialize(secret = ENV["JWT_SECRET_KEY"])
+      @secret = secret
+    end
+
+    def create(payload)
+      JWT.encode(payload, @secret, "HS512")
+    end
+
+    def parse(token)
+      JWT.decode(token, @secret)[0]
+    rescue JWT::ExpiredSignature
+      raise ParseError.new("Token expired")
+    rescue JWT::DecodeError
+      raise ParseError.new("Invalid token")
+    end
+
+    class ParseError < StandardError; end
+  end
+end

data/lib/user_auth/version.rb

@@ -1,3 +1,3 @@
 module UserAuth
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/user_auth/web/helpers.rb

@@ -1,12 +1,18 @@
-require "da/core/auth_token"
-
 module UserAuth
   module Web
     module Helpers
+      def warden
+        env["warden"]
+      end
+
       def current_user
         @current_user ||= UserAuth::Models::User.with_pk!(warden.user.user_id)
       end
 
+      def params
+        super.symbolize_keys.with_indifferent_access
+      end
+
       def deliver_email(options)
         UserAuth.configuration.deliver_mail.call(options)
       end
@@ -26,7 +32,7 @@ module UserAuth
 
       def build_jwt(data)
         exp = Time.now.to_i + UserAuth.configuration.jwt_exp
-        AuthToken.new.create(data.merge(exp: exp))
+        Token.new.create(data.merge(exp: exp))
       end
     end
   end

data/user-auth.gemspec

@@ -21,12 +21,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "da-core", "~> 0.1.5"
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "dotenv"
+  spec.add_runtime_dependency "rack"
+  spec.add_runtime_dependency "rack-contrib"
+  spec.add_runtime_dependency "rack-cors"
+  spec.add_runtime_dependency "sinatra", "~> 2.0.0"
   spec.add_runtime_dependency "pg", "~> 0.20"
   spec.add_runtime_dependency "sequel", "~> 4.44.0"
+  spec.add_runtime_dependency "jwt"
   spec.add_runtime_dependency "bcrypt"
+  spec.add_runtime_dependency "warden"
 
-  spec.add_development_dependency "bundler", ">= 1.14"
+  spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rack-test"

metadata

@@ -1,29 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: da-user-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Pete Hawkins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: da-core
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-cors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.44.0
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: warden
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -204,9 +302,16 @@ files:
 - bin/setup
 - config.ru
 - config/boot.rb
+- config/initializers/logger.rb
+- config/initializers/sequel.rb
+- config/initializers/warden.rb
 - config/puma.rb
 - db/migrations/20170602120030_create_users.rb
 - db/schema.rb
+- lib/null_logger.rb
+- lib/tasks/ci.rake
+- lib/tasks/db.rake
+- lib/token_failure_app.rb
 - lib/user_auth.rb
 - lib/user_auth/api.rb
 - lib/user_auth/configuration.rb
@@ -216,6 +321,7 @@ files:
 - lib/user_auth/password_verifier.rb
 - lib/user_auth/rake_tasks.rb
 - lib/user_auth/tasks/import_migrations.rake
+- lib/user_auth/token.rb
 - lib/user_auth/version.rb
 - lib/user_auth/web/helpers.rb
 - user-auth.gemspec