Use ombu_labs-auth for authentication (#297)

* Use ombu_labs-auth for the authentication

* Add env to README

* Update gemfile.next.lock

Author: arielj

Gemfile

@@ -17,10 +17,8 @@ if next?
   # read more about it here: https://github.com/rails/rails/issues/43998,
   # and here: https://gist.github.com/claudiug/bdc2fb70b10d19513208c816588aed92
   gem "rails", github: "rails/rails", branch: "7-0-stable"
-  gem "devise", github: "heartcombo/devise", branch: "main"
 else
   gem "rails", "~> 7.0.2"
-  gem "devise"
 end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 
@@ -61,8 +59,7 @@ gem "acts_as_list"
 
 gem "mimemagic", "~> 0.3.8"
 
-gem "omniauth-github", "~> 2.0.0"
-gem "omniauth-rails_csrf_protection"
+gem "ombu_labs-auth"
 
 gem "rack-mini-profiler"
 

Gemfile.lock

@@ -117,7 +117,7 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.3)
-    devise (4.9.1)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -209,6 +209,12 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
+    ombu_labs-auth (1.0.0)
+      devise (~> 4.8.1)
+      omniauth (~> 2.1.0)
+      omniauth-github (~> 2.0.0)
+      omniauth-rails_csrf_protection
+      rails (>= 6.0)
     omniauth (2.1.1)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
@@ -406,7 +412,6 @@ DEPENDENCIES
   capybara-screenshot
   coffee-script
   database_cleaner
-  devise
   dotenv-rails
   factory_bot_rails
   faker
@@ -419,8 +424,7 @@ DEPENDENCIES
   mimemagic (~> 0.3.8)
   newrelic_rpm
   next_rails
-  omniauth-github (~> 2.0.0)
-  omniauth-rails_csrf_protection
+  ombu_labs-auth
   pg
   puma (~> 6.2)
   pundit (~> 2.2)

Gemfile.next.lock

@@ -1,15 +1,3 @@
-GIT
-  remote: https://github.com/heartcombo/devise.git
-  revision: 8593801130f2df94a50863b5db535c272b00efe1
-  branch: main
-  specs:
-    devise (4.8.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
 GIT
   remote: https://github.com/rails/rails.git
   revision: 4408b67742cb7ee3cdc3b3d850e1a3be205bd4e6
@@ -121,7 +109,7 @@ GEM
     ast (2.4.2)
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bindex (0.8.1)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
@@ -157,6 +145,12 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.3)
+    devise (4.8.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
     diff-lcs (1.4.4)
     docile (1.4.0)
     dotenv (2.7.6)
@@ -172,29 +166,14 @@ GEM
       railties (>= 5.0.0)
     faker (2.19.0)
       i18n (>= 1.6, < 2)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.6)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
+    faraday-net_http (3.0.2)
     ffi (1.15.4)
     globalid (1.1.0)
       activesupport (>= 5.0)
-    hashie (4.1.0)
+    hashie (5.0.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.2)
@@ -205,7 +184,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    jwt (2.3.0)
+    jwt (2.7.1)
     launchy (2.5.0)
       addressable (~> 2.7)
     listen (3.7.0)
@@ -214,6 +193,9 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    madmin (1.2.8)
+      pagy (>= 3.5)
+      rails (>= 6.0.3)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -228,9 +210,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.1)
     minitest (5.18.0)
-    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
     net-imap (0.3.4)
       date
       net-protocol
@@ -249,26 +229,34 @@ GEM
       racc (~> 1.4)
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (2.0.4)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    ombu_labs-auth (1.0.0)
+      devise (~> 4.8.1)
+      omniauth (~> 2.1.0)
+      omniauth-github (~> 2.0.0)
+      omniauth-rails_csrf_protection
+      rails (>= 6.0)
+    omniauth (2.1.1)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
       rack-protection
-    omniauth-github (2.0.0)
+    omniauth-github (2.0.1)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.7.1)
-    omniauth-oauth2 (1.7.1)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
-    omniauth-rails_csrf_protection (1.0.0)
+    omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     orm_adapter (0.5.0)
+    pagy (6.0.4)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
@@ -282,7 +270,7 @@ GEM
     rack (2.2.6.4)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
-    rack-protection (2.1.0)
+    rack-protection (3.0.6)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -303,9 +291,9 @@ GEM
     recursive-open-struct (1.1.3)
     redcarpet (3.5.1)
     regexp_parser (2.7.0)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rexml (3.2.5)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
@@ -365,6 +353,9 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
     spring (3.0.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -389,6 +380,7 @@ GEM
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.1.0)
+    version_gem (1.1.3)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.1.0)
@@ -421,20 +413,19 @@ DEPENDENCIES
   capybara-screenshot
   coffee-script
   database_cleaner
-  devise!
   dotenv-rails
   factory_bot_rails
   faker
   jbuilder (~> 2.5)
   jquery-rails
   jquery-ui-rails (~> 5.0, >= 5.0.5)
   listen (~> 3.7)
+  madmin (~> 1.2)
   matrix
   mimemagic (~> 0.3.8)
   newrelic_rpm
   next_rails
-  omniauth-github (~> 2.0.0)
-  omniauth-rails_csrf_protection
+  ombu_labs-auth
   pg
   puma (~> 6.2)
   pundit (~> 2.2)

README.md

@@ -36,6 +36,8 @@ GITHUB_APP_ID=xxxxxxxxxxxxxxxxxxxx
 GITHUB_APP_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ```
 
+`SHOW_DEVELOPER_AUTH=true` can be used to allow easy login without requiring GitHub's setup during local development or in safe review environments.
+
 ## Starting the Server
 
 ```

app/controllers/callbacks_controller.rb

@@ -1,17 +1,5 @@
 class User < ApplicationRecord
-  # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-    :recoverable, :rememberable, :trackable, :validatable, :omniauthable
+  include OmbuLabsAuthenticable
 
   has_many :estimates
-
-  def self.from_omniauth(auth)
-    user_attributes = {
-      email: auth.info.email,
-      name: auth.info.name,
-      password: Devise.friendly_token[0, 20]
-    }
-    where(provider: auth.provider, uid: auth.uid).first_or_create.tap { |user| user.update(user_attributes) }
-  end
 end

app/controllers/registrations_controller.rb

@@ -1,4 +1,4 @@
 <div class="fluid-container center floor signin">
   <h1>Welcome to the Points App</h1>
-  <%= link_to "Sign in", new_user_session_path, class: "button green", id: "edit" %>
+  <%= link_to "Sign in", ombu_labs_auth.new_user_session_path, class: "button green", id: "edit" %>
 </div>

app/models/user.rb

@@ -1,16 +1,19 @@
+<%- title = defined?(header_title) ? header_title : "points app" %>
+<%- link = defined?(header_link) ? header_link : "/projects" %>
+
 <header class="navbar navbar-inverse">
   <div class="container">
     <div class="row">
       <div class="col-xs-10">
-        <%= link_to header_title, header_link, id: "logo" %>
+        <%= link_to title, link, id: "logo" %>
       </div>
       <div class="col-xs-2">
         <nav>
           <ul class="nav">
             <% if current_user %>
-              <%= link_to "Sign out", destroy_user_session_path, method: :delete, class: "button magenta" %>
+              <%= link_to "Sign out", ombu_labs_auth.destroy_user_session_path, method: :delete, class: "button magenta" %>
             <% else %>
-              <%= link_to "Sign in", new_user_session_path, class: "button green" %>
+              <%= link_to "Sign in", ombu_labs_auth.new_user_session_path, class: "button green" %>
             <% end %>
           </ul>
         </nav>

app/views/home/index.html.erb

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Points - Sign in</title>
+    <%= csrf_meta_tags %>
+    <!-- Fonts -->
+    <link href='https://fonts.googleapis.com/css?family=Lato:700|Open+Sans:400,300,300italic,400italic,700,700italic' rel='stylesheet' type='text/css'>
+    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
+  <body class="content <%= controller_name %>-controller <%= action_name %>-action">
+    <%= render 'layouts/header' %>
+    <div>
+      <main class="fluid-container">
+        <%= render 'layouts/flash' %>
+        <%= yield %>
+      </main>
+      <%= render 'layouts/footer' %>
+    </div>
+    <%= render 'layouts/modal' %>
+  </body>
+</html>