strongmind-auth 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306122e7c423973cd711bff6f4802a60e1970aa74b79482d8ac7cace0bb1fd95
-  data.tar.gz: 28098227cf9ff1869bdee71dae13dbcdbb5f1d066861c63c75e3e63c749f4825
+  metadata.gz: 5744571fb4c34f46eab563a74d0f09ff0da1a5d88be521d785d42bf11537b354
+  data.tar.gz: '036694d87a468271a854342b34823357649def9b7ee12fbccbaa9e1384c90a70'
 SHA512:
-  metadata.gz: d0829abe155dc13d7422659d51c684bb4e47fde17b496af7ba19cc5dd40c44b8c3602a62a98aca86b2bb18d16efc0f1148478ca002e8a92efe842ee6fbdd56a6
-  data.tar.gz: 4dd5f8659fde38e46a617afb817e9d350b231b3cb49c6f537af7563669e1ae671c22111fd9339b5bc57b7265a1ca8ce70aaa9541bdbbb2eb7e32bd5b7dd84476
+  metadata.gz: 56e34ffb177bf0949cf0d8e670dd407e8c554ad88138432054b9bd1439ca989b6d5a020a461c9dc9204b5ead7dd81ef852e89114b7ea2d534dca7c44e6e8d610
+  data.tar.gz: 144c638476dabe423587f743b175a49a0e3a325ac64db51af008aab7ef3282e37e0471e99ff7c9698721bd74852e50d246cc7bf75e5fa6f4e5d4a5fc111dbc28

data/app/controllers/concerns/strong_mind_nav.rb

@@ -12,6 +12,9 @@ module StrongMindNav
       @theme_css = navbar[:theme_css]
     rescue Strongmind::CommonNavFetcher::TokenNotFoundError, Strongmind::CommonNavFetcher::UserNotFoundError => e
       Sentry.capture_exception(e)
+      Rails.logger.error(e)
+      flash[:alert] = e.inspect if Rails.env.development?
+      @stop_redirect = true if Rails.env.development?
       render 'logins/index'
     rescue Exception => e
       Sentry.capture_exception(e)

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -22,7 +22,19 @@ module Users
     end
 
     def failure
-      redirect_to root_url
+      client_errors = [
+        "#<AttrRequired::AttrMissing: 'identifier' required.>",
+        "#<Rack::OAuth2::Client::Error: invalid_client>",
+      ]
+      if client_errors.include?(request.env['omniauth.error'].inspect)
+        render
+      else
+        redirect_to root_path
+      end
+    end
+
+    def passthru
+      redirect_to root_path
     end
   end
 

data/app/controllers/users/sessions_controller.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Users
+  class SessionsController < Devise::SessionsController
+    skip_before_action :fetch_common_nav
+
+    def login
+      redirect_to user_strongmind_omniauth_authorize_url
+    end
+
+    def new
+      redirect_to user_strongmind_omniauth_authorize_url
+    end
+
+  end
+end

data/app/views/logins/index.html.erb

@@ -22,13 +22,22 @@
 
     // Submit the form on load
     window.addEventListener("load", (event) => {
+        <% if @stop_redirect %>
+        return;
+        <% end %>
         submitForm();
     });
 
 </script>
 <div id="loading">
+  <% flash.each do |type, message| %>
+    <div class="alert alert-<%= type %>"><%= message %></div>
+  <% end %>
+  <% flash.clear %>
   <div class="sm-loader">
-    <img src="https://prod-backpack-ui.strongmind.com/assets/images/strongmind-loader.svg">
+    <% unless @stop_redirect %>
+      <img src="https://prod-backpack-ui.strongmind.com/assets/images/strongmind-loader.svg">
+    <% end %>
   </div>
 
 </div>

data/app/views/users/omniauth_callbacks/failure.html.erb

@@ -0,0 +1,129 @@
+<%
+  require 'json'
+
+  if Rails.env.development?
+    app_name = Rails.application.class.name.split("::").first.underscore.dasherize
+    if app_name == "app"
+%>
+    Please set the name of your application in the module line of config/application.rb and restart your server.
+  <%
+    else
+  %>
+    <script>
+        function toggleInstructions() {
+            if (document.getElementById('new_app_yes').checked) {
+                document.getElementById('new_app_instructions').style.display = 'block';
+                document.getElementById('existing_app_instructions').style.display = 'none';
+            } else {
+                document.getElementById('new_app_instructions').style.display = 'none';
+                document.getElementById('existing_app_instructions').style.display = 'block';
+            }
+        }
+    </script>
+    <div>
+      Your StrongMind Identity client does not appear to be configured correctly.
+    </div>
+    <div>
+      Is this a brand new app that needs to be setup in StrongMind Identity?
+    </div>
+    <div class="flex">
+      <input type="radio" name="new_app" value="yes" id="new_app_yes" onclick="toggleInstructions()">
+      <label for="new_app_yes" style="margin-left: 5px">Yes</label>
+    </div>
+    <div class="flex">
+      <input type="radio" name="new_app" value="no" id="new_app_no" onclick="toggleInstructions()">
+      <label for="new_app_no" style="margin-left: 5px">No</label>
+    </div>
+
+    <div id="existing_app_instructions" style="display: none; margin-top: 10px">
+      Grab the .env file from Bitwarden and place it in the root of your project. Restart your server.
+    </div>
+    <div id="new_app_instructions" style="display: none; margin-top: 10px">
+      <div>
+        Please follow these steps:
+      </div>
+      <%
+        local_app_url = "http://localhost:3000"
+        stage_app_url = "https://stage-#{app_name}.strongmind.com"
+        prod_app_url = "https://#{app_name}.strongmind.com"
+        local_redirect_url = "#{local_app_url}/users/auth/strongmind/callback"
+        stage_redirect_url = "#{stage_app_url}/users/auth/strongmind/callback"
+        prod_redirect_url = "#{prod_app_url}/users/auth/strongmind/callback"
+        stage_post_logout_redirect_url = "https://stage-#{app_name}.strongmind.com"
+        prod_post_logout_redirect_url = "https://#{app_name}.strongmind.com"
+        stage_backchannel_logout_url = "https://stage-#{app_name}.strongmind.com/users/endsession"
+        prod_backchannel_logout_url = "https://#{app_name}.strongmind.com/users/endsession"
+
+        stage_login_base_url = "https://devlogin.strongmind.com"
+        prod_login_base_url = "https://login.strongmind.com"
+        stage_secret = SecureRandom.hex(16)
+        prod_secret = SecureRandom.hex(16)
+        stage_url = "#{stage_login_base_url}/Clients/Create?"
+        stage_url += "ClientID=#{app_name}&"
+        stage_url += "RedirectURL=#{local_redirect_url}&"
+        stage_url += "RedirectURL=#{stage_redirect_url}&"
+        stage_url += "PostLogoutRedirectURL=#{stage_post_logout_redirect_url}&"
+        stage_url += "BackChannelLogoutUri=#{stage_backchannel_logout_url}&"
+        stage_url += "ClientSecret=#{stage_secret}"
+
+        prod_url = "#{prod_login_base_url}/Clients/Create?"
+        prod_url += "ClientID=#{app_name}&"
+        prod_url += "RedirectURL=#{prod_redirect_url}&"
+        prod_url += "PostLogoutRedirectURL=#{prod_post_logout_redirect_url}&"
+        prod_url += "BackChannelLogoutUri=#{prod_backchannel_logout_url}&"
+        prod_url += "ClientSecret=#{prod_secret}"
+
+        env_file_additions = "IDENTITY_CLIENT_ID=#{app_name}\nIDENTITY_CLIENT_SECRET=#{stage_secret}\n# Production\n#IDENTITY_CLIENT_SECRET=#{prod_secret}"
+      %>
+
+      <ol style="list-style: decimal">
+        <li>
+          <%= link_to "Create Client in Staging Identity Server", stage_url, { target: "_blank" } %>
+        </li>
+        <li>
+          <%= link_to "Create Client in Production Identity Server", prod_url, { target: "_blank" } %>
+        </li>
+        <li>
+          <div>
+            Set the following environment variables in your .env file:
+          </div>
+          <textarea style="width: 100%; height: 200px"><%= env_file_additions %></textarea>
+          <br/>
+          <button onclick="navigator.clipboard.writeText(document.querySelector('textarea').value)">
+            Copy to clipboard
+          </button>
+          <br/><br/>
+        </li>
+        <li>
+          Save the .env file into a new Bitwarden item called "<%= app_name %> .env"
+        </li>
+        <li>
+          Restart your server.
+        </li>
+      </ol>
+    </div>
+  <%
+    end
+    else %>
+  This application is not configured properly.
+  <br/>
+  Please contact your nearest engineer using a ticket.
+  <br/>
+
+  Provide them this information:
+  <%
+    info = {
+      url: request.url,
+      error: request.env['omniauth.error']
+    }
+  %>
+  <textarea style="width: 100%; height: 200px"><%= JSON.pretty_generate(info) %></textarea>
+  <!-- copy to clipboard -->
+  <button onclick="navigator.clipboard.writeText(document.querySelector('textarea').value)">
+    Copy to clipboard
+  </button>
+
+  <div>
+    <%= link_to "Back to Home", "/", data: { turbo: false } %>
+  </div>
+<% end %>

data/config/routes.rb

@@ -3,7 +3,8 @@ Rails.application.routes.draw do
   return if defined? Rails::Generators
 
   devise_for :users, controllers: {
-    omniauth_callbacks: "users/omniauth_callbacks"
+    omniauth_callbacks: 'users/omniauth_callbacks',
+    sessions: 'users/sessions'
   }
 
   devise_scope :user do

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.0.9"
+    VERSION = "1.0.11"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -52,7 +52,10 @@ module Strongmind
 
     def token
       cache_data = Rails.cache.fetch(user.uid)
-      raise TokenNotFoundError, "Token not found for user #{user.id}" unless cache_data&.key?(:access_token)
+      cache_missing_message = " - check your caching settings (switch to file or redis)" if Rails.env.development?
+      unless cache_data&.key?(:access_token)
+        raise TokenNotFoundError, "Token not found for user #{user.uid}#{cache_missing_message}"
+      end
 
       cache_data[:access_token]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Team Belding
@@ -108,12 +108,14 @@ files:
 - app/controllers/concerns/strong_mind_nav.rb
 - app/controllers/logins_controller.rb
 - app/controllers/users/omniauth_callbacks_controller.rb
+- app/controllers/users/sessions_controller.rb
 - app/helpers/strongmind/auth/application_helper.rb
-- app/jobs/rails/auth/application_job.rb
-- app/mailers/rails/auth/application_mailer.rb
+- app/jobs/strongmind/auth/application_job.rb
+- app/mailers/strongmind/auth/application_mailer.rb
 - app/models/user_base.rb
 - app/views/layouts/_loading_navbar.html.erb
 - app/views/logins/index.html.erb
+- app/views/users/omniauth_callbacks/failure.html.erb
 - config/initializers/devise.rb
 - config/routes.rb
 - lib/generators/strongmind/USAGE