Sockets - Kirsten

.gitignore

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

Gemfile

@@ -62,7 +62,11 @@ 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.7.2)
+    dotenv-rails (2.7.2)
+      dotenv (= 2.7.2)
+      railties (>= 3.2, < 6.1)
     erubi (1.7.1)
     execjs (2.7.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    hashie (3.6.0)
     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.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-oauth2 (1.6.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.9)
     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)
@@ -227,4 +255,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.16.5
+   1.16.6

app/controllers/users_controller.rb

@@ -8,33 +8,23 @@ def show
     render_404 unless @user
   end
 
-  def login_form
-  end
+  def create
+    auth_hash = request.env["omniauth.auth"]
 
-  def login
-    username = params[:username]
-    if username and user = User.find_by(username: username)
-      session[:user_id] = user.id
+    user = User.get_authorized_user(auth_hash)
+
+    if user.save
       flash[:status] = :success
-      flash[:result_text] = "Successfully logged in as existing user #{user.username}"
+      flash[:result_text] = "Successfully logged in as #{user.name}"
+      session[:user_id] = user.id
     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
+      flash[:status] = :warning
+      flash[:result_text] = "Could not log in #{user.name}"
     end
     redirect_to root_path
   end
 
-  def logout
+  def destroy
     session[:user_id] = nil
     flash[:status] = :success
     flash[:result_text] = "Successfully logged out"

app/controllers/works_controller.rb

@@ -11,7 +11,13 @@ def root
   end
 
   def index
-    @works_by_category = Work.to_category_hash
+    if @login_user
+      @works_by_category = Work.to_category_hash
+    else
+      redirect_to root_path
+      flash[:status] = :warning
+      flash[:result_text] = "You must be logged in to view that page"
+    end
   end
 
   def new
@@ -34,7 +40,13 @@ def create
   end
 
   def show
-    @votes = @work.votes.order(created_at: :desc)
+    if @login_user
+      @votes = @work.votes.order(created_at: :desc)
+    else
+      redirect_to root_path
+      flash[:status] = :warning
+      flash[:result_text] = "You must be logged in to view that page"
+    end
   end
 
   def edit

app/models/user.rb

@@ -2,5 +2,18 @@ class User < ApplicationRecord
   has_many :votes
   has_many :ranked_works, through: :votes, source: :work
 
-  validates :username, uniqueness: true, presence: true
+  validates :name, uniqueness: true, presence: true
+
+  def self.get_authorized_user(auth_hash)
+    user = User.find_by(name: auth_hash["info"]["name"], uid: auth_hash[:uid])
+    unless user
+      user = User.new
+      user.uid = auth_hash[:uid]
+      user.provider = "github"
+      user.name = auth_hash["info"]["name"]
+      user.email = auth_hash["info"]["email"]
+    end
+
+    return user
+  end
 end

app/views/layouts/application.html.erb

@@ -36,16 +36,16 @@
         <% 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" %>
+          <%= link_to "Logged in as #{@login_user.name}", 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" %>
+          <%= link_to "Log Out", logout_path, method: :delete, class: "btn btn-primary" %>
         </li>
 
         <% else %>
 
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Log In", login_path, class: "btn btn-primary" %>
+          <%= link_to "Log In", github_login_path, class: "btn btn-primary" %>
         </li>
         <% end %>
 

app/views/users/index.html.erb

@@ -10,7 +10,7 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
-        <td><%= link_to user.username, user_path(user) %></td>
+        <td><%= link_to user.name, user_path(user) %></td>
         <td><%= user.votes.count %></td>
         <td><%= render_date user.created_at %></td>
       </tr>

app/views/users/show.html.erb

@@ -1,4 +1,4 @@
-<h2>User Summary: <%= link_to @user.username, user_path(@user) %></h2>
+<h2>User Summary: <%= link_to @user.name, user_path(@user) %></h2>
 <p>Joined site <%= render_date @user.created_at %></p>
 
 <section class="user-votes__container">

app/views/works/show.html.erb

@@ -23,7 +23,7 @@
     <tbody>
     <% @votes.each do |vote| %>
       <tr>
-        <td><%= link_to vote.user.username, user_path(vote.user) %></td>
+        <td><%= link_to vote.user.name, user_path(vote.user) %></td>
         <td><%= render_date vote.created_at %></td>
       </li>
     <% end %>

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,17 @@
 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: "users#login_form", as: "login"
-  post "/login", to: "users#login"
-  post "/logout", to: "users#logout", as: "logout"
+  # get "/login", to: "users#login_form", as: "login"
+  # post "/login", to: "users#login"
+  # post "/logout", to: "users#logout", as: "logout"
 
   resources :works
   post "/works/:id/upvote", to: "works#upvote", as: "upvote"
 
   resources :users, only: [:index, :show]
+
+  get "/auth/github", as: "github_login"
+  get "/auth/:provider/callback", to: "users#create", as: "auth_callback"
+
+  delete "/logout", to: "users#destroy", as: "logout"
 end

db/migrate/20190429205918_add_uid_and_provider_to_users.rb

@@ -0,0 +1,6 @@
+class AddUidAndProviderToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :uid, :integer
+    add_column :users, :provider, :string
+  end
+end

db/migrate/20190429210434_drop_add_name_email_users.rb

@@ -0,0 +1,5 @@
+class DropAddNameEmailUsers < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :add_name_and_email_to_users
+  end
+end

db/migrate/20190429210548_add_name_and_email_to_users2.rb

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

db/schema.rb

@@ -10,27 +10,31 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170407164321) do
+ActiveRecord::Schema.define(version: 2019_04_29_210548) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "users", force: :cascade do |t|
+  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|
+  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|
+  create_table "works", id: :serial, force: :cascade do |t|
     t.string "title"
     t.string "creator"
     t.string "description"

test/controllers/users_controller_test.rb

@@ -1,4 +1,53 @@
 require "test_helper"
 
 describe UsersController do
+  describe "index" do
+    it "shows the page" do
+      get users_path
+      must_respond_with :success
+    end
+  end
+
+  describe "logging in/out" do
+    describe "log in" do
+      it "logs in an existing user" do
+        user = users(:ada)
+        start_count = User.count
+
+        perform_login(user)
+        must_redirect_to root_path
+        session[:user_id].must_equal user.id
+
+        User.count.must_equal start_count
+      end
+    end
+
+    it "logs in a new user and saves it to the db" do
+      start_count = User.count
+      user = User.new
+      user.name = "mickey"
+      user.email = "[email protected]"
+      user.uid = 555
+      user.provider = "github"
+      perform_login(user)
+      must_redirect_to root_path
+
+      expect(session[:user_id]).must_equal User.last.id
+
+      User.count.must_equal start_count + 1
+    end
+
+    it "won't log in an invalid user" do
+      user = User.new
+      expect {
+        perform_login(user)
+      }.wont_change "User.count"
+      must_redirect_to root_path
+    end
+
+    it "logs out the user" do
+      delete logout_path
+      must_redirect_to root_path
+    end
+  end
 end