raas-client-rails 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c4f44354fc42a8fe599680f73fef59c0120d9265a05661ae3eea7b8c527af4
-  data.tar.gz: c83b4968c3f023ebd3cfcb2e2fb82e6eb12eb7126906a52bff7e7a869249c04b
+  metadata.gz: 87ef9e3d0ac5352f339eb54381946d31c686e346624ed8ea2f83d2d6af828eca
+  data.tar.gz: dfc5e841be021daf7765872d278a911f8e5a0342700284d7d063e4b3b4411059
 SHA512:
-  metadata.gz: accb3436b7087aa5827111d34af8fc481f40ccd7b0ff71e3a506bccda38c0a2d078f5258664b9e280c04e73af6db8c5fe76d0aa7a27e928b38985cb3632fd492
-  data.tar.gz: 32f79a1e62cedb106d5ac87671f9d59452732daf63a1dd700890b87d8de3d1700e4fe35ad525f23b657f9288e4a3e0e5637aad4062101d502cb4dc304eaa2096
+  metadata.gz: 0b030baa89b5745cecae093dbb066bd1c3bc032926571162695c67cb9631b204189b68fd9c10fdc56f011b5349e23fb57d1c413ae9856e1f4c47fd7f0ffd4b0b
+  data.tar.gz: f762f6cd1d17d6708db7c32dd9244d8619a9ddf80fc02fd24b3050e69b794aa2a4917d41fa5bb1873b3019add43c19e558b22bb01706dfd5b96116b07fbf3fd1

data/README.md

@@ -1,6 +1,6 @@
 # Raas::Client::Rails
 
-Adding extra endpoints to access RaaS. These endpoints allows you to fetch external token to access RaaS or enables you to invoke specific functions through them.
+Adding client to access Raas. This client allows you to call Raas API.
 
 ## Usage
 
@@ -21,11 +21,10 @@ This condifuration is **mandatory** please, do not forget before you start inter
 
 ### APIs
 
-Once you install your gem, your application has several extra endpoints to interact with RaaS.
+Once you install gem and set it up, your application has several extra endpoints to interact with RaaS.
 
 - `/raas/report/session` : Generate external session by using your credentials for report
-- `/raas/datatraveler/session` : Generate external session by using your credentials for report
-- `/raas/health` : Ask RaaS to get current health condition
+- `/raas/datatraveler/session` : Generate external session by using your credentials for datatraveler
 
 ## Installation
 
@@ -44,17 +43,34 @@ gem "raas-client-rails"
 $ bundle install
 ```
 
-3. mount endPoint on `config/routes.rb`
+3. implement raas_controller.rb
 
 ```ruby
-  mount Raas::Client::Rails::Engine => "[PATH]"
+class RaasController < Raas::Client::Rails::RaasController
+    skip_before_action :verify_authenticity_token
+
+    def prepare_tenant_and_sub
+        super
+
+        @tenant = "xxxxx"
+        @sub = "xxxx"
+      end
+end
+```
+
+3. add endPoint on `config/routes.rb`
+
+```ruby
+  post '/raas/datatraveler/session', to: 'raas#datatraveler_session'
+  post '/raas/report/session', to: 'raas#report_session'
 ```
 
 4. Launch your rails server
 
 5. then you can use this with...
 
-`/PATH/raas/endPointList`
+`/raas/datatraveler/session`
+`/raas/report/session`
 
 ## License
 All the patents belong to SuTech

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

@@ -1,135 +1,8 @@
 module Raas::Client::Rails
-  
-  require_relative 'rest_client'
 
-  class RaasController < ApplicationController
-
-    MSA_REPORT = "report";
-    MSA_DT = "datatraveler";
-
-    #/raas/health
-    def health()
-      prepare(params)
-      render plain: "Moving #{@tenant}/#{@sub}";
-    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]
-      @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)
-      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)
-      render json: response.body
-    end
-
-    MIME_TYPE_HTML = "html"
-    MIME_TYPE_FILE  = "file"
-    MIME_TYPE_JSON = "json"
-
-    #/raas/get
-    def get()
-      prepare(params)
-      path = params[:path]
-      parameters = params[:parameters]
-      mimeType = params[:mimeType]
-      fileName = params[:fileName]
-      type = params[:type]
-      #by default return HTML
-      if mimeType.nil?
-        mimeType = MIME_TYPE_HTML
-      end
-      #by default return download.pdf
-      if fileName.nil?
-        fileName = "download"
-      end
-      if type.nil?
-        type = "application/pdf"
-      end
-      #by default empty Hash if nothing is assigned
-      if parameters.nil?
-        payload = Hash.new
-      else
-        payload = parameters
-      end
-      Rails.logger.warn("get path=#{path} parameters=#{payload}");
-      response = @restClient.get(path,payload,@tenant,@sub)
-      handleMime(mimeType, fileName, type, response)
-    end
-
-    # How you return the value? This can be changed by passing mimeType through parameter
-    def handleMime(mimeType, fileName,type, response)
-      case mimeType
-      when MIME_TYPE_HTML
-        #sanitize response automatically
-        render html: response.body
-      when MIME_TYPE_JSON
-        render json: response.body
-      when MIME_TYPE_FILE
-        send_data(response, filename: fileName, type: type)
-      end
-      # p "#{fileName} #{type} #{mimeType}"
-    end
-
-    #/raas/delete
-    def delete()
-      prepare(params)
-      path = params[:path]
-      parameters = params[:parameters]
-      if parameters.nil?
-        payload = nil
-      else
-        payload = JSON.parse(parameters)
-      end      
-      Rails.logger.warn("delete path=#{path} parameters=#{parameters}");
-      return @restClient.delete(path,payload,@tenant,@sub)
-    end
-
-    #/raas/post
-    def post()
-      prepare(params)
-      path = params[:path]
-      requestBody = params[:requestbody]
-      if requestBody.nil?
-        payload = nil
-      else
-        payload = JSON.parse(requestBody)
-      end      
-      Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
-      response = @restClient.post(path,payload,@tenant,@sub)
-      return response.body;
-    end
-
-    #/raas/put
-    def put()
-      prepare(params)
-      path = params[:path]
-      requestBody = params[:requestbody]
-      if requestBody.nil?
-        payload = nil
-      else
-        payload = JSON.parse(requestBody)
-      end      
-      Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
-      response = @restClient.put(path,payload,@tenant,@sub)
-      return response.body;
-    end
+  require_relative 'raas_controller_module'
 
+  class RaasController < ApplicationController
+    include RaasControllerModule
   end
 end

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

@@ -0,0 +1,136 @@
+module Raas::Client::Rails
+  
+  require_relative 'rest_client'
+
+  class RaasController < ApplicationController
+
+    MSA_REPORT = "report";
+    MSA_DT = "datatraveler";
+
+    #/raas/health
+    def health()
+      prepare(params)
+      render plain: "Moving #{@tenant}/#{@sub}";
+    end
+
+    def prepare(params)
+      @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]
+    end
+
+    def report_session()
+      Rails.logger.warn("session parameter=#{params}");
+      prepare(params)
+      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)
+      render json: response.body
+    end
+
+    MIME_TYPE_HTML = "html"
+    MIME_TYPE_FILE  = "file"
+    MIME_TYPE_JSON = "json"
+
+    #/raas/get
+    def get()
+      prepare(params)
+      path = params[:path]
+      parameters = params[:parameters]
+      mimeType = params[:mimeType]
+      fileName = params[:fileName]
+      type = params[:type]
+      #by default return HTML
+      if mimeType.nil?
+        mimeType = MIME_TYPE_HTML
+      end
+      #by default return download.pdf
+      if fileName.nil?
+        fileName = "download"
+      end
+      if type.nil?
+        type = "application/pdf"
+      end
+      #by default empty Hash if nothing is assigned
+      if parameters.nil?
+        payload = Hash.new
+      else
+        payload = parameters
+      end
+      Rails.logger.warn("get path=#{path} parameters=#{payload}");
+      response = @restClient.get(path,payload)
+      handleMime(mimeType, fileName, type, response)
+    end
+
+    # How you return the value? This can be changed by passing mimeType through parameter
+    def handleMime(mimeType, fileName,type, response)
+      case mimeType
+      when MIME_TYPE_HTML
+        #sanitize response automatically
+        render html: response.body
+      when MIME_TYPE_JSON
+        render json: response.body
+      when MIME_TYPE_FILE
+        send_data(response, filename: fileName, type: type)
+      end
+      # p "#{fileName} #{type} #{mimeType}"
+    end
+
+    #/raas/delete
+    def delete()
+      prepare(params)
+      path = params[:path]
+      parameters = params[:parameters]
+      if parameters.nil?
+        payload = nil
+      else
+        payload = JSON.parse(parameters)
+      end      
+      Rails.logger.warn("delete path=#{path} parameters=#{parameters}");
+      return @restClient.delete(path,payload)
+    end
+
+    #/raas/post
+    def post()
+      prepare(params)
+      path = params[:path]
+      requestBody = params[:requestbody]
+      if requestBody.nil?
+        payload = nil
+      else
+        payload = JSON.parse(requestBody)
+      end      
+      Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
+      response = @restClient.post(path,payload)
+      return response.body;
+    end
+
+    #/raas/put
+    def put()
+      prepare(params)
+      path = params[:path]
+      requestBody = params[:requestbody]
+      if requestBody.nil?
+        payload = nil
+      else
+        payload = JSON.parse(requestBody)
+      end      
+      Rails.logger.warn("post path=#{path} requestBody=#{requestBody}");
+      response = @restClient.put(path,payload)
+      return response.body;
+    end
+
+  end
+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.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raas-client-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Sunao Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,7 @@ files:
 - app/assets/stylesheets/raas/client/rails/application.css
 - app/controllers/raas/client/rails/application_controller.rb
 - app/controllers/raas/client/rails/raas_controller.rb
+- app/controllers/raas/client/rails/raas_controller_module.rb
 - app/controllers/raas/client/rails/rest_client.rb
 - app/helpers/raas/client/rails/application_helper.rb
 - app/helpers/raas/client/rails/raa_s_helper.rb