From c32b48213aad40a8487819e779fef00fe41520fe Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Mon, 17 Oct 2016 10:53:35 -0400 Subject: [PATCH 1/3] docker --- Dockerfile | 7 +++++++ docker-compose.yml | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..0fcc4a44 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM ruby:2.3.1 + +# app dependencies +RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs + +# app directory +RUN mkdir /usr/src/app diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..48f53d1c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,24 @@ +version: '2' +services: + web: + build: . + ports: + - '80:80' + volumes: + - '.:/usr/src/app' + - '~/.ssh:/root/.ssh/' + volumes_from: + - gem_cache + expose: + - '3001' + working_dir: '/usr/src/app' + stdin_open: true + tty: true + command: bundle exec rails s -p 80 -b '0.0.0.0' + depends_on: + - gem_cache + gem_cache: + image: ruby:2.3.1 + command: bin/true + volumes: + - /usr/local/bundle From 0d73a77f1fda96e5cf972a965bdd47ba511b926d Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Mon, 17 Oct 2016 14:26:31 -0400 Subject: [PATCH 2/3] omniauth strategy --- Gemfile | 2 +- Gemfile.lock | 7 +++++- app/controllers/application_controller.rb | 5 +++++ app/controllers/sessions_controller.rb | 17 +++++++++++++++ app/models/user.rb | 9 ++++++++ config/routes.rb | 2 ++ db/migrate/20161017160526_create_users.rb | 15 +++++++++++++ db/schema.rb | 26 +++++++++++++++++++++++ test/fixtures/users.yml | 11 ++++++++++ test/models/user_test.rb | 7 ++++++ 10 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/models/user.rb create mode 100644 db/migrate/20161017160526_create_users.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/Gemfile b/Gemfile index 00c79238..e7bff0e5 100644 --- a/Gemfile +++ b/Gemfile @@ -47,5 +47,5 @@ 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 'bigbluebutton-api-ruby' - diff --git a/Gemfile.lock b/Gemfile.lock index 3aa0a317..1f53b57b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,6 +57,7 @@ GEM ffi (1.9.14) globalid (0.3.7) activesupport (>= 4.1.0) + hashie (3.4.6) i18n (0.7.0) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) @@ -82,6 +83,9 @@ GEM nio4r (1.2.1) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) + omniauth (1.3.1) + hashie (>= 1.2, < 4) + rack (>= 1.0, < 3) puma (3.6.0) rack (2.0.1) rack-test (0.6.3) @@ -163,6 +167,7 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) + omniauth puma (~> 3.0) rails (~> 5.0.0, >= 5.0.0.1) sass-rails (~> 5.0) @@ -175,4 +180,4 @@ DEPENDENCIES web-console BUNDLED WITH - 1.13.2 + 1.13.4 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e..5e1257af 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,8 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + + def current_user + @current_user ||= User.find_by(id: session[:user_id]) + end + helper_method :current_user end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 00000000..e2ab24aa --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,17 @@ +class SessionsController < ApplicationController + def create + @user = User.from_omniauth(request.env['omniauth.auth']) + session[:user_id] = @user.id + rescue => e + logger.error "Error authenticating via omniauth: #{e}" + ensure + redirect_to root_path + end + + def destroy + if current_user + session.delete(:user_id) + end + redirect_to root_path + end +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 00000000..80c35a02 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,9 @@ +class User < ApplicationRecord + + def self.from_omniauth(auth_hash) + user = find_or_create_by(uid: auth_hash['uid'], provider: auth_hash['provider']) + user.name = auth_hash['info']['name'] + user.save! + user + end +end diff --git a/config/routes.rb b/config/routes.rb index 57c3044e..e7d2d4e3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do get 'meeting(/:id)', to: 'landing#index' + get '/auth/:provider/callback', to: 'sessions#create' + get '/logout', to: 'sessions#destroy' root to: 'landing#index' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html diff --git a/db/migrate/20161017160526_create_users.rb b/db/migrate/20161017160526_create_users.rb new file mode 100644 index 00000000..c795a6ee --- /dev/null +++ b/db/migrate/20161017160526_create_users.rb @@ -0,0 +1,15 @@ +class CreateUsers < ActiveRecord::Migration[5.0] + def change + create_table :users do |t| + t.string :provider, null: false + t.string :uid, null: false + t.string :name + + t.timestamps + end + + add_index :users, :provider + add_index :users, :uid + add_index :users, [:provider, :uid], unique: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 00000000..1834e3e8 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,26 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20161017160526) do + + create_table "users", force: :cascade do |t| + t.string "provider", null: false + t.string "uid", null: false + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["provider", "uid"], name: "index_users_on_provider_and_uid", unique: true + t.index ["provider"], name: "index_users_on_provider" + t.index ["uid"], name: "index_users_on_uid" + end + +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 00000000..2f72a665 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + provider: MyString + uid: MyString + name: MyString + +two: + provider: MyString + uid: MyString + name: MyString diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 00000000..82f61e01 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 3eeaacc6f4cb6560ae5f70514c0f2644a6689cc6 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Mon, 17 Oct 2016 15:06:11 -0400 Subject: [PATCH 3/3] add twitter and google oauth login --- .gitignore | 1 + Gemfile | 3 +++ Gemfile.lock | 34 ++++++++++++++++++++++++++++++++ app/views/landing/index.html.erb | 10 ++++++++++ config/initializers/omniauth.rb | 5 +++++ sample.env | 4 ++++ 6 files changed, 57 insertions(+) create mode 100644 config/initializers/omniauth.rb create mode 100644 sample.env diff --git a/.gitignore b/.gitignore index bab620de..e4089d81 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ /tmp/* !/log/.keep !/tmp/.keep +.env # Ignore Byebug command history file. .byebug_history diff --git a/Gemfile b/Gemfile index e7bff0e5..afc9399f 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,7 @@ gem 'jbuilder', '~> 2.5' 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' end group :development do @@ -48,4 +49,6 @@ end gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'omniauth' +gem 'omniauth-twitter' +gem 'omniauth-google-oauth2' gem 'bigbluebutton-api-ruby' diff --git a/Gemfile.lock b/Gemfile.lock index 1f53b57b..aa954982 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,8 +52,14 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) + railties (>= 4.0, < 5.1) erubis (2.7.0) execjs (2.7.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) ffi (1.9.14) globalid (0.3.7) activesupport (>= 4.1.0) @@ -66,6 +72,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + json (1.8.3) + jwt (1.5.6) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -80,12 +88,35 @@ GEM mini_portile2 (2.1.0) minitest (5.9.1) multi_json (1.12.1) + multi_xml (0.5.5) + multipart-post (2.0.0) nio4r (1.2.1) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) + oauth (0.5.1) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) + omniauth-google-oauth2 (0.4.1) + jwt (~> 1.5.2) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.3.1) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-twitter (1.2.1) + json (~> 1.3) + omniauth-oauth (~> 1.1) puma (3.6.0) rack (2.0.1) rack-test (0.6.3) @@ -164,10 +195,13 @@ DEPENDENCIES bigbluebutton-api-ruby byebug coffee-rails (~> 4.2) + dotenv-rails jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) omniauth + omniauth-google-oauth2 + omniauth-twitter puma (~> 3.0) rails (~> 5.0.0, >= 5.0.0.1) sass-rails (~> 5.0) diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb index fed5c740..935f565a 100644 --- a/app/views/landing/index.html.erb +++ b/app/views/landing/index.html.erb @@ -33,3 +33,13 @@

You can have a personal URL (with recordings) by signing in below

+ +<% if current_user.nil? %> +
    +
  • <%= link_to 'Twitter', '/auth/twitter' %>
    • +
  • <%= link_to 'Google', '/auth/google' %>
    • +
+<% else %> +
Hello <%= current_user.name %>
+<%= link_to 'Logout', '/logout' %> +<% end %> diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb new file mode 100644 index 00000000..0a60c18d --- /dev/null +++ b/config/initializers/omniauth.rb @@ -0,0 +1,5 @@ +Rails.application.config.middleware.use OmniAuth::Builder do + provider :twitter, ENV['TWITTER_ID'], ENV['TWITTER_SECRET'] + provider :google_oauth2, ENV['GOOGLE_OAUTH2_ID'], ENV['GOOGLE_OAUTH2_SECRET'], + scope: 'profile', access_type: 'online', name: 'google' +end diff --git a/sample.env b/sample.env new file mode 100644 index 00000000..434a664a --- /dev/null +++ b/sample.env @@ -0,0 +1,4 @@ +TWITTER_ID= +TWITTER_SECRET= +GOOGLE_OAUTH2_ID= +GOOGLE_OAUTH2_SECRET=