Merge pull request #1673 from tryzealot/release/5.3.7

icyleaf · web-flow · commit 5eb9fb492280 · 2024-09-27T21:45:17.000+08:00
Release 5.3.7
diff --git a/Dockerfile b/Dockerfile
@@ -64,7 +64,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="5.3.6"
+ARG ZEALOT_VERSION="5.3.7"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"
diff --git a/app/controllers/api/releases_controller.rb b/app/controllers/api/releases_controller.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Api::ReleasesController < Api::BaseController
+  before_action :validate_user_token
+  before_action :set_release
+
+  # UPDATE /releases/:id
+  def update
+    @release.update!(release_params)
+    render json: @release
+  end
+
+  # DELETE /releases/:id
+  def destroy
+    @release.destroy
+    render json: { mesage: 'OK' }
+  end
+
+  protected
+
+  def set_release
+    @release = Release.find(params[:id])
+  end
+
+  def release_params
+    params.permit(
+      :release_version, :build_version, :release_type, :source, :branch, :git_commit,
+      :ci_url, :custom_fields, :changelog
+    )
+  end
+end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  before_action :disable_registrations_mode unless Setting.registrations_mode
-
   User.oauth_providers.each do |provider_name|
     define_method(provider_name) do
       omniauth_callback(provider_name)
@@ -52,8 +50,4 @@ def goback_path
     omni_params = request.env['omniauth.params']
     omni_params&['back'].presence || request.env['HTTP_REFERER'] || root_path
   end
-
-  def disable_registrations_mode
-    redirect_to user_session_path, alert: t('devise.omniauth_callbacks.disabled')
-  end
 end
diff --git a/app/models/release.rb b/app/models/release.rb
@@ -16,10 +16,10 @@ class Release < ApplicationRecord
   has_one :metadata, class_name: 'Metadatum', dependent: :destroy
   has_and_belongs_to_many :devices, dependent: :destroy
 
-  validates :file, presence: true
+  validates :file, presence: true, on: :create
   validate :bundle_id_matched, on: :create
-  validate :determine_file_exist
-  validate :determine_disk_space
+  validate :determine_file_exist, on: :create
+  validate :determine_disk_space, on: :create
 
   before_create :auto_release_version
   before_create :default_source
diff --git a/app/serializers/release_serializer.rb b/app/serializers/release_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ReleaseSerializer < ApplicationSerializer
-  attributes :version, :app_name, :bundle_id, :release_version, :build_version,
+  attributes :id, :version, :app_name, :bundle_id, :release_version, :build_version,
              :source, :branch, :git_commit, :ci_url, :size, :platform, :device_type,
              :icon_url, :install_url, :changelog, :text_changelog, :custom_fields,
              :created_at
diff --git a/app/views/devise/shared/_links.html.slim b/app/views/devise/shared/_links.html.slim
@@ -1,4 +1,4 @@
-- if devise_mapping.omniauthable? && Setting.registrations_mode
+- if devise_mapping.omniauthable?
   .social-auth-links.mb-3
     - resource_class.oauth_providers.each do |provider|
       - unless provider == :ldap
diff --git a/config/locales/devise/devise.views.en.yml b/config/locales/devise/devise.views.en.yml
@@ -5,5 +5,3 @@ en:
         danger_zone: Danger Zone
         cancel_my_account: Delete account
         unhappy: Do you really want to delete your account?
-    omniauth_callbacks:
-      disabled: Registration mode is closed. Please contact the administrator.
diff --git a/config/locales/devise/devise.views.zh-CN.yml b/config/locales/devise/devise.views.zh-CN.yml
@@ -74,8 +74,7 @@ zh-CN:
         message: 由于多次登录失败，您的帐户已被锁定。
         subject: 帐户解锁信息
     omniauth_callbacks:
-      disabled: 系统关闭了注册功能，请联系管理员。
-      failure: 由于 %{reason}，无法从%{kind}获得授权。
+      failure: 基于 %{reason}，无法从%{kind}获得授权。
       success: 成功地从%{kind}获得授权。
     passwords:
       edit:
diff --git a/config/locales/zealot/api.en.yml b/config/locales/zealot/api.en.yml
@@ -13,7 +13,7 @@ en:
 
         ```json
         {
-          "version": "5.3.6",
+          "version": "5.3.7",
           "vcs_ref": "effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d",
           "build_date": "2024-05-23T06:04:48.989Z"
         }
@@ -123,6 +123,17 @@ en:
           bundle_id: identifier valid check, set `*` skip (`bundle_id` for iOS, `package name` for Android)
           git_url: Git repository URL
           password: Enable password visit
+      release_options:
+        description: App's build metadata form data
+        properties:
+          build_version: Build version
+          release_version: Release version
+          source: the source of upload (default is `api`)
+          changelog: Change log, accept plain text or JSON formatted data
+          branch: a branch name from source control tool
+          git_commit: Git Commit SHA value
+          ci_url: the build url of a CI service
+          custom_fields: JSON formatted custom fields, icon only accepts fontawesome.
       collaborator_options:
         description: App's collaborator form data
         properties:
@@ -144,6 +155,7 @@ en:
           file: Zip arichved file (dSYM or Proguard)
           release_version: Release version (requires if Android's Proguard file)
           build_version: Build version (requires if Android's Proguard file)
+
     apps:
       default:
         tags: Apps
@@ -185,6 +197,7 @@ en:
       destroy:
         title: Destroy an App
         description: Destroy an App all data by ID, include schemes, channel, builds, debug files and the other related resources.
+
     schemes:
       default:
         tags: Schemes
@@ -206,6 +219,7 @@ en:
       destroy:
         title: Destroy a scheme
         description: Destroy a scheme from the App
+
     channels:
       default:
         tags: Channel
@@ -227,6 +241,20 @@ en:
       destroy:
         title: Destroy a channel
         description: Destroy a scheme's channel
+
+    releases:
+      default:
+        tags: Release
+        responses:
+          update: Update a build
+          destroy: Destroy build
+      update:
+        title: Update a build metedata
+        description: Update a build of app verison, custom_fileds, changelog etc
+      destroy:
+        title: Destroy a build
+        description: Destroy a app's build
+
     collaborators:
       default:
         tags: Collaborators
@@ -248,6 +276,7 @@ en:
       destroy:
         title: Remove a collaborator from an App
         description: Remove a collaborator from an App
+
     debug_files:
       default:
         tags: Debug files
@@ -285,6 +314,7 @@ en:
       destroy:
         title: Destroy a debug file
         description: Destroy a debug file ID and all data, include dSYM or Proguard files.
+
     users:
       default:
         tags: Users
@@ -321,6 +351,7 @@ en:
       unlock:
         title: Unlock a user
         description: Unlock a user to enable log in
+
     version:
       default:
         tags: Version
diff --git a/config/locales/zealot/api.zh-CN.yml b/config/locales/zealot/api.zh-CN.yml
@@ -13,7 +13,7 @@ zh-CN:
 
         ```json
         {
-          "version": "5.3.6",
+          "version": "5.3.7",
           "vcs_ref": "effe99c25b79fd55d3e1959ea3af0bcb6b75ba1d",
           "build_date": "2024-05-23T06:04:48.989Z"
         }
@@ -120,6 +120,18 @@ zh-CN:
           bundle_id: 包名校验， 默认是 `*` 不做校验 (iOS 指的是 bundle_id，Android 指的是 package name)
           git_url: Git 仓库地址
           password: 密码访问
+      release_options:
+        description: 应用版本元信息表单字段结构
+        properties:
+          build_version: 构建版本
+          release_version: 发布版本
+          release_type: 应用类型，比如 debug, beta, adhoc, release, enterprise 等
+          source: 上传渠道名称，默认是 `api`
+          changelog: 变更日志，接受纯文本或 JSON 格式化的数据
+          branch: 代码控制软件的分支名
+          git_commit: 代码控制软件提交哈希值
+          ci_url: 持续构建系统构建 URL
+          custom_fields: 这是一个用 JSON 字符串定义的自定义字段，图标可接受 fontawesome
       collaborator_options:
         description: 应用成员表单字段结构
         properties:
@@ -228,6 +240,19 @@ zh-CN:
         title: 删除应用渠道
         description: 从应用中删除指定应用渠道
 
+    releases:
+      default:
+        tags: 应用版本
+        responses:
+          update: 更新应用版本
+          destroy: 删除应用版本
+      update:
+        title: 更新应用版本元信息
+        description: 更新应用版本的版本、自定义字段、变更日志等信息
+      destroy:
+        title: 删除应用版本
+        description: 删除应用版本
+
     collaborators:
       default:
         tags: 应用成员
diff --git a/config/routes.rb b/config/routes.rb
@@ -213,6 +213,7 @@
 
       resources :collaborators, param: :user_id, except: %i[index new edit]
     end
+    resources :releases, only: %i[update destroy]
 
     resources :debug_files, except: %i[new edit create] do
       collection do
diff --git a/lib/tasks/zealot/zealot.rake b/lib/tasks/zealot/zealot.rake
@@ -37,6 +37,9 @@ namespace :zealot do
       puts "Zealot initialize database ..."
       Rake::Task['db:migrate'].invoke
 
+      # NOTE: wait db migrate then insert data
+      sleep 3
+
       puts "Zealot initialize admin user and sample data ..."
       Rake::Task['db:seed'].invoke
     end
@@ -77,21 +80,27 @@ namespace :zealot do
     if vcs = Setting.vcs_ref
       message += "revision #{vcs[0..7]}"
     end
-    message = message ? " (#{message})" : nil
-    docker = (docker_tag = ENV['DOCKER_TAG']) ? " [docker:#{docker_tag}]" : nil
+    message = message.present? ? " (#{message})" : nil
+    docker = (docker_tag = ENV['DOCKER_TAG']).present? ? " [docker:#{docker_tag}]" : nil
 
-    puts "Zealot #{version}#{message}#{docker}"
+    puts "Zealot version: #{version}#{message}#{docker}"
   end
 
   desc "Zealot | generate swagger files"
   task :swaggerize do
     ENV['RAILS_ENV'] = 'test'
     current_locale = ENV['DEFAULT_LOCALE']
+
     Rails.configuration.i18n.available_locales.each do |locale|
+      # reset task invoke status and execute
+      Rake::Task['rswag:specs:swaggerize'].reenable
+
+      puts "Generating swagger file ... #{locale}"
       ENV['DEFAULT_LOCALE'] = current_locale.to_s
-      puts "Generating #{locale} swagger ..."
-      Rake::Task['rswag'].invoke
+      Rake::Task['rswag:specs:swaggerize'].invoke
     end
+
+    # restore
     ENV['DEFAULT_LOCALE'] = current_locale
     ENV.delete('RAILS_ENV')
   end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zealot",
-  "version": "5.3.6",
+  "version": "5.3.7",
   "private": true,
   "license": "MIT",
   "dependencies": {
diff --git a/spec/api/apps_spec.rb b/spec/api/apps_spec.rb
@@ -129,7 +129,7 @@
       description I18n.t('api.apps.create.description')
       operationId 'createApp'
 
-      include_examples :request_form_body, '#/definitions/AppOptions'
+      include_examples :request_body, '#/definitions/AppOptions'
 
       produces 'application/json'
       response 201, I18n.t('api.apps.default.responses.show') do
@@ -148,7 +148,7 @@
       operationId 'updateApp'
 
       include_examples :primary_key_parameter
-      include_examples :request_form_body, '#/definitions/AppOptions'
+      include_examples :request_body, '#/definitions/AppOptions'
 
       produces 'application/json'
       response 200, I18n.t('api.apps.default.responses.show') do
diff --git a/spec/api/channels_spec.rb b/spec/api/channels_spec.rb
@@ -29,7 +29,7 @@
       operationId 'createChannel'
 
       include_examples :primary_key_parameter, :scheme_id
-      include_examples :request_form_body, '#/definitions/ChannelOptions'
+      include_examples :request_body, '#/definitions/ChannelOptions'
 
       produces 'application/json'
       response 201, I18n.t('api.channels.default.responses.create') do
@@ -49,7 +49,7 @@
       operationId 'updateChannel'
 
       include_examples :primary_key_parameter
-      include_examples :request_form_body, '#/definitions/ChannelOptions'
+      include_examples :request_body, '#/definitions/ChannelOptions'
 
       produces 'application/json'
       response 200, I18n.t('api.channels.default.responses.update') do
diff --git a/spec/api/collaborators_spec.rb b/spec/api/collaborators_spec.rb
@@ -31,7 +31,7 @@
 
       include_examples :primary_key_parameter, :app_id
       include_examples :primary_key_parameter, :user_id
-      include_examples :request_form_body, '#/definitions/CollaboratorOptions'
+      include_examples :request_body, '#/definitions/CollaboratorOptions'
 
       produces 'application/json'
       response 201, I18n.t('api.collaborators.default.responses.create') do
@@ -52,7 +52,7 @@
 
       include_examples :primary_key_parameter, :app_id
       include_examples :primary_key_parameter, :user_id
-      include_examples :request_form_body, '#/definitions/CollaboratorOptions'
+      include_examples :request_body, '#/definitions/CollaboratorOptions'
 
       produces 'application/json'
       response 200, I18n.t('api.collaborators.default.responses.update') do
diff --git a/spec/api/releases_spec.rb b/spec/api/releases_spec.rb
diff --git a/spec/api/schemes_spec.rb b/spec/api/schemes_spec.rb
diff --git a/spec/api/users_spec.rb b/spec/api/users_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/spec/support/swagger/shared.rb b/spec/support/swagger/shared.rb
diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb
diff --git a/swagger/v1/swagger_en.json b/swagger/v1/swagger_en.json
diff --git a/swagger/v1/swagger_zh-CN.json b/swagger/v1/swagger_zh-CN.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-- if devise_mapping.omniauthable? && Setting.registrations_mode`
	`1`	`+- if devise_mapping.omniauthable?`
`2`	`2`	`.social-auth-links.mb-3`
`3`	`3`	`- resource_class.oauth_providers.each do \|provider\|`
`4`	`4`	`- unless provider == :ldap`