self-auth-rails 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7bf53acb259dc5c315fcf6222d30d099a3c95ada6b9bacb5d51554d8dc6ec08
-  data.tar.gz: 7d0fb909e65049f4f3ae8a16ccb15d0f82510a8d1f03bab09b84b4187aad37b2
+  metadata.gz: bf781d804c0ffa2b64e556ee4e4ff2ae9dd7779238270f07fc52a1195d248919
+  data.tar.gz: e14c79f5e3707d3746bb68cab347e3188ca7b87a6953baebf550bd128a1e6a8b
 SHA512:
-  metadata.gz: 51c1afac76389b629e41e293dd2e1d21826e3629602b3f7a770073a1731168cec1ccec7a66cdcf1a5c61c8d87b8772b9ee28302b6b3296cd92ad2fbe2c1ed477
-  data.tar.gz: 10e87468d332a8106727f5ecb2c75eab382163df0fbe5468d91dbc11e3a69fcb2fd4e7befdd01a089c8dae1024ef3183b79ceb1a1e295f457ee075e8dde0e61c
+  metadata.gz: 82878606f3c836b1be735efd255b0fb2dcae4367f63eaf183a3bf30185666be9b23c361d25b296ccae037377b1c63b3444ca0a790721e2c2a80f0c43be7cd0be
+  data.tar.gz: 461433464dfd4c7202c2b711257935a181326eea40c8f6561c18b2c531ecf2a99dc9ff787fccbab75d48910d62c5ffbc071e3de2c8b890c6a172340ea782b552

data/app/assets/config/self-auth-rails/app.js

@@ -1,11 +1,15 @@
 /* Initialize app when page loads */
 $(function(){ 
+    if(App.cable.subscriptions.subscriptions.length > 0) {
+        if(App.cable.subscriptions.subscriptions[0].identifier.includes("MessagesChannel")) {
+            return
+        }
+    }
     var Messages = App.cable.subscriptions.create({
       channel:'MessagesChannel',
       conversation_id: connectionID()
     }, {
       received: function(data) {
-          console.log(data);
         if(data.type == "info") {
             if(data.status == "completed") {
                 console.log("info request");
@@ -16,7 +20,13 @@ $(function(){
                     message = data.message
                 }
                 // TODO: this id no longer exists...
-                $('#info_messages').append("<div class='alert alert-danger'><button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>'+message+'</div>");
+                document.querySelector('#info_messages').insertAdjacentHTML(
+                    'afterbegin',
+                    `<div class='alert alert-danger'>
+                        <button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>
+                        ${message}
+                    </div>`
+                  )                
             }
         } else {
             $("#messages").removeClass('hidden');
@@ -67,9 +77,12 @@ $(function(){
               if(data.status == "errored") {
                 message = data.message
               }
-              $('#messages').append(`<div class="alert alert-warning alert-dismissible show fade"><div class="alert-body"><button class="close" data-dismiss="alert"><span>×</span></button>${message}</div></div>`);
+              document.querySelector('#info_messages').insertAdjacentHTML(
+                'afterbegin',
+                `<div class="alert alert-warning alert-dismissible show fade"><div class="alert-body"><button class="close" data-dismiss="alert"><span>×</span></button>${message}</div></div>`
+              )                
 
-              $('#messages').show();
+              $('#info_messages').show();
               $('#process').addClass("hidden");
               $('#non-dl-container').removeClass("hidden");
 

data/app/assets/config/self-auth-rails/channels/messages_channel.js

@@ -105,9 +105,16 @@ function uuidv4() {
               },
               error: function (e) {
                   if(e.status == 502) {
-                      $('#info_messages').append("<div class='alert alert-danger'><button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>Request timed out, try again later</div>");
+                      document.querySelector('#info_messages').insertAdjacentHTML(
+                        'afterbegin',
+                        `<div class='alert alert-danger'><button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>Request timed out, try again later</div>`
+                      )                
+    
                   } else {
-                      $('#info_messages').append("<div class='alert alert-danger'><button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>"+e.responseJSON.error+"</div>");
+                      document.querySelector('#info_messages').insertAdjacentHTML(
+                        'afterbegin',
+                        `<div class='alert alert-danger'><button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>${e.responseJSON.error}</div>`
+                      )                
                   }
                   $("#profile_help_block").hide();
               }

data/app/controllers/self_auth_rails/application_controller.rb

@@ -1,4 +1,5 @@
 module SelfAuthRails
   class ApplicationController < ::ApplicationController
+    layout SelfAuthRails.layout
   end
 end

data/app/controllers/self_auth_rails/sessions_controller.rb

@@ -1,5 +1,5 @@
 module SelfAuthRails
-  class SessionsController < ::ApplicationController
+  class SessionsController < ApplicationController
     def new; end
 
     # Authenticates a user with the given token

data/app/helpers/self_auth_rails/application_helper.rb

@@ -1,14 +1,14 @@
 module SelfAuthRails
   module ApplicationHelper
     def authenticate_user!
-      current_url = request.base_url + request.path
+      current_url = URI(request.base_url + request.path).request_uri
 
       uri = URI(main_app.root_url)
 
-      new_url = SelfAuthRails::Engine.routes.url_helpers.new_url(host: uri.host, port: uri.port)
-      create_url = SelfAuthRails::Engine.routes.url_helpers.create_url(host: uri.host, port: uri.port)
-      qr_url = SelfAuthRails::Engine.routes.url_helpers.qr_url(host: uri.host, port: uri.port)
-      dl_url = SelfAuthRails::Engine.routes.url_helpers.dl_url(host: uri.host, port: uri.port)
+      new_url = URI(SelfAuthRails::Engine.routes.url_helpers.new_url(host: uri.host, port: uri.port)).request_uri
+      create_url = URI(SelfAuthRails::Engine.routes.url_helpers.create_url(host: uri.host, port: uri.port)).request_uri
+      qr_url = URI(SelfAuthRails::Engine.routes.url_helpers.qr_url(host: uri.host, port: uri.port)).request_uri
+      dl_url = URI(SelfAuthRails::Engine.routes.url_helpers.dl_url(host: uri.host, port: uri.port)).request_uri
 
       if [new_url, create_url, qr_url, dl_url].include? current_url
         redirect_to root_url unless current_user.nil?

data/app/services/self_auth_response_manager_service.rb

@@ -27,7 +27,7 @@ class SelfAuthResponseManagerService
       return
     end
 
-    unless admin?(self_auth_response.from)
+    unless SelfAuthRails.permitted_auth.call(self_auth_response.from)
       broadcast_status_change channel, STATUS_ERR, message: 'You are forbidden to access this service'
       return
     end
@@ -69,8 +69,4 @@ class SelfAuthResponseManagerService
     @broadcaster.broadcast channel, { status: status, token: token, message: message, type: type }
   end
 
-  # checks if the given id is in the admins list
-  def admin?(id)
-    ENV['ADMIN_IDS'].split(',').include? id
-  end
 end

data/app/views/self_auth_rails/sessions/new.html.erb

@@ -12,6 +12,7 @@
           <div class="col-12 col-sm-8 offset-sm-2 col-md-6 offset-md-3 col-lg-6 offset-lg-3 col-xl-6 offset-xl-3">
             <div class="card card-primary">
               <div class="card-body">
+                <div id="info_messages"></div>
 
                 <div id="dl-container" class="hidden">
                     <div class="col-xs-12">

data/lib/self-auth-rails/version.rb

@@ -1,3 +1,3 @@
 module SelfAuthRails
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

data/lib/self-auth-rails.rb

@@ -7,7 +7,9 @@ module SelfAuthRails
                  :auth_facts,
                  :fact_mapping,
                  :authenticated_path,
-                 :authenticated_path
+                 :authenticated_path,
+                 :layout,
+                 :permitted_auth
 
   class Engine < ::Rails::Engine
     default_auth_facts = [:display_name]
@@ -17,6 +19,9 @@ module SelfAuthRails
       unless SelfAuthRails::self_client.nil?
         SelfAuthRails.auth_facts ||= default_auth_facts
         SelfAuthRails.authenticated_path ||= default_authenticated_path
+        if SelfAuthRails.permitted_auth.nil?
+          SelfAuthRails.permitted_auth ||= Proc.new { |selfid| true }
+        end
 
         response_manager = SelfAuthResponseManagerService.new(ActionCable.server)
 
@@ -43,8 +48,4 @@ module SelfAuthRails
     yield self
   end
 
-  def authenticated_path
-    SelfAuthRails::authenticated_path || SelfAuthRails::default_authenticated_path
-  end
-
 end

data/lib/tasks/initializer.rb.tpl

@@ -34,6 +34,9 @@ if defined?(Rails::Server) && !defined?(::SelfClient)
     # Optional entry defaulting to '/'.
     config.authenticated_path = '/'
 
+    # Defines the layout to be used for the authentication page.
+    # config.layout = 'login'
+
     # In case you want to persist the authentication returning facts, you 
     # can provide a map for the fact_name and the ActiveModel object property.
     #
@@ -41,5 +44,11 @@ if defined?(Rails::Server) && !defined?(::SelfClient)
     # to request and store facts during the authentication process with 
     # config.auth_facts
     config.fact_mapping = { display_name: :name }
+
+    # Defines if a given user is permitted to access the service or not. 
+    # config.permitted_auth = Proc.new do |selfid|
+    #  true
+    # end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: self-auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Adrià Cidre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails