diff --git a/Gemfile b/Gemfile index 0645fa72c..621ca4d0d 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'puma', '~> 3.11' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' -# gem 'coffee-rails', '~> 4.2' +# gem 'coffee-rails', '~> 4.2'[p-qwa9aq] gem 'turbolinks', '~> 5' gem 'jbuilder', '~> 2.5' gem 'groupdate', '~> 4.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index e27c504aa..0001f2321 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,6 +106,8 @@ GEM activerecord (>= 3.1.0, < 7) diff-lcs (1.3) diffy (3.3.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) doorkeeper (5.5.1) railties (>= 5) doorkeeper-jwt (0.4.1) @@ -127,12 +129,14 @@ GEM execjs (2.7.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.12.2) + ffi (1.15.5) font-awesome-sass (4.7.0) sass (>= 3.2) fugit (1.4.1) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) + gitea-client (0.11.1) + rest-client (~> 2.1.0) globalid (0.4.2) activesupport (>= 4.2.0) grape-entity (0.7.1) @@ -143,6 +147,9 @@ GEM harmonious_dictionary (0.0.1) hashie (3.6.0) htmlentities (4.3.4) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) i18n (1.8.2) concurrent-ruby (~> 1.0) io-like (0.3.1) @@ -180,6 +187,9 @@ GEM mimemagic (~> 0.3.2) maruku (0.7.3) method_source (0.9.2) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2022.0105) mimemagic (0.3.10) nokogiri (~> 1) rake @@ -193,6 +203,7 @@ GEM mustermann (1.1.1) ruby2_keywords (~> 0.0.1) mysql2 (0.5.3) + netrc (0.11.0) nio4r (2.5.2) nokogiri (1.10.8) mini_portile2 (~> 2.4.0) @@ -209,9 +220,21 @@ GEM addressable (~> 2.3) nokogiri (~> 1.5) omniauth (~> 1.2) + omniauth-gitee (1.0.0) + omniauth (>= 1.5, < 3.0) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-github (1.4.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) omniauth (~> 1.9) + omniauth-rails_csrf_protection (0.1.2) + actionpack (>= 4.2) + omniauth (>= 1.3.1) + omniauth-wechat-oauth2 (0.2.2) + omniauth (>= 1.3.2) + omniauth-oauth2 (>= 1.1.1) parallel (1.19.1) parser (2.7.1.1) ast (~> 2.4.0) @@ -292,6 +315,11 @@ GEM regexp_parser (1.7.0) request_store (1.5.0) rack (>= 1.4) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) reverse_markdown (1.4.0) nokogiri roo (2.8.3) @@ -346,7 +374,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.2.1) + sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -418,6 +446,9 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) unicode-display_width (1.6.1) web-console (3.7.0) actionview (>= 5.0) @@ -459,6 +490,7 @@ DEPENDENCIES enumerize faraday (~> 0.15.4) font-awesome-sass (= 4.7.0) + gitea-client (~> 0.11.1) grape-entity (~> 0.7.1) groupdate (~> 4.1.0) harmonious_dictionary (~> 0.0.1) @@ -472,7 +504,11 @@ DEPENDENCIES oauth2 omniauth (~> 1.9.0) omniauth-cas + omniauth-gitee (~> 1.0.0) + omniauth-github omniauth-oauth2 (~> 1.6.0) + omniauth-rails_csrf_protection + omniauth-wechat-oauth2 parallel (~> 1.19, >= 1.19.1) pdfkit prettier @@ -512,4 +548,4 @@ DEPENDENCIES wkhtmltopdf-binary BUNDLED WITH - 2.1.4 + 2.3.26 diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb index e2bd9d491..fae4ae27e 100644 --- a/app/services/gitea/client_service.rb +++ b/app/services/gitea/client_service.rb @@ -18,19 +18,19 @@ class Gitea::ClientService < ApplicationService # token: {}, # data: {} # } - def post(url, params={}) + def post(url, params={}, is_hat=false) puts "[gitea] request params: #{params}" auth_token = authen_params(params[:token]) conn(auth_token).post do |req| - req.url full_url(url) + req.url full_url(url, "post", is_hat) req.body = params[:data].to_json end end - def get(url, params={}) + def get(url, params={}, is_hat = false) auth_token = authen_params(params[:token]) conn(auth_token).get do |req| - req.url full_url(url, 'get') + req.url full_url(url, 'get', is_hat) params.except(:token).each_pair do |key, value| req.params["#{key}"] = value end @@ -41,27 +41,27 @@ class Gitea::ClientService < ApplicationService # end #=> 响应头 end - def delete(url, params={}) + def delete(url, params={}, is_hat = false) auth_token = authen_params(params[:token]) conn(auth_token).delete do |req| - req.url full_url(url) + req.url full_url(url, "delete", is_hat) req.body = params[:data].to_json end end - def patch(url, params={}) + def patch(url, params={}, is_hat=false) puts "[gitea] request params: #{params}" auth_token = authen_params(params[:token]) conn(auth_token).patch do |req| - req.url full_url(url) + req.url full_url(url, 'patch', is_hat) req.body = params[:data].to_json end end - def put(url, params={}) + def put(url, params={}, is_hat=false) puts "[gitea] put request params: #{params}" conn(authen_params(params[:token])).put do |req| - req.url full_url(url) + req.url full_url(url, "put", is_hat) req.body = params[:data].to_json end end @@ -99,16 +99,20 @@ class Gitea::ClientService < ApplicationService GiteaService.gitea_config[:base_url] end + def hat_base_url + GiteaService.gitea_config[:hat_base_url] + end + def domain GiteaService.gitea_config[:domain] end - def api_url - [domain, base_url].join('') + def api_url(is_hat=false) + is_hat ? [domain, hat_base_url].join('') : [domain, base_url].join('') end - def full_url(api_rest, action='post') - url = [api_url, api_rest].join('').freeze + def full_url(api_rest, action='post', is_hat=false) + url = [api_url(is_hat), api_rest].join('').freeze url = action === 'get' ? url : URI.escape(url) url = URI.escape(url) unless url.ascii_only? puts "[gitea] request url: #{url}" diff --git a/app/services/gitea/hooks/create_service.rb b/app/services/gitea/hooks/create_service.rb index 6b65a6860..8b8d7f2c3 100644 --- a/app/services/gitea/hooks/create_service.rb +++ b/app/services/gitea/hooks/create_service.rb @@ -24,7 +24,7 @@ class Gitea::Hooks::CreateService < Gitea::ClientService end def call - response = post(url, params) + response = post(url, params, true) render_201_response(response) end diff --git a/app/services/gitea/organization/create_service.rb b/app/services/gitea/organization/create_service.rb index 4da1720cc..6f4c3d4f2 100644 --- a/app/services/gitea/organization/create_service.rb +++ b/app/services/gitea/organization/create_service.rb @@ -7,7 +7,7 @@ class Gitea::Organization::CreateService < Gitea::ClientService end def call - response = post(url, request_params) + response = post(url, request_params, true) render_status(response) end diff --git a/app/services/gitea/organization/update_service.rb b/app/services/gitea/organization/update_service.rb index 963099ad9..7a0fd1eec 100644 --- a/app/services/gitea/organization/update_service.rb +++ b/app/services/gitea/organization/update_service.rb @@ -8,7 +8,7 @@ class Gitea::Organization::UpdateService < Gitea::ClientService end def call - response = patch(url, request_params) + response = patch(url, request_params, true) render_status(response) end diff --git a/app/services/gitea/pull_request/commits_service.rb b/app/services/gitea/pull_request/commits_service.rb index dc2877eba..f85edd296 100644 --- a/app/services/gitea/pull_request/commits_service.rb +++ b/app/services/gitea/pull_request/commits_service.rb @@ -16,7 +16,7 @@ class Gitea::PullRequest::CommitsService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/pull_request/files_service.rb b/app/services/gitea/pull_request/files_service.rb index f7a2bd750..a5c2cf0d8 100644 --- a/app/services/gitea/pull_request/files_service.rb +++ b/app/services/gitea/pull_request/files_service.rb @@ -17,7 +17,7 @@ class Gitea::PullRequest::FilesService < Gitea::ClientService end def call - response = get(url, params.merge(token: token)) + response = get(url, params.merge(token: token), true) render_result(response) end diff --git a/app/services/gitea/pull_request/get_service.rb b/app/services/gitea/pull_request/get_service.rb index f9a35fdca..bd1fd8957 100644 --- a/app/services/gitea/pull_request/get_service.rb +++ b/app/services/gitea/pull_request/get_service.rb @@ -12,7 +12,7 @@ class Gitea::PullRequest::GetService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/repository/branches/list_name_service.rb b/app/services/gitea/repository/branches/list_name_service.rb index c005c8359..84f6d3a4c 100644 --- a/app/services/gitea/repository/branches/list_name_service.rb +++ b/app/services/gitea/repository/branches/list_name_service.rb @@ -8,7 +8,7 @@ class Gitea::Repository::Branches::ListNameService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_200_response(response) end diff --git a/app/services/gitea/repository/branches/list_slice_service.rb b/app/services/gitea/repository/branches/list_slice_service.rb index 6b643831a..e04a4b6e6 100644 --- a/app/services/gitea/repository/branches/list_slice_service.rb +++ b/app/services/gitea/repository/branches/list_slice_service.rb @@ -7,7 +7,7 @@ class Gitea::Repository::Branches::ListSliceService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_200_response(response) end diff --git a/app/services/gitea/repository/commits/compare_service.rb b/app/services/gitea/repository/commits/compare_service.rb index 502f6ce90..bdfd4ca3d 100644 --- a/app/services/gitea/repository/commits/compare_service.rb +++ b/app/services/gitea/repository/commits/compare_service.rb @@ -14,7 +14,7 @@ class Gitea::Repository::Commits::CompareService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_status(response) end diff --git a/app/services/gitea/repository/commits/file_list_service.rb b/app/services/gitea/repository/commits/file_list_service.rb index b1606a0f3..77a193475 100644 --- a/app/services/gitea/repository/commits/file_list_service.rb +++ b/app/services/gitea/repository/commits/file_list_service.rb @@ -14,7 +14,7 @@ class Gitea::Repository::Commits::FileListService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/repository/commits/get_service.rb b/app/services/gitea/repository/commits/get_service.rb index d497f1e4f..a8fc67235 100644 --- a/app/services/gitea/repository/commits/get_service.rb +++ b/app/services/gitea/repository/commits/get_service.rb @@ -14,7 +14,7 @@ class Gitea::Repository::Commits::GetService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_status(response) end diff --git a/app/services/gitea/repository/commits/list_slice_service.rb b/app/services/gitea/repository/commits/list_slice_service.rb index 04f45f55b..d31cf2bcd 100644 --- a/app/services/gitea/repository/commits/list_slice_service.rb +++ b/app/services/gitea/repository/commits/list_slice_service.rb @@ -13,7 +13,7 @@ class Gitea::Repository::Commits::ListSliceService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/repository/contributors/get_service.rb b/app/services/gitea/repository/contributors/get_service.rb index 1ee1c3955..e5ad32e38 100644 --- a/app/services/gitea/repository/contributors/get_service.rb +++ b/app/services/gitea/repository/contributors/get_service.rb @@ -7,7 +7,7 @@ class Gitea::Repository::Contributors::GetService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_status(response) end diff --git a/app/services/gitea/repository/entries/get_service.rb b/app/services/gitea/repository/entries/get_service.rb index f8ac27543..f8e7b9451 100644 --- a/app/services/gitea/repository/entries/get_service.rb +++ b/app/services/gitea/repository/entries/get_service.rb @@ -13,7 +13,7 @@ class Gitea::Repository::Entries::GetService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/repository/entries/list_service.rb b/app/services/gitea/repository/entries/list_service.rb index dd62a1147..df9fdb1e3 100644 --- a/app/services/gitea/repository/entries/list_service.rb +++ b/app/services/gitea/repository/entries/list_service.rb @@ -10,7 +10,7 @@ class Gitea::Repository::Entries::ListService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/repository/files/get_service.rb b/app/services/gitea/repository/files/get_service.rb index e5b96e7ba..2a1589821 100644 --- a/app/services/gitea/repository/files/get_service.rb +++ b/app/services/gitea/repository/files/get_service.rb @@ -10,7 +10,7 @@ class Gitea::Repository::Files::GetService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_status(response) end diff --git a/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb b/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb index 0b8a52467..f0fd2557b 100644 --- a/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb +++ b/app/services/gitea/repository/get_branch_and_tag_total_num_service.rb @@ -11,7 +11,7 @@ module Gitea end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/repository/readme/dir_service.rb b/app/services/gitea/repository/readme/dir_service.rb index 587fb5d55..830cceaa8 100644 --- a/app/services/gitea/repository/readme/dir_service.rb +++ b/app/services/gitea/repository/readme/dir_service.rb @@ -10,7 +10,7 @@ class Gitea::Repository::Readme::DirService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) status, message, body = render_response(response) json_format(status, message, body) end diff --git a/app/services/gitea/repository/readme/get_service.rb b/app/services/gitea/repository/readme/get_service.rb index 48e2d4475..5af86b5ae 100644 --- a/app/services/gitea/repository/readme/get_service.rb +++ b/app/services/gitea/repository/readme/get_service.rb @@ -15,7 +15,7 @@ class Gitea::Repository::Readme::GetService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) status, message, body = render_response(response) json_format(status, message, body) end diff --git a/app/services/gitea/repository/tags/list_name_service.rb b/app/services/gitea/repository/tags/list_name_service.rb index 0857ca11c..ac81c9d75 100644 --- a/app/services/gitea/repository/tags/list_name_service.rb +++ b/app/services/gitea/repository/tags/list_name_service.rb @@ -8,7 +8,7 @@ class Gitea::Repository::Tags::ListNameService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_200_response(response) end diff --git a/app/services/gitea/repository/tags/list_service.rb b/app/services/gitea/repository/tags/list_service.rb index 0f8158b3e..958287179 100644 --- a/app/services/gitea/repository/tags/list_service.rb +++ b/app/services/gitea/repository/tags/list_service.rb @@ -11,7 +11,7 @@ class Gitea::Repository::Tags::ListService < Gitea::ClientService end def call - response = get(url, request_params) + response = get(url, request_params, true) render_result(response) end diff --git a/app/services/gitea/repository/transfer_service.rb b/app/services/gitea/repository/transfer_service.rb index 358ac9421..40cf5d1bf 100644 --- a/app/services/gitea/repository/transfer_service.rb +++ b/app/services/gitea/repository/transfer_service.rb @@ -9,7 +9,7 @@ class Gitea::Repository::TransferService < Gitea::ClientService end def call - response = post(url, request_params) + response = post(url, request_params, true) render_status(response) end diff --git a/app/services/gitea/repository/webhooks/tasks_service.rb b/app/services/gitea/repository/webhooks/tasks_service.rb index e4c62edb4..be5a59290 100644 --- a/app/services/gitea/repository/webhooks/tasks_service.rb +++ b/app/services/gitea/repository/webhooks/tasks_service.rb @@ -11,7 +11,7 @@ class Gitea::Repository::Webhooks::TasksService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_response(response) end diff --git a/app/services/gitea/user/headmap_service.rb b/app/services/gitea/user/headmap_service.rb index 611a8b9d0..d066d0f16 100644 --- a/app/services/gitea/user/headmap_service.rb +++ b/app/services/gitea/user/headmap_service.rb @@ -8,7 +8,7 @@ class Gitea::User::HeadmapService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_response(response) end diff --git a/app/services/gitea/user/update_service.rb b/app/services/gitea/user/update_service.rb index 9826c7ed0..24660158b 100644 --- a/app/services/gitea/user/update_service.rb +++ b/app/services/gitea/user/update_service.rb @@ -24,7 +24,7 @@ class Gitea::User::UpdateService < Gitea::ClientService end def call - patch(url, data_params) + patch(url, data_params, true) end private diff --git a/app/services/gitea/versions/create_service.rb b/app/services/gitea/versions/create_service.rb index 04fed00f2..4424fc276 100644 --- a/app/services/gitea/versions/create_service.rb +++ b/app/services/gitea/versions/create_service.rb @@ -18,7 +18,7 @@ class Gitea::Versions::CreateService < Gitea::ClientService end def call - response = post(url, request_params) + response = post(url, request_params, true) render_status(response) end diff --git a/app/services/gitea/versions/get_service.rb b/app/services/gitea/versions/get_service.rb index b3c6cf9cc..2af78ab28 100644 --- a/app/services/gitea/versions/get_service.rb +++ b/app/services/gitea/versions/get_service.rb @@ -12,7 +12,7 @@ class Gitea::Versions::GetService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/versions/list_service.rb b/app/services/gitea/versions/list_service.rb index 5d160fc3e..3505fa254 100644 --- a/app/services/gitea/versions/list_service.rb +++ b/app/services/gitea/versions/list_service.rb @@ -11,7 +11,7 @@ class Gitea::Versions::ListService < Gitea::ClientService end def call - response = get(url, params) + response = get(url, params, true) render_result(response) end diff --git a/app/services/gitea/versions/update_service.rb b/app/services/gitea/versions/update_service.rb index a4c9acfc2..c07620bc8 100644 --- a/app/services/gitea/versions/update_service.rb +++ b/app/services/gitea/versions/update_service.rb @@ -19,7 +19,7 @@ class Gitea::Versions::UpdateService < Gitea::ClientService end def call - patch(url, request_params) + patch(url, request_params, true) end private diff --git a/config/configuration.yml.example b/config/configuration.yml.example index f056dee1b..75d5eb5c0 100644 --- a/config/configuration.yml.example +++ b/config/configuration.yml.example @@ -55,6 +55,7 @@ default: &default access_key_secret: '' domain: 'https://testgit.trustie.net' base_url: '/api/v1' + hat_base_url: '/api/hat' accelerator: access_key_id: '' access_key_secret: ''