Christina MedRanRev

.gitignore

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

Gemfile

@@ -62,7 +62,10 @@ 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
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "omniauth"
+gem "omniauth-github"

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/sessions_controller.rb

@@ -1,34 +1,59 @@
 class SessionsController < ApplicationController
-  def login_form
-  end
+  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}"
 
-  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)
+      # User doesn't match anything in the DB
+      # Attempt to create a new user
+      user = User.build_from_github(auth_hash)
+
       if user.save
-        session[:user_id] = user.id
-        flash[:status] = :success
-        flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+        flash[:success] = "Logged in as new user #{user.name}"
+
       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
+        # 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
-    redirect_to root_path
-  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
+      # def logout
+      #   session[:user_id] = nil
+      #   flash[:status] = :success
+      #   flash[:result_text] = "Successfully logged out"
+      #   redirect_to root_path
+      # end
+    end
   end
-end

app/controllers/works_controller.rb

@@ -50,7 +50,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
 
@@ -63,6 +63,7 @@ def destroy
 
   def upvote
     flash[:status] = :failure
+
     if @login_user
       vote = Vote.new(user: @login_user, work: @work)
       if vote.save
@@ -79,6 +80,7 @@ def upvote
     # Refresh the page to show either the updated vote count
     # or the error message
     redirect_back fallback_location: work_path(@work)
+
   end
 
 private

app/models/user.rb

@@ -3,4 +3,16 @@ 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.email = auth_hash['info']['email']
+
+   # Note that the user has not been saved
+   return user
+  end
+
 end

app/views/layouts/application.html.erb

@@ -32,22 +32,11 @@
           <%= link_to "View all users", users_path, class: "nav-link" %>
         </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>
-
-        <% else %>
-
-        <li class="nav-item app-header__nav_item">
-          <%= link_to "Log In", login_path, class: "btn btn-primary" %>
-        </li>
-        <% end %>
+      <% if session[:user_id] %>
+        <%= link_to "Log out", logout_path, method: "delete"   %>
+      <% else %>
+        <%= link_to "Login with Github", "/auth/github" %>
+      <% end %>
 
       </ul>
     </nav>

config/initializers/edit.html.erb

@@ -0,0 +1 @@
+<%= render partial: 'form', locals: {action_name: 'Edit a passenger', button_title: 'Update'} %>

config/initializers/omniauth.rb

@@ -0,0 +1,3 @@
+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,14 @@
 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 "/auth/:provider/callback", to: "sessions#create", as: 'auth_callback'
   get '/login', to: 'sessions#login_form', as: 'login'
   post '/login', to: 'sessions#login'
-  post '/logout', to: 'sessions#logout', as: 'logout'
-
+  # post '/logout', to: 'sessions#logout', as: 'logout'
+  delete "/logout", to: "sessions#destroy", as: "logout"
   resources :works
   post '/works/:id/upvote', to: 'works#upvote', as: 'upvote'
-
+  get '/votes/new', to: 'votes#new'
+  post '/votes', to: 'votes#create'
   resources :users, only: [:index, :show]
 end

db/migrate/20181016214201_change_column_name_to_nickname.rb

@@ -0,0 +1,5 @@
+class ChangeColumnNameToNickname < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :users, :username, :nickname
+  end
+end

db/migrate/20181016215622_change_column_name_back_to_users.rb

@@ -0,0 +1,5 @@
+class ChangeColumnNameBackToUsers < ActiveRecord::Migration[5.2]
+  def change
+  rename_column :users, :nickname, :username  
+  end
+end

db/migrate/20181017012927_add_columnto_users.rb

@@ -0,0 +1,5 @@
+class AddColumntoUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :uid, :integer
+  end
+end

db/migrate/20181017035709_add_provider_column_to_users.rb

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

db/migrate/20181017040520_add_pname_column_to_users.rb

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

db/migrate/20181017040740_add_email_to_users.rb

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

db/migrate/edit.html.erb

@@ -0,0 +1 @@
+<%= render partial: 'form', locals: {action_name: 'Edit a passenger', button_title: 'Update'} %>

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_17_040740) 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.integer "uid"
+    t.string "provider"
+    t.string "name"
+    t.string "email"
   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"