atomic_admin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed8016c6474ebe66207d09ec1c66e42da12989c862dd1b7cdab433f8556b717
-  data.tar.gz: f6e57e1aa7917a06ce6854c2edcf77310526a402f5f709d43462bd45936e2e6e
+  metadata.gz: 1da63f4d8a28afb38eb29f1cd355f7bf60ce16c3dc242db8d7466124a9675012
+  data.tar.gz: 77291046495aaec1f9952da7fc91d4e7760f99cb0f28c70b3bf2f57d7798d493
 SHA512:
-  metadata.gz: 106d1dd8d2682945e602ac85eb5eab431f8fff57f83f9849e36a99c50b0cd462e50607afef5e2eb9889683b8009eef30db0ce6dca61bada38edd7f83d20983d0
-  data.tar.gz: 8ddda300ce1e5d949349c8ac20802153236a3742bff41cff35ea31500fb5b5502606f0df544e2dfe006b766ba02e847d85fd2d74c845565cf135e3b32f890a82
+  metadata.gz: 5402d08f0cd92d4721ace8bc07bc30a110153b5a13c9d69dfe85f5a779b5149df32143819f5daec659e5a7f11a1443429be783581dfe9e5dc6588e962e0dacd0
+  data.tar.gz: 4411b3bd84e9e0d22181a449debeb5f9d814220a6412c4e83e98ca935f715a8076a1059be06a2158ca03126c4cee79cb578dc3a58ddf5fe0f7db275acebb015d

data/app/controllers/atomic_admin/application_controller.rb

@@ -2,15 +2,12 @@ module AtomicAdmin
   class ApplicationController < ActionController::API 
     include AtomicAdmin::JwtToken
     # before_action :authenticate_user! # Use validate_token instead for now
-    before_action :validate_admin_app_token
      before_action :validate_token
      before_action :only_admins!
 
      private
 
      def only_admins!
-       return if @admin_app_validated
-
        user_not_authorized unless current_user.admin?
      end
 

data/app/controllers/atomic_admin/atomic_tenant_deployment_controller.rb

@@ -9,35 +9,38 @@ module AtomicAdmin
     end
 
     def search
-      tenant_deployments = AtomicTenant::LtiDeployment
-        .where(application_instance_id: params[:application_instance_id])
-        .order(:id)
-        .paginate(page: params[:page], per_page: 30)
+      tenant_deployments = AtomicTenant::LtiDeployment.
+        where(application_instance_id: params[:application_instance_id]).
+        joins("LEFT OUTER JOIN public.atomic_lti_deployments"\
+          " ON atomic_tenant_lti_deployments.iss = atomic_lti_deployments.iss"\
+          " AND atomic_tenant_lti_deployments.deployment_id = atomic_lti_deployments.deployment_id").
+        order(:id).
+        paginate(page: params[:page], per_page: 30)
 
-      page_ids = tenant_deployments.pluck(:iss, :deployment_id)
+      rows = tenant_deployments.pluck(
+        "atomic_tenant_lti_deployments.id",
+        "atomic_tenant_lti_deployments.iss",
+        "atomic_tenant_lti_deployments.deployment_id",
+        "atomic_tenant_lti_deployments.application_instance_id",
+        "atomic_lti_deployments.client_id",
+        "atomic_lti_deployments.platform_guid",
+      )
 
-      pairs = page_ids.reduce({}) do |acc, c| 
-        iss = c[0]
-        deployment_id = c[1]
-
-        acc[iss] = [] if acc[iss].nil?
-
-        acc[iss].push(deployment_id)
-        acc
-      end
-
-      page = pairs.reduce([]) do |acc, pair| 
-        iss = pair[0]
-        deployment_ids = pair[1]
-
-        deployments = AtomicLti.get_deployments(iss: iss, deployment_ids: deployment_ids)
-        acc.concat(deployments)
+      page = rows.map do |row|
+        {
+          id: row[0],
+          iss: row[1],
+          deployment_id: row[2],
+          application_instance_id: row[3],
+          client_id: row[4],
+          platform_guid: row[5],
+        }
       end
 
       render json: {
         deployments: page,
         page: params[:page],
-        total_pages: tenant_deployments.total_pages
+        total_pages: tenant_deployments.total_pages,
       }
     end
 

data/lib/atomic_admin/jwt_token.rb

@@ -30,8 +30,6 @@ module AtomicAdmin
     end
  
     def validate_token
-      return if @admin_app_validated
-
       token = decoded_jwt_token(request)
       raise InvalidTokenError if Rails.application.secrets.auth0_client_id != token["aud"]
   
@@ -52,16 +50,6 @@ module AtomicAdmin
         raise GraphQL::ExecutionError, "Unauthorized: Invalid token."
       end
     end
-
-    def validate_admin_app_token
-      _bearer, jwt = request.headers['Authorization'].split(' ')
-      @atomic_admin_params = AtomicAdmin::JwtToken.decode(jwt, Rails.application.secrets.atomic_admin_shared_key)
-      @admin_app_validated = true
-    rescue JWT::DecodeError, InvalidTokenError => e
-      # fall back to regular app jwt
-      Rails.logger.error "JWT Error occured with admin app token #{e.inspect}"
-      @admin_app_validated = false
-    end
   
     protected
   
@@ -78,4 +66,4 @@ module AtomicAdmin
     end
   
   end
-end
+end

data/lib/atomic_admin/version.rb

@@ -1,3 +1,3 @@
 module AtomicAdmin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomic_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Benoit
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Engine to provide apis that power the atomic jolt admin app