Queues - Andrea Valliere - OAuth Media Ranker

.gitignore

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

Gemfile

@@ -39,6 +39,9 @@ gem 'jbuilder', '~> 2.5'
 # Use the Foundation CSS framework
 gem 'foundation-rails'
 
+gem 'omniauth'
+gem 'omniauth-github'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
@@ -48,6 +51,11 @@ group :development, :test do
 
   # Use pry for rails console
   gem 'pry-rails'
+
+  # Use .env file for OAuth client ID and client secret
+  gem 'dotenv-rails'
+
+  gem 'binding_of_caller'
 end
 
 group :test do

Gemfile.lock

@@ -49,6 +49,8 @@ GEM
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
     bindex (0.5.0)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (9.0.6)
     coderay (1.1.1)
@@ -60,15 +62,23 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
+    debug_inspector (0.0.2)
+    dotenv (2.2.0)
+    dotenv-rails (2.2.0)
+      dotenv (= 2.2.0)
+      railties (>= 3.2, < 5.1)
     erubis (2.7.0)
     execjs (2.7.0)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     foundation-rails (6.3.0.0)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
       sprockets-es6 (>= 0.9.0)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
+    hashie (3.5.5)
     i18n (0.8.1)
     jbuilder (2.6.3)
       activesupport (>= 3.0.0, < 5.2)
@@ -77,6 +87,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jwt (1.5.6)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -104,9 +115,26 @@ GEM
       minitest (~> 5.0)
       rails (>= 4.1)
     multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nio4r (2.0.0)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-github (1.2.3)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
     pg (0.20.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -194,8 +222,10 @@ PLATFORMS
 
 DEPENDENCIES
   better_errors
+  binding_of_caller
   byebug
   coffee-rails (~> 4.2)
+  dotenv-rails
   foundation-rails
   jbuilder (~> 2.5)
   jquery-rails
@@ -204,6 +234,8 @@ DEPENDENCIES
   minitest-reporters
   minitest-skip
   minitest-spec-rails
+  omniauth
+  omniauth-github
   pg (~> 0.18)
   pry-rails
   puma (~> 3.0)
@@ -220,4 +252,4 @@ RUBY VERSION
    ruby 2.4.0p0
 
 BUNDLED WITH
-   1.14.4
+   1.14.6

app/controllers/application_controller.rb

@@ -1,17 +1,26 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
-  before_action :find_user
+  before_action :lookup_user
 
   def render_404
     # DPR: supposedly this will actually render a 404 page in production
     raise ActionController::RoutingError.new('Not Found')
   end
 
 private
-  def find_user
-    if session[:user_id]
-      @login_user = User.find_by(id: session[:user_id])
+  def lookup_user
+    unless session[:user_id].nil?
+      @current_user = User.find_by(id: session[:user_id])
+    end
+  end
+
+  def require_login
+    lookup_user
+    if @current_user.nil?
+      flash[:result_text] = "You must be logged in to see that page"
+      # In a before_action filter, this will prevent the action from running at all
+      redirect_to root_path
     end
   end
 end

app/controllers/sessions_controller.rb

@@ -2,29 +2,67 @@ 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)
+  # 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 create
+    auth_hash = request.env['omniauth.auth']
+    # if auth_hash['uid']
+    user = User.find_by(oauth_provider: params[:provider], oauth_uid: auth_hash["uid"])
+    if user.nil?
+      # User doesn't match anything in the DB
+      # Attempt to create a new user
+      user = User.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] = "Successfully logged in as new user #{user.username}"
       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
+        flash[:message] = "Could not log in"
+        user.errors.messages.each do |field, problem|
+          flash[:field] = problem.join(', ')
+        end
       end
+
+    else
+      # Welcome back!
+      session[:user_id] = user.id
+      flash[:success] = "Welcome back, #{user.username}"
     end
     redirect_to root_path
   end
 
+  def index
+    @current_user = User.find(session[:user_id]) # < recalls the value set in a previous request
+  end
+
   def logout
     session[:user_id] = nil
     flash[:status] = :success

app/controllers/users_controller.rb

@@ -7,4 +7,29 @@ def show
     @user = User.find_by(id: params[:id])
     render_404 unless @user
   end
+
+  # def auth_callback
+  #   auth_hash = request.env['omniauth.auth']
+  #   # Log in a returning user
+  #   user = User.find_by(oauth_provider: params[:provider], oauth_uid: auth_hash["uid"])
+  #   if user.nil?
+  #     # Build a new user
+  #     user = User.from_github(auth_hash)
+  #
+  #       if user.save
+  #         session[:user_id] = user.oauth_uid
+  #         flash[:message] = "Successfully logged in as new user #{user.username}"
+  #       else
+  #         flash[:message] = "Could not log in"
+  #         user.errors.messages.each do |field, problem|
+  #           flash[:field] = problem.join(', ')
+  #       end
+  #     end
+  #   else
+  #     session[:user_id] = user.oauth_uid
+  #     flash[:message] = "Successfully logged in as returning user #{user.username}"
+  #   end
+  #   redirect_to root_path
+  # end
+
 end

app/controllers/works_controller.rb

@@ -3,6 +3,7 @@ class WorksController < ApplicationController
   # of work we're dealing with
   before_action :category_from_url, only: [:index, :new, :create]
   before_action :category_from_work, except: [:root, :index, :new, :create]
+  before_action :require_login, except: [:root]
 
   def root
     @albums = Work.best_albums
@@ -91,7 +92,7 @@ def upvote
 
 private
   def media_params
-    params.require(:work).permit(:title, :category, :creator, :description, :publication_year)
+    params.require(:work).permit(:title, :category, :creator, :description, :publication_year, :user_id)
   end
 
   def category_from_url

app/models/user.rb

@@ -1,6 +1,16 @@
 class User < ApplicationRecord
   has_many :votes
   has_many :ranked_works, through: :votes, source: :work
+  has_many :works
 
   validates :username, uniqueness: true, presence: true
+
+  def self.from_github(auth_hash)
+    user = User.new
+    user.username = auth_hash["info"]["nickname"]
+    user.email = auth_hash["info"]["email"]
+    user.oauth_uid = auth_hash["uid"]
+    user.oauth_provider = "github"
+    return user
+  end
 end

app/models/work.rb

@@ -1,6 +1,7 @@
 class Work < ApplicationRecord
   has_many :votes, dependent: :destroy
   has_many :ranking_users, through: :votes, source: :user
+  belongs_to :user
 
   validates :category,  presence: true,
                         inclusion: { in: %w(album book movie) }

app/views/layouts/application.html.erb

@@ -18,12 +18,14 @@
 
     <!-- TODO DPR: this looks really silly when the screen size is small -->
     <div class="columns large-3 small-12">
-      <% if @login_user %>
-        <p class="text-right">Logged in as <%= link_to @login_user.username, user_path(@login_user) %></p>
-        <%= link_to "Log Out", logout_path, method: :post, class: "button float-right" %>
+      <% if @current_user %>
+        <p>
+          Currently logged in as <%= @current_user.username %>
+          <%= link_to "Log Out", logout_path, class: "button"%>
+        </p>
       <% else %>
-        <p class="text-right">Not logged in</p>
-        <%= link_to "Log In", login_path, class: "button float-right" %>
+        <p>Not logged in</p>
+        <%= link_to "Log in", "/auth/github", class: "button" %>
       <% end %>
     </div>
   </header>

app/views/sessions/create.html.erb

@@ -0,0 +1 @@
+<h1>yass!</h1>

app/views/works/_form.html.erb

@@ -1,7 +1,8 @@
 <section>
   <%= form_for @work do |f| %>
     <%= f.hidden_field :category, value: @work.category %>
-
+    <%= f.hidden_field :user_id, value: @current_user.id %>
+
     <%= f.label :title %>
     <%= f.text_field :title %>
 

app/views/works/new.html.erb

@@ -1,2 +1,2 @@
 <h3>Add a new <%= @media_category.singularize %></h3>
-<%= render partial: "form" %>
+<%= render partial: "form", locals: {action_name: "Create"} %>

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

@@ -3,7 +3,7 @@
   root 'works#root'
   get '/login', to: 'sessions#login_form', as: 'login'
   post '/login', to: 'sessions#login'
-  post '/logout', to: 'sessions#logout', as: 'logout'
+  get '/logout', to: 'sessions#logout', as: 'logout'
 
   # Build the category routes for albums, books and movies
   category_constraints = { category: /(albums)|(books)|(movies)/}
@@ -16,4 +16,6 @@
   post '/works/:id/upvote', to: 'works#upvote', as: 'upvote'
 
   resources :users, only: [:index, :show]
+
+  get "/auth/:provider/callback", to: "sessions#create"
 end

db/migrate/20170417221502_add_columns_to_users.rb

@@ -0,0 +1,7 @@
+class AddColumnsToUsers < ActiveRecord::Migration[5.0]
+  def change
+    add_column :users, :oauth_uid, :string
+    add_column :users, :oauth_provider, :string
+    add_column :users, :email, :string
+  end
+end

db/migrate/20170418184107_add_user_id_to_works.rb

@@ -0,0 +1,5 @@
+class AddUserIdToWorks < ActiveRecord::Migration[5.0]
+  def change
+    add_reference :works, :user, index: true
+  end
+end