Karis - Edges - MedaRanker-revisited

.gitignore

@@ -15,3 +15,5 @@
 
 # Ignore Byebug command history file.
 .byebug_history
+
+.env

Gemfile

@@ -7,6 +7,8 @@ end
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails'
+gem "omniauth"
+gem "omniauth-github"
 # Use postgresql as the database for Active Record
 gem 'pg', '~> 0.18'
 # Use Puma as the app server
@@ -62,6 +64,7 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'dotenv-rails'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -70,11 +70,18 @@ GEM
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     debug_inspector (0.0.3)
+    dotenv (2.5.0)
+    dotenv-rails (2.5.0)
+      dotenv (= 2.5.0)
+      railties (>= 3.2, < 6.0)
     erubi (1.7.1)
     execjs (2.7.0)
+    faraday (0.15.3)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    hashie (3.5.7)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
@@ -84,6 +91,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jwt (2.1.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -113,9 +121,26 @@ GEM
       minitest (~> 5.0)
       rails (>= 4.1)
     multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
     pg (0.21.0)
     popper_js (1.14.3)
     pry (0.11.3)
@@ -207,13 +232,16 @@ DEPENDENCIES
   bootstrap (~> 4.1.3)
   byebug
   coffee-rails (~> 4.2)
+  dotenv-rails
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
   minitest-rails
   minitest-reporters
   minitest-skip
   minitest-spec-rails
+  omniauth
+  omniauth-github
   pg (~> 0.18)
   pry-rails
   puma (~> 3.0)

app/controllers/application_controller.rb

@@ -10,6 +10,7 @@ def render_404
 
 private
   def find_user
+
     if session[:user_id]
       @login_user = User.find_by(id: session[:user_id])
     end

app/controllers/sessions_controller.rb

@@ -1,15 +1,21 @@
 class SessionsController < ApplicationController
+
   def login_form
   end
 
   def login
-    username = params[:username]
-    if username and user = User.find_by(username: username)
+    auth_hash = request.env['omniauth.auth']
+    #
+    user = User.find_by(uid: auth_hash[:uid], provider: 'github')
+    # username = params[:username]
+# require 'pry'; binding.pry
+    if user
       session[:user_id] = user.id
       flash[:status] = :success
       flash[:result_text] = "Successfully logged in as existing user #{user.username}"
     else
-      user = User.new(username: username)
+      user = User.build_from_github(auth_hash)
+      # binding.pry
       if user.save
         session[:user_id] = user.id
         flash[:status] = :success
@@ -32,3 +38,49 @@ def logout
     redirect_to root_path
   end
 end
+
+#  def create
+#    auth_hash = request.env['omniauth.auth']
+#
+#    user = User.find_by(uid: auth_hash[:uid], provider: 'github')
+#    # require 'pry'; binding.pry
+#    if user
+#      # User was found in the database
+#      flash[:status] = :success
+#      flash[:result_text] = "Logged in as returning user #{user.name}"
+#
+#
+#    else
+#      # User doesn't match anything in the DB
+#      # Attempt to create a new user
+#      user = User.build_from_github(auth_hash)
+#
+#      if user.save
+#        flash[:status] = :success
+#        flash[:result_text] = "Logged in as returning user #{user.name}"
+#
+#      else
+#        # Couldn't save the user for some reason. If we
+#        # hit this it probably means there's a bug with the
+#        # way we've configured GitHub. Our strategy will
+#        # be to display error messages to make future
+#        # debugging easier.
+#        flash[:status] = :error
+#        flash[:result_text] = "Could not create new user account: #{user.errors.messages}"
+#        redirect_to root_path
+#        return
+#      end
+#    end
+#
+#    # If we get here, we have a valid user instance
+#    session[:user_id] = user.id
+#    redirect_to root_path
+#  end
+#
+#  def destroy
+#   session[:user_id] = nil
+#   flash[:status] = :success
+#   flash[:result_text] = "Successfully logged out!"
+#
+#   redirect_to root_path
+# end

app/controllers/users_controller.rb

@@ -1,4 +1,6 @@
 class UsersController < ApplicationController
+  before_action :require_user, only: [:index, :show]
+
   def index
     @users = User.all
   end
@@ -7,4 +9,16 @@ def show
     @user = User.find_by(id: params[:id])
     render_404 unless @user
   end
+
+  private
+
+  def require_user
+    current_user = User.find_by(id: session[:user_id])
+    if current_user
+      true
+    else
+      redirect_to root_path
+      flash[:result_text] = "You must be logged in to access that page."
+    end
+  end
 end

app/controllers/works_controller.rb

@@ -1,8 +1,10 @@
 class WorksController < ApplicationController
   # We should always be able to tell what category
   # of work we're dealing with
+  before_action :require_user, except: [:root]
   before_action :category_from_work, except: [:root, :index, :new, :create]
 
+
   def root
     @albums = Work.best_albums
     @books = Work.best_books
@@ -50,21 +52,25 @@ def update
       flash.now[:status] = :failure
       flash.now[:result_text] = "Could not update #{@media_category.singularize}"
       flash.now[:messages] = @work.errors.messages
-      render :edit, status: :not_found
+      render :edit, status: :bad_request
     end
   end
 
   def destroy
-    @work.destroy
-    flash[:status] = :success
-    flash[:result_text] = "Successfully destroyed #{@media_category.singularize} #{@work.id}"
-    redirect_to root_path
+    if @work.destroy
+      flash[:status] = :success
+      flash[:result_text] = "Successfully destroyed #{@media_category.singularize} #{@work.id}"
+      redirect_to root_path
+    else
+      render :new, status: :not_found
+    end
   end
 
   def upvote
     flash[:status] = :failure
     if @login_user
       vote = Vote.new(user: @login_user, work: @work)
+      # binding.pry
       if vote.save
         flash[:status] = :success
         flash[:result_text] = "Successfully upvoted!"
@@ -91,4 +97,14 @@ def category_from_work
     render_404 unless @work
     @media_category = @work.category.downcase.pluralize
   end
+
+  def require_user
+    current_user = User.find_by(id: session[:user_id])
+    if current_user
+      true
+    else
+      redirect_to root_path
+      flash[:result_text] = "You must be logged in to access that page."
+    end
+  end
 end

app/models/user.rb

@@ -3,4 +3,15 @@ class User < ApplicationRecord
   has_many :ranked_works, through: :votes, source: :work
 
   validates :username, uniqueness: true, presence: true
+
+  def self.build_from_github(auth_hash)
+    user = User.new
+    user.name = auth_hash["info"]["name"]
+    user.uid = auth_hash["uid"]
+    user.email = auth_hash["info"]["email"]
+    user.username = auth_hash["info"]["nickname"]
+    user.provider = auth_hash["provider"]
+
+    return user
+  end
 end

app/views/layouts/application.html.erb

@@ -33,22 +33,13 @@
         </li>
       </ul>
       <ul class="nav app-header__user-nav-container">
-        <% if @login_user %>
 
-        <li class="nav-item app-header__nav_item">
-          <%= link_to "Logged in as #{@login_user.username}", user_path(@login_user), class: "btn btn-primary" %>
-        </li>
-        <li class="nav-item app-header__nav_item">
-          <%= link_to "Log Out", logout_path, method: :post, class: "btn btn-primary" %>
-        </li>
+        <% if session[:user_id] %>
 
-        <% else %>
-
-        <li class="nav-item app-header__nav_item">
-          <%= link_to "Log In", login_path, class: "btn btn-primary" %>
-        </li>
+          <%= link_to "Log out", logout_path, method: "delete"   %>
+          <% else %>
+          <%= link_to "Login with Github", "/auth/github" %>
         <% end %>
-
       </ul>
     </nav>
   </header>

config/initializers/omniauth.rb

@@ -0,0 +1,4 @@
+# config/initializers/omniauth.rb
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email"
+end

config/routes.rb

@@ -1,12 +1,15 @@
 Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   root 'works#root'
-  get '/login', to: 'sessions#login_form', as: 'login'
-  post '/login', to: 'sessions#login'
-  post '/logout', to: 'sessions#logout', as: 'logout'
+  # get '/login', to: 'sessions#login_form', as: 'login'
+  # post '/login', to: 'sessions#login'
+  # post '/logout', to: 'sessions#logout', as: 'logout'
 
   resources :works
   post '/works/:id/upvote', to: 'works#upvote', as: 'upvote'
 
   resources :users, only: [:index, :show]
+
+  get "/auth/:provider/callback", to: "sessions#login", as: "login"
+  delete "/logout", to: "sessions#logout", as: "logout"
 end

db/migrate/20181016185049_add_oauth_to_user.rb

@@ -0,0 +1,7 @@
+class AddOauthToUser < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :email, :string
+    add_column :users, :uid, :integer, null: false
+    add_column :users, :provider, :string, null: false
+  end
+end

db/migrate/20181016191127_add_name_to_user.rb

@@ -0,0 +1,5 @@
+class AddNameToUser < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :name, :string
+  end
+end

db/schema.rb

@@ -10,35 +10,39 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170407164321) do
+ActiveRecord::Schema.define(version: 2018_10_16_191127) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "users", force: :cascade do |t|
-    t.string   "username"
+  create_table "users", id: :serial, force: :cascade do |t|
+    t.string "username"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "email"
+    t.integer "uid", null: false
+    t.string "provider", null: false
+    t.string "name"
   end
 
-  create_table "votes", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "work_id"
+  create_table "votes", id: :serial, force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "work_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["user_id"], name: "index_votes_on_user_id", using: :btree
-    t.index ["work_id"], name: "index_votes_on_work_id", using: :btree
+    t.index ["user_id"], name: "index_votes_on_user_id"
+    t.index ["work_id"], name: "index_votes_on_work_id"
   end
 
-  create_table "works", force: :cascade do |t|
-    t.string   "title"
-    t.string   "creator"
-    t.string   "description"
-    t.string   "category"
-    t.datetime "created_at",                   null: false
-    t.datetime "updated_at",                   null: false
-    t.integer  "vote_count",       default: 0
-    t.integer  "publication_year"
+  create_table "works", id: :serial, force: :cascade do |t|
+    t.string "title"
+    t.string "creator"
+    t.string "description"
+    t.string "category"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "vote_count", default: 0
+    t.integer "publication_year"
   end
 
   add_foreign_key "votes", "users"