Flatten user login json response

.gitignore

@@ -14,6 +14,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+/log/
 
 # Used by dotenv library to load environment variables.
 # .env

Capfile

@@ -10,7 +10,7 @@ require "capistrano/rbenv"
 require "capistrano/bundler"
 
 set :rbenv_type, :user
-set :rbenv_ruby, '2.4.0'
+set :rbenv_ruby, '2.6.4'
 set :ssh_options, {:forward_agent => true}
 # Load the SCM plugin appropriate to your project:
 #

Gemfile

@@ -25,10 +25,12 @@ gem 'rack-cors', :require => 'rack/cors'
 gem 'fast_jsonapi'
 gem 'will_paginate'
 gem 'capistrano', '3.10.1'
-gem 'capistrano-rails', '~> 1.2'
+gem 'capistrano-rails', '~> 1.4'
 gem 'capistrano-passenger', '~> 0.2.0'
 gem 'capistrano-rbenv'
 gem 'capistrano-bundler'
+gem 'ed25519'
+gem 'bcrypt_pbkdf'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 

Gemfile.lock

@@ -59,6 +59,7 @@ GEM
     airbrussh (1.3.4)
       sshkit (>= 1.6.1, != 1.7.0)
     bcrypt (3.1.13)
+    bcrypt_pbkdf (1.0.1)
     bootsnap (1.4.5)
       msgpack (~> 1.0)
     builder (3.2.3)
@@ -82,6 +83,7 @@ GEM
     crass (1.0.4)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
+    ed25519 (1.2.4)
     erubi (1.9.0)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
@@ -206,14 +208,16 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt (~> 3.1.7)
+  bcrypt_pbkdf
   bootsnap
   byebug
   capistrano (= 3.10.1)
   capistrano-bundler
   capistrano-passenger (~> 0.2.0)
-  capistrano-rails (~> 1.2)
+  capistrano-rails (~> 1.4)
   capistrano-rbenv
   database_cleaner
+  ed25519
   factory_girl_rails (~> 4.0)
   faker
   fast_jsonapi

app/controllers/authentication_controller.rb

@@ -5,7 +5,10 @@ class AuthenticationController < ApplicationController
     auth_token =
         AuthenticateUser.new(auth_params[:email], auth_params[:password]).call
     user = User.find_by(email: auth_params[:email])
-    json_response(auth_token: auth_token, user: user)
+
+    response = user.as_json
+    response[:auth_token] = auth_token
+    json_response(response)
   end
 
   private

app/controllers/vouchers_controller.rb

@@ -5,8 +5,9 @@ class VouchersController < ApplicationController
   # GET /vouchers
   def index
     @vouchers = Voucher.all
+    whitelist = `mc-whitelist-users`.gsub("\n", "")
 
-    render json: @vouchers
+    render json: { :vouchers => @vouchers, :whitelist => whitelist }.to_json
   end
 
   # GET /vouchers/1
@@ -18,25 +19,22 @@ class VouchersController < ApplicationController
   def create
     # Logic for creating a voucher
     output = ""
-    whitelist = `mcrcon -r -H mine.vereto.net -p #{ENV["MC_RCON_PASS"]} "whitelist list" | sed 's/There are*.*whitelisted players: //g'`.split(", ")
+    whitelist = `mc-whitelist-users`.gsub("\n", "").split(", ")
 
     if Voucher.exists?(vouchee: params[:voucher]) && params[:voucher].in?(whitelist)
       @voucher = Voucher.new(voucher_params)
       
       if @voucher.save
-        output = `mcrcon -r -H mine.vereto.net -p #{ENV["MC_RCON_PASS"]} "whitelist add #{params[:vouchee]}"`
-        render json: output, status: :created, location: @voucher
+        output = `mc-whitelist-users #{params[:vouchee]}`
+        render json: { :message => output }.to_json, status: :created, location: @voucher
       else
        render json: @voucher.errors, status: :unprocessable_entity
       end
     else
 
-      render json: "{ Voucher is not valid }" + params[:voucher].in?(whitelist), status: :unprocessable_entity
+      render json: { :message => "Voucher is not valid.", :whitelisted => params[:voucher].in?(whitelist), :exists => Voucher.exists?(vouchee: params[:voucher]), :list => whitelist }.to_json, status: :unprocessable_entity
     end
 
-    
-    
-
   end
 
   # PATCH/PUT /vouchers/1

config/application.rb

@@ -10,7 +10,7 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "action_cable/engine"
-# require "sprockets/railtie"
+require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
 # Require the gems listed in Gemfile, including any gems

config/deploy.rb

@@ -2,7 +2,7 @@
 lock "3.10.1"
 
 set :application, "vereto-api"
-set :repo_url, "git@gogs.vereto.tech:PromoStarr/vereto-api.git"
+set :repo_url, "https://gitlab.com/spengreb/vereto-api.git"
 
 # Default branch is :master
 # ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp

config/routes.rb

@@ -16,12 +16,8 @@ Rails.application.routes.draw do
 
   resources :users
   
-  # ** TO DO ** #
-  # Pls activate again when you've made this more secure
-  # I dont think its a good idea to send passwords over plaintext
+  resources :user_profiles
+  post 'login', to: 'authentication#authenticate'
+  post 'register', to: 'users#create'
 
-  # resources :user_profiles
-  # post 'login', to: 'authentication#authenticate'
-  # post 'register', to: 'users#create'
-  # ** TODO ** #
 end

db/migrate/20200112200527_add_admin_to_users.rb

@@ -0,0 +1,5 @@
+class AddAdminToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :admin, :boolean
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_09_27_154659) do
+ActiveRecord::Schema.define(version: 2020_01_12_200527) do
 
   create_table "articles", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
     t.string "title"
@@ -48,6 +48,7 @@ ActiveRecord::Schema.define(version: 2019_09_27_154659) do
     t.string "password_digest"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "admin"
   end
 
   create_table "vouchers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|