raas-client-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c4f44354fc42a8fe599680f73fef59c0120d9265a05661ae3eea7b8c527af4
-  data.tar.gz: c83b4968c3f023ebd3cfcb2e2fb82e6eb12eb7126906a52bff7e7a869249c04b
+  metadata.gz: b7b6a84b9056a678c04d3ccda0b3e9e51f088ce762ff66f220290759dfa68581
+  data.tar.gz: 1078171ee29459bca2475b20b36e1aa4ec66ca12aeb1f6a9c261d3d325dedc25
 SHA512:
-  metadata.gz: accb3436b7087aa5827111d34af8fc481f40ccd7b0ff71e3a506bccda38c0a2d078f5258664b9e280c04e73af6db8c5fe76d0aa7a27e928b38985cb3632fd492
-  data.tar.gz: 32f79a1e62cedb106d5ac87671f9d59452732daf63a1dd700890b87d8de3d1700e4fe35ad525f23b657f9288e4a3e0e5637aad4062101d502cb4dc304eaa2096
+  metadata.gz: a29156150876b44a236747e93ed2a0cd7b673dc3db0d432edf1213fdf63045f1811932c8f398a7f73b9049fa7e3e52f5bdc7965e78da34213e96fb73d0597010
+  data.tar.gz: d8c97c5576fca515e38ac04ebcd17df908bff8d323c673f1d39293e7467f21b25136b197b4a1cb4b21e29ccac23ed88ff265651198abcce1de32e9d8d6e609ca

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

@@ -14,28 +14,29 @@ module Raas::Client::Rails
     end
 
     def prepare(params)
-      # seven arguments are needed to make this work
-      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
       @backUrl = params[:backUrl]
       @subUrl = params[:subUrl]
+      prepare_tenant_and_sub()
+      @restClient = RestClient.new(@tenant, @sub)
+    end
+
+    def prepare_tenant_and_sub()
+      # For Overload
       @tenant = params[:tenant]
       @sub = params[:sub]
-      @restClient = RestClient.new(application,landscape,token)
     end
 
     def report_session()
       Rails.logger.warn("session parameter=#{params}");
       prepare(params)
-      response = @restClient.createExternalSession(MSA_REPORT,@backUrl,@subUrl,@tenant,@sub)
+      response = @restClient.createExternalSession(MSA_REPORT,@backUrl,@subUrl)
       render json: response.body
     end
     
     def datatraveler_session()
       Rails.logger.warn("session parameter=#{params}")
       prepare(params)
-      response = @restClient.createExternalSession(MSA_DT,@backUrl,@subUrl,@tenant,@sub)
+      response = @restClient.createExternalSession(MSA_DT,@backUrl,@subUrl)
       render json: response.body
     end
 
@@ -69,7 +70,7 @@ module Raas::Client::Rails
         payload = parameters
       end
       Rails.logger.warn("get path=#{path} parameters=#{payload}");
-      response = @restClient.get(path,payload,@tenant,@sub)
+      response = @restClient.get(path,payload)
       handleMime(mimeType, fileName, type, response)
     end
 
@@ -98,7 +99,7 @@ module Raas::Client::Rails
         payload = JSON.parse(parameters)
       end      
       Rails.logger.warn("delete path=#{path} parameters=#{parameters}");
-      return @restClient.delete(path,payload,@tenant,@sub)
+      return @restClient.delete(path,payload)
     end
 
     #/raas/post
@@ -112,7 +113,7 @@ module Raas::Client::Rails
         payload = JSON.parse(requestBody)
       end      
       Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
-      response = @restClient.post(path,payload,@tenant,@sub)
+      response = @restClient.post(path,payload)
       return response.body;
     end
 
@@ -127,7 +128,7 @@ module Raas::Client::Rails
         payload = JSON.parse(requestBody)
       end      
       Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
-      response = @restClient.put(path,payload,@tenant,@sub)
+      response = @restClient.put(path,payload)
       return response.body;
     end
 

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

@@ -12,21 +12,20 @@ module Raas::Client::Rails
         DELETE = "delete"
         APEX_DOMAIN = "functions.asaservice.inc";
 
-        def initialize(application,landscape,token)
-            @application = application
-            @landscape = landscape
-            @token = token
+        def initialize(tenant, sub)
+            @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
+            @tenant = tenant
+            @sub = sub
         end
 
-        # ResponseEntity<String> resp = raasClient.createExternalSession(Constant.MSA_REPORT,req.getBackUrl(),req.getSubUrl(), saasContextProvider.getTenant(), saasContextProvider.getSub());
-
-
-        def createExternalSession(msa,backUrl,subUrl,tenant,sub)
+        def createExternalSession(msa,backUrl,subUrl)
             body = Hash.new
             body["backUrl"] = backUrl
             body["subUrl"] = subUrl
-            body["tenant"] = tenant
-            body["sub"] = sub
+            body["tenant"] = @tenant
+            body["sub"] = @sub
             return proxy(body,POST,"/#{msa}/external/session",nil,@token)
         end
 
@@ -36,51 +35,41 @@ module Raas::Client::Rails
             #Use Rails default cache system, this simply use cache otherwise fetch and store
             Rails.logger.debug("Attempt to recycle token");
             cacheName = "#{@tenant}+++#{@sub}"
-            @@t = @tenant
-            @@s = @sub
             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 #=> #{@@t} / sub #=> #{@@s}")
-                response = getUserTokenImpl( "report" , @@t , @@s);
+                Rails.logger.debug("tenant #=> #{@tenant} / sub #=> #{@sub}")
+                response = getUserTokenImpl("report");
                 Rails.logger.debug(response.body)
                 return JSON.parse(response.body);
             end
         end
 
         # fetch token from RaaS because no cache
-        def getUserTokenImpl(msa,tenant,sub)
+        def getUserTokenImpl(msa)
             body = Hash.new
-            body["tenant"] = tenant
-            body["sub"] = sub
+            body["tenant"] = @tenant
+            body["sub"] = @sub
             response = proxy(body,POST,"/#{msa}/external/token",nil,@token);
         end
 
-        def get(requestUrl, params,tenant,sub)
-            @tenant = tenant
-            @sub = sub
+        def get(requestUrl, params)
             json = getUserToken()
             return proxy(nil, GET,requestUrl,params,json["token"]);
         end
 
-        def delete(requestUrl, params,tenant,sub)
-            @tenant = tenant
-            @sub = sub
+        def delete(requestUrl, params)
             json = getUserToken()
             return proxy(nil, DELETE,requestUrl,params,json["token"]);
         end
 
-        def put(requestUrl,body,tenant,sub)
-            @tenant = tenant
-            @sub = sub
+        def put(requestUrl,body)
             json = getUserToken()
             return proxy(body , PUT,requestUrl,nil,json["token"]);
         end
 
-        def post(requestUrl,body,tenant,sub)
-            @tenant = tenant
-            @sub = sub
+        def post(requestUrl,body)
             json = getUserToken()
             return proxy(body , POST,requestUrl,nil,json["token"]);
         end

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

@@ -1,7 +1,7 @@
 module Raas
   module Client
     module Rails
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raas-client-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sunao Suzuki