Naheed Edges

.gitignore

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

Gemfile

@@ -4,7 +4,8 @@ git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
 end
-
+gem "omniauth"
+gem "omniauth-github"
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails'
 # Use postgresql as the database for Active Record
@@ -39,7 +40,7 @@ gem 'bootstrap', '~> 4.1.3'
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
-
+  gem 'dotenv-rails'
   # Improve the error message you get in the browser
   gem 'better_errors'
   gem 'binding_of_caller'

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

@@ -14,4 +14,10 @@ def find_user
       @login_user = User.find_by(id: session[:user_id])
     end
   end
+  def require_login
+    if find_user.nil?
+      flash[:warning] = "You must be logged in to view this section"
+      redirect_to root_path
+    end
+  end
 end

app/controllers/sessions_controller.rb

@@ -2,33 +2,71 @@ class SessionsController < ApplicationController
   def login_form
   end
 
-  def login
-    username = params[:username]
-    if username and user = User.find_by(username: username)
-      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)
-      if user.save
-        session[:user_id] = user.id
-        flash[:status] = :success
-        flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
-      else
-        flash.now[:status] = :failure
-        flash.now[:result_text] = "Could not log in"
-        flash.now[:messages] = user.errors.messages
-        render "login_form", status: :bad_request
-        return
-      end
-    end
+  # def login
+  #   username = params[:username]
+  #   if username and user = User.find_by(username: username)
+  #     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)
+  #     if user.save
+  #       session[:user_id] = user.id
+  #       flash[:status] = :success
+  #       flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+  #     else
+  #       flash.now[:status] = :failure
+  #       flash.now[:result_text] = "Could not log in"
+  #       flash.now[:messages] = user.errors.messages
+  #       render "login_form", status: :bad_request
+  #       return
+  #     end
+  #   end
+  #   redirect_to root_path
+  # end
+  #
+  # def logout
+  #   session[:user_id] = nil
+  #   flash[:status] = :success
+  #   flash[:result_text] = "Successfully logged out"
+  #   redirect_to root_path
+  # end
+  def destroy
+    session[:user_id] = nil
+    flash[:success] = "Successfully logged out!"
+
     redirect_to root_path
   end
 
-  def logout
-    session[:user_id] = nil
-    flash[:status] = :success
-    flash[:result_text] = "Successfully logged out"
-    redirect_to root_path
+  def create
+    auth_hash = request.env['omniauth.auth']
+
+   user = User.find_by(uid: auth_hash[:uid], provider: 'github')
+   if user
+     # User was found in the database
+     flash[:success] = "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[:success] = "Logged in as new 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[:error] = "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
 end

app/controllers/users_controller.rb

@@ -1,4 +1,5 @@
 class UsersController < ApplicationController
+  before_action :require_login
   def index
     @users = User.all
   end

app/controllers/works_controller.rb

@@ -2,6 +2,7 @@ class WorksController < ApplicationController
   # We should always be able to tell what category
   # of work we're dealing with
   before_action :category_from_work, except: [:root, :index, :new, :create]
+  before_action :require_login, except: [:root]
 
   def root
     @albums = Work.best_albums
@@ -50,7 +51,7 @@ 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
 

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.uid = auth_hash[:uid]
+     user.provider = 'github'
+     user.name = auth_hash['info']['name']
+     user.username = auth_hash['info']['nickname']
+     user.email = auth_hash['info']['email']
+     # Note that the user has not been saved
+     return user
+  end
 end

app/views/layouts/application.html.erb

@@ -33,22 +33,11 @@
         </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] %>
+        <%= link_to "Log Out", logout_path, method: :delete, class: "btn btn-primary" %>
         <% else %>
-
-        <li class="nav-item app-header__nav_item">
-          <%= link_to "Log In", login_path, class: "btn btn-primary" %>
-        </li>
+        <%= link_to "Login with Github", "/auth/github", class: "btn btn-primary" %>
         <% end %>
-
       </ul>
     </nav>
   </header>

config/initializers/_passenger_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_with model: @passenger, class: 'passenger-form' do |f| %>
+
+  <h3><%= form_with %></h3>
+
+  <%= f.label :name %>
+  <%= f.text_field :name %>
+
+  <%= f.label :phone_num %>
+  <%= f.text_field :phone_num %>
+
+  <%= f.submit action_type, class: "passenger-form-submit-button" %>
+
+<% end %>

config/initializers/edit.html.erb

@@ -0,0 +1,8 @@
+<h2>Edit This Passenger</h2>
+
+
+<%= render partial: "passenger_form", locals: {
+  action_type: "Submit Changes",
+  form_title: "Edit!"
+  }
+%>

config/initializers/new.html.erb

@@ -0,0 +1,11 @@
+<h2>New Passenger</h2>
+
+<%= render partial: "passenger_form", locals: {
+  action_type: "Submit",
+  form_title: "New!"
+  }
+%>
+
+<p>
+  Add a new passenger here
+</p>

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,16 @@
 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#create", as: 'auth_callback'
+
+  delete "/logout", to: "sessions#destroy", as: "logout"
+
 end

db/migrate/20181016184742_add_more_columns_to_users.rb

@@ -0,0 +1,8 @@
+class AddMoreColumnsToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :name, :string
+    add_column :users, :email, :string
+    add_column :users, :uid, :integer, null: false # this is the identifier provided by GitHub
+    add_column :users, :provider, :string, null: false # this tells us who provided the identifier
+  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_184742) 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 "name"
+    t.string "email"
+    t.integer "uid", null: false
+    t.string "provider", null: false
   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"