raas-client-rails 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bca6ac232a858b8f876e23b9061e02ddb0a29b08ef0fb97891928e7a5a41bbd
-  data.tar.gz: ac59b74d7439972836b87abe6fae7c4b28c31ddde6d96202981fa1ce7c413c15
+  metadata.gz: ddd1fba858dc356f6b622b6e85d535b226d3f8305f01a412977b18d6351ac5d0
+  data.tar.gz: 67e3ac4df50a35d7105952e02a80a7409e64d96c07520477bc706dcec49378ca
 SHA512:
-  metadata.gz: 02622a4c02f015f98ef9fcaa676bc8a8945d00b012b2d51dfd5cf0664ecb6155e71a7864c9e8926a1f47cccc1db05b66b8b341870d940c5286fc5d559cbb0554
-  data.tar.gz: 1343474a1b7b19ad092297ec3676bfcdf24df2a489bd52e16bae43d6c4a09fb279eb2b463298d39c5ba5d1b0d3a0e4987749b499b3b63cfa1ee5ea68ca4d9802
+  metadata.gz: 6b03712796e5afd4f1fca7feeda0a5f83c4e552bfa84045c54ce00b91371bfb5dc5d7e3dd5e8da1f89b36064c50997e254b9764b575149f71ad2184e89fdd7d5
+  data.tar.gz: 9021e8af22ff8af4b43aeb2d54a2429ac6cd803cb88d775cc8bce3f3cabacacec906b6d3b34f5077d4922a0b3b466bd7c6aaca4c50d3224932d53d391e95b117

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

@@ -67,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
@@ -80,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.body, filename: fileName, type: type, status: status)
       end
       # p "#{fileName} #{type} #{mimeType}"
     end
@@ -103,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
@@ -118,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
@@ -133,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

@@ -29,7 +29,6 @@ module Raas::Client::Rails
             body["backUrl"] = backUrl
             body["subUrl"] = subUrl
             body["subDomain"] = subDomain || @sub_domain || ""
-            body["scope"] = @scope if @scope
             return proxy(body,POST,"/#{msa}/external/session",nil,@token)
         end
 
@@ -41,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
 
@@ -51,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
@@ -100,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.14"
+      VERSION = "0.1.16"
     end
   end
 end

metadata

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