self-auth-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a34383b717ad489da69a18851f67f5d471c41d477b47aed4cc9ca2564757b247
-  data.tar.gz: 27f973e6f7f66944cca6b82748c1e7bb2c455abed1e68c478a3ab3ed178f04c8
+  metadata.gz: 8f810144382bd25fa0222496cef327c9173e64be241d92936bc48081974e8e05
+  data.tar.gz: 0efab5872279cfc516d50cdc4d6bc840a97c60262b4e35c7d37c81ee12cb75e1
 SHA512:
-  metadata.gz: 97262da25b867d248b54647c82c928fbd5fc4df90a1e8e9248cfc04b364276255ba6d4a0a8b98eac62766c01ff4bea8e0a5b8e66fb69f33ad90792611a5d9425
-  data.tar.gz: 4a9f6ba7cba95e0986deb7bbe0a886f02baf63455205fead7bfb5d9bd6b4bd5d1999e9a47b7c1eddccf0fbd168ff4af58ecad9e0e8150dcba416f4fcfa7d2ad2
+  metadata.gz: 9c1050ec2e42551cd0c627e25d6aac96e5d69996c422249f781604ee28b7c89f1cda292df733fd66f19bb8755453cd3a57f275a40d183d8b6febcc1fbb6f540f
+  data.tar.gz: bed299ce81b58f2a1135a97e04db73de7d29c37c0516a19746dfd909cc3830c13c5b32028526c75f988fc56225dbfef1d694444582eca3de5c000ce1419b4418

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/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,9 +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)
-    return true unless ENV.include? 'ADMIN_IDS'
-    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.2"
+  VERSION = "0.1.3"
 end

data/lib/self-auth-rails.rb

@@ -8,7 +8,8 @@ module SelfAuthRails
                  :fact_mapping,
                  :authenticated_path,
                  :authenticated_path,
-                 :layout
+                 :layout,
+                 :permitted_auth
 
   class Engine < ::Rails::Engine
     default_auth_facts = [:display_name]
@@ -18,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)
 
@@ -44,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

@@ -44,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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Adrià Cidre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-21 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails