raas-client-rails 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 189e68f5001082d0fb193bc6b1b404a5369df1accf7588eafc006c59f9279005
-  data.tar.gz: db02286e699cc2ec5e68dcbb0a4b3a3af16b3ef18eacafe7613fa23e54ee817e
+  metadata.gz: ca4ff64b4c70136dbf4ccd69808433e19add4d47701ab771a621907804b6b47a
+  data.tar.gz: d127857aee5259e12f897500a631dcc5e8fc9822de18bd65d6a3838ac98cb58a
 SHA512:
-  metadata.gz: 9704abd258f891323bf8bd504cab7faa283ac89d930d9b04723c91a0e1693c0781a87fb229a10c7264be4af9c8bfed6868c6951ae0dc0e8e132db06863589922
-  data.tar.gz: 58af69c741721b52a556f3fe2b7fef4f82d70863bf9c88f19fc0423d48c10c276044ffb8af8e7fa88ad09d71565ea3e5dec4eda47f986ed51b9a666d87537486
+  metadata.gz: 8aba273926ea2e74d972dfc769cb092d8e802687010e5aa97ca4f5ef7ff85f8517f40fb8fb8be57e90b41821be581aca1aca05a4383427999dcdf0be3ca076a6
+  data.tar.gz: 5d6ebf9757f6dc9c20e68303056d78a7c5e65fb987b812da03e9a6f584a7e7da524b7d5d5c96eab47f9cc3873761a2ba9ef53d9fd46e8f5a0013275024e1e129

data/README.md

@@ -26,6 +26,10 @@ Once you install gem and set it up, your application has several extra endpoints
 - `/raas/report/session` : Generate external session by using your credentials for report
 - `/raas/datatraveler/session` : Generate external session by using your credentials for datatraveler
 
+Both session APIs accept an optional `scope` parameter (space-delimited, e.g. `csv_admin.invoice pdf.invoice`)
+for scope-based route restriction. You can also fix it on the server side by setting `@scope`
+in your `prepare_tenant_and_sub` override (see below). If omitted, nothing is sent and the behavior is unchanged.
+
 ## Installation
 
 The client is provided as [RubyGem](https://rubygems.org/gems/raas-client-rails),
@@ -54,6 +58,9 @@ class RaasController < Raas::Client::Rails::RaasController
 
         @tenant = "xxxxx"
         @sub = "xxxx"
+        # Optional: scopes granted to the current user (space-delimited).
+        # Used for scope-based route restriction on RaaS side.
+        # @scope = "csv_admin.invoice pdf.invoice"
       end
 end
 ```

data/app/controllers/raas/client/rails/raas_controller_module.rb

@@ -17,7 +17,7 @@ module Raas::Client::Rails
       @backUrl = params[:backUrl]
       @subUrl = params[:subUrl]
       prepare_tenant_and_sub()
-      @restClient = RestClient.new(@tenant, @sub, @tenant_alias, @sub_alias, @sub_domain)
+      @restClient = RestClient.new(@tenant, @sub, @tenant_alias, @sub_alias, @sub_domain, @scope)
     end
 
     def prepare_tenant_and_sub()
@@ -27,6 +27,7 @@ module Raas::Client::Rails
       @tenant_alias = params[:tenantAlias]
       @sub_alias = params[:subAlias]
       @sub_domain = params[:subDomain]
+      @scope = params[:scope]
     end
 
     def report_session()
@@ -66,9 +67,9 @@ module Raas::Client::Rails
       if type.nil?
         type = "application/pdf"
       end
-      #by default empty Hash if nothing is assigned
+      #by default no query parameter if nothing is assigned
       if parameters.nil?
-        payload = Hash.new
+        payload = nil
       else
         payload = parameters
       end
@@ -79,14 +80,16 @@ module Raas::Client::Rails
 
     # How you return the value? This can be changed by passing mimeType through parameter
     def handleMime(mimeType, fileName,type, response)
+      #上流のHTTPステータス(403/404等)をそのままクライアントへ返す
+      status = response.code.to_i
       case mimeType
       when MIME_TYPE_HTML
         #sanitize response automatically
-        render html: response.body
+        render html: response.body, status: status
       when MIME_TYPE_JSON
-        render json: response.body
+        render json: response.body, status: status
       when MIME_TYPE_FILE
-        send_data(response, filename: fileName, type: type)
+        send_data(response, filename: fileName, type: type, status: status)
       end
       # p "#{fileName} #{type} #{mimeType}"
     end
@@ -102,7 +105,8 @@ module Raas::Client::Rails
         payload = JSON.parse(parameters)
       end      
       Rails.logger.warn("delete path=#{path} parameters=#{parameters}");
-      return @restClient.delete(path,payload)
+      response = @restClient.delete(path,payload)
+      render json: response.body, status: response.code.to_i
     end
 
     #/raas/post
@@ -117,7 +121,7 @@ module Raas::Client::Rails
       end      
       Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
       response = @restClient.post(path,payload)
-      return response.body;
+      render json: response.body, status: response.code.to_i
     end
 
     #/raas/put
@@ -132,7 +136,7 @@ module Raas::Client::Rails
       end      
       Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
       response = @restClient.put(path,payload)
-      return response.body;
+      render json: response.body, status: response.code.to_i
     end
 
   end

data/app/controllers/raas/client/rails/rest_client.rb

@@ -12,7 +12,7 @@ module Raas::Client::Rails
         DELETE = "delete"
         APEX_DOMAIN = "functions.asaservice.inc";
 
-        def initialize(tenant, sub, tenant_alias, sub_alias, sub_domain)
+        def initialize(tenant, sub, tenant_alias, sub_alias, sub_domain, scope = nil)
             @application = Raas::Client::Rails::Engine.config.raas_client_rails.application
             @landscape = Raas::Client::Rails::Engine.config.raas_client_rails.landscape
             @token = Raas::Client::Rails::Engine.config.raas_client_rails.token
@@ -21,6 +21,7 @@ module Raas::Client::Rails
             @tenant_alias = tenant_alias
             @sub_alias = sub_alias
             @sub_domain = sub_domain
+            @scope = scope
         end
 
         def createExternalSession(msa,backUrl,subUrl,subDomain)
@@ -39,8 +40,9 @@ module Raas::Client::Rails
                 body["tenantAlias"] = @tenant_alias 
             end
             if @sub_alias
-                body["subAlias"] = @sub_alias 
+                body["subAlias"] = @sub_alias
             end
+            body["scope"] = @scope if @scope
             return body
         end
 
@@ -49,16 +51,24 @@ module Raas::Client::Rails
             Rails.logger.debug("[TRACE] getUserToken is started");        
             #Use Rails default cache system, this simply use cache otherwise fetch and store
             Rails.logger.debug("Attempt to recycle token");
-            cacheName = "#{@tenant}+++#{@sub}"
+            # scope 付きトークンは scope 単位でキャッシュし、切り替え時に再取得する
+            if @scope
+                cacheName = "#{@tenant}+++#{@sub}+++#{@scope}"
+            else
+                cacheName = "#{@tenant}+++#{@sub}"
+            end
             Rails.logger.debug("Cache name is #{cacheName}")
             # p cacheName
-            return token = Rails.cache.fetch(cacheName) do
-                Rails.logger.debug("No cache found, fetch it by api");
-                Rails.logger.debug("tenant #=> #{@tenant} / sub #=> #{@sub}")
-                response = getUserTokenImpl("report");
-                Rails.logger.debug(response.body)
-                return JSON.parse(response.body);
-            end
+            cached = Rails.cache.read(cacheName)
+            return cached if cached
+            Rails.logger.debug("No cache found, fetch it by api");
+            Rails.logger.debug("tenant #=> #{@tenant} / sub #=> #{@sub}")
+            response = getUserTokenImpl("report");
+            Rails.logger.debug(response.body)
+            json = JSON.parse(response.body);
+            # エラー応答 (invalid_scope の 400 等) を永続キャッシュしないよう成功時のみ保存する
+            Rails.cache.write(cacheName, json) if response.is_a?(Net::HTTPSuccess)
+            return json
         end
 
         # fetch token from RaaS because no cache
@@ -98,7 +108,8 @@ module Raas::Client::Rails
             url = URI.parse(uri)
             unless params.nil?
                 #should I do like this!?
-                parameters_hash = params.to_unsafe_h
+                # ActionController::Parameters 以外 (素の Hash) で渡されることもある
+                parameters_hash = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
                 url.query = URI.encode_www_form(parameters_hash) unless params.nil?
             end
             # replacing context path form urI to match actual gateway URI

data/lib/raas/client/rails/version.rb

@@ -1,7 +1,7 @@
 module Raas
   module Client
     module Rails
-      VERSION = "0.1.13"
+      VERSION = "0.1.15"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raas-client-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Sunao Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-20 00:00:00.000000000 Z
+date: 2026-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails