diff --git a/app/controllers/api/v1/projects/sca_controller.rb b/app/controllers/api/v1/projects/sca_controller.rb index f7ac8d64e..b5106dd71 100644 --- a/app/controllers/api/v1/projects/sca_controller.rb +++ b/app/controllers/api/v1/projects/sca_controller.rb @@ -1,10 +1,18 @@ class Api::V1::Projects::ScaController < Api::V1::BaseController before_action :require_public_and_member_above before_action :load_project - def index + def index @result = Api::V1::Projects::Sca::ShowProjectService.call(@project) end def create - @result = Api::V1::Projects::Sca::CreateProjectService.call(@project) + result = Api::V1::Projects::Sca::CreateProjectService.call(@project) + if result + @result = Api::V1::Projects::Sca::ShowProjectService.call(@project) + else + { + auth_token: nil, + "url": nil, + } + end end end \ No newline at end of file diff --git a/app/services/api/v1/projects/sca/base_service.rb b/app/services/api/v1/projects/sca/base_service.rb index 520663fb2..53428141a 100644 --- a/app/services/api/v1/projects/sca/base_service.rb +++ b/app/services/api/v1/projects/sca/base_service.rb @@ -1,7 +1,11 @@ class Api::V1::Projects::Sca::BaseService < ApplicationService private def base_url - Rails.application.config_for(:configuration)["sca"]["domain"] + Rails.application.config_for(:configuration)["sca"]["base_url"] + domain_url + Rails.application.config_for(:configuration)["sca"]["base_url"] + end + + def domain_url + Rails.application.config_for(:configuration)["sca"]["domain"] end def auth_token diff --git a/app/services/api/v1/projects/sca/create_project_service.rb b/app/services/api/v1/projects/sca/create_project_service.rb index 946ec4554..7c866903e 100644 --- a/app/services/api/v1/projects/sca/create_project_service.rb +++ b/app/services/api/v1/projects/sca/create_project_service.rb @@ -16,7 +16,9 @@ class Api::V1::Projects::Sca::CreateProjectService < Api::V1::Projects::Sca::Ba } data = sca_post_request("projects/", params) if @project.update(sca_project_id:data[:json]["id"]) - Api::V1::Projects::Sca::ShowProjectService.call(@project) + true + else + false end end diff --git a/app/services/api/v1/projects/sca/show_project_service.rb b/app/services/api/v1/projects/sca/show_project_service.rb index 2c02432ac..244c6301a 100644 --- a/app/services/api/v1/projects/sca/show_project_service.rb +++ b/app/services/api/v1/projects/sca/show_project_service.rb @@ -7,7 +7,7 @@ class Api::V1::Projects::Sca::ShowProjectService < Api::V1::Projects::Sca::Base #projects/18748/list-branches/?branch_name_query=&page=1&limit=5 { auth_token:login_token, - "url": base_url + "org/#{sca_user_info["default_org"]}/projects/#{@project.sca_project_id}?engine=sca" , + "url": domain_url + "/org/#{sca_user_info["default_org"]}/projects/#{@project.sca_project_id}?engine=sca" , } end diff --git a/app/views/api/v1/projects/sca/show.json.jbuilder b/app/views/api/v1/projects/sca/create.json.jbuilder similarity index 100% rename from app/views/api/v1/projects/sca/show.json.jbuilder rename to app/views/api/v1/projects/sca/create.json.jbuilder