Merge pull request 'chore/discourse-plugin' from chore/discourse-plugin into develop

LinneyS · LinneyS · commit f34e2e37e265 · 2026-02-25T09:06:27.000Z
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-discourse/pulls/5
diff --git a/app/controllers/onlyoffice_discourse/onlyoffice_controller.rb b/app/controllers/onlyoffice_discourse/onlyoffice_controller.rb
diff --git a/app/models/onlyoffice_discourse/onlyoffice_permission.rb b/app/models/onlyoffice_discourse/onlyoffice_permission.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Onlyoffice
   class Permission < ActiveRecord::Base
-    self.table_name = 'onlyoffice_permissions'
+    self.table_name = "onlyoffice_permissions"
 
     belongs_to :upload
     belongs_to :user
@@ -11,7 +11,7 @@ class Permission < ActiveRecord::Base
     validates :permission_type, inclusion: { in: %w[viewer editor] }
     validates :user_id, uniqueness: { scope: :upload_id }
 
-    VIEWER = 'viewer'
-    EDITOR = 'editor'
+    VIEWER = "viewer"
+    EDITOR = "editor"
   end
 end
diff --git a/db/migrate/20250119160800_create_onlyoffice_permissions.rb b/db/migrate/20250119160800_create_onlyoffice_permissions.rb
@@ -4,11 +4,11 @@ def change
     create_table :onlyoffice_permissions do |t|
       t.integer :upload_id, null: false
       t.integer :user_id, null: false
-      t.string :permission_type, null: false, default: 'viewer'
+      t.string :permission_type, null: false, default: "viewer"
       t.timestamps
     end
 
-    add_index :onlyoffice_permissions, [:upload_id, :user_id], unique: true
+    add_index :onlyoffice_permissions, %i[upload_id user_id], unique: true
     add_index :onlyoffice_permissions, :upload_id
     add_index :onlyoffice_permissions, :user_id
   end
diff --git a/lib/onlyoffice_discourse/onlyoffice_controller_extensions.rb b/lib/onlyoffice_discourse/onlyoffice_controller_extensions.rb
@@ -4,11 +4,12 @@ module Onlyoffice
   module ControllerExtensions
     def convert
       begin
-        service = Onlyoffice::ConversionService.new(
-          upload_short_url: params[:upload_short_url],
-          target_format: params[:target_format]
-        )
-        
+        service =
+          Onlyoffice::ConversionService.new(
+            upload_short_url: params[:upload_short_url],
+            target_format: params[:target_format],
+          )
+
         result = service.convert
         render json: result
       rescue => e
@@ -18,16 +19,18 @@ def convert
 
     def upload_info
       upload_short_url = params[:id]
-      
+
       upload = nil
-      PrettyText::Helpers.lookup_upload_urls([upload_short_url]).each do |short_url, paths|
-        if paths[:base62_sha1]
-          sha1 = Upload.sha1_from_base62_encoded(paths[:base62_sha1])
-          upload = Upload.find_by(sha1: sha1)
-        elsif paths[:sha1]
-          upload = Upload.find_by(sha1: paths[:sha1])
+      PrettyText::Helpers
+        .lookup_upload_urls([upload_short_url])
+        .each do |short_url, paths|
+          if paths[:base62_sha1]
+            sha1 = Upload.sha1_from_base62_encoded(paths[:base62_sha1])
+            upload = Upload.find_by(sha1: sha1)
+          elsif paths[:sha1]
+            upload = Upload.find_by(sha1: paths[:sha1])
+          end
         end
-      end
 
       if upload
         render json: { upload_id: upload.id, user_id: upload.user_id }
@@ -39,63 +42,79 @@ def upload_info
     def list_permissions
       upload = find_upload_by_short_url(params[:id])
       return render json: { error: "Upload not found" }, status: :not_found unless upload
-      return render json: { error: "Access denied" }, status: :forbidden unless can_manage_permissions?(upload)
+      unless can_manage_permissions?(upload)
+        return render json: { error: "Access denied" }, status: :forbidden
+      end
 
       permissions = Onlyoffice::Permission.where(upload_id: upload.id).includes(:user)
-      
+
       render json: {
-        permissions: permissions.map do |p|
-          {
-            id: p.id,
-            user: {
-              id: p.user.id,
-              username: p.user.username,
-              name: p.user.name,
-              avatar_template: p.user.avatar_template
-            },
-            permission_type: p.permission_type
-          }
-        end
-      }
+               permissions:
+                 permissions.map do |p|
+                   {
+                     id: p.id,
+                     user: {
+                       id: p.user.id,
+                       username: p.user.username,
+                       name: p.user.name,
+                       avatar_template: p.user.avatar_template,
+                     },
+                     permission_type: p.permission_type,
+                   }
+                 end,
+             }
     end
 
     def create_permission
       upload = find_upload_by_short_url(params[:id])
       return render json: { error: "Upload not found" }, status: :not_found unless upload
-      return render json: { error: "Access denied" }, status: :forbidden unless can_manage_permissions?(upload)
+      unless can_manage_permissions?(upload)
+        return render json: { error: "Access denied" }, status: :forbidden
+      end
 
-      permission = Onlyoffice::Permission.new(
-        upload_id: upload.id,
-        user_id: params[:user_id],
-        permission_type: params[:permission_type]
-      )
+      permission =
+        Onlyoffice::Permission.new(
+          upload_id: upload.id,
+          user_id: params[:user_id],
+          permission_type: params[:permission_type],
+        )
 
       if permission.save
         render json: { success: true }
       else
-        render json: { error: permission.errors.full_messages.join(", ") }, status: :unprocessable_entity
+        render json: {
+                 error: permission.errors.full_messages.join(", "),
+               },
+               status: :unprocessable_entity
       end
     end
 
     def update_permission
       upload = find_upload_by_short_url(params[:id])
       return render json: { error: "Upload not found" }, status: :not_found unless upload
-      return render json: { error: "Access denied" }, status: :forbidden unless can_manage_permissions?(upload)
+      unless can_manage_permissions?(upload)
+        return render json: { error: "Access denied" }, status: :forbidden
+      end
 
       permission = Onlyoffice::Permission.find_by(id: params[:permission_id], upload_id: upload.id)
       return render json: { error: "Permission not found" }, status: :not_found unless permission
 
       if permission.update(permission_type: params[:permission_type])
         render json: { success: true }
       else
-        render json: { error: permission.errors.full_messages.join(", ") }, status: :unprocessable_entity
+        render json: {
+                 error: permission.errors.full_messages.join(", "),
+               },
+               status: :unprocessable_entity
       end
     end
 
     def delete_permission
       upload = find_upload_by_short_url(params[:id])
       return render json: { error: "Upload not found" }, status: :not_found unless upload
-      return render json: { error: "Access denied" }, status: :forbidden unless can_manage_permissions?(upload)
+      unless can_manage_permissions?(upload)
+        return render json: { error: "Access denied" }, status: :forbidden
+      end
 
       permission = Onlyoffice::Permission.find_by(id: params[:permission_id], upload_id: upload.id)
       return render json: { error: "Permission not found" }, status: :not_found unless permission
@@ -111,43 +130,45 @@ def delete_permission
 
     def find_upload_by_short_url(short_url)
       upload = nil
-      PrettyText::Helpers.lookup_upload_urls([short_url]).each do |_, paths|
-        if paths[:base62_sha1]
-          sha1 = Upload.sha1_from_base62_encoded(paths[:base62_sha1])
-          upload = Upload.find_by(sha1: sha1)
-        elsif paths[:sha1]
-          upload = Upload.find_by(sha1: paths[:sha1])
+      PrettyText::Helpers
+        .lookup_upload_urls([short_url])
+        .each do |_, paths|
+          if paths[:base62_sha1]
+            sha1 = Upload.sha1_from_base62_encoded(paths[:base62_sha1])
+            upload = Upload.find_by(sha1: sha1)
+          elsif paths[:sha1]
+            upload = Upload.find_by(sha1: paths[:sha1])
+          end
         end
-      end
       upload
     end
 
     def check_user_permission(upload, user)
-      return 'editor' unless upload
-      
+      return "editor" unless upload
+
       # Owner always has editor rights
-      return 'editor' if upload.user_id == user.id
-      
+      return "editor" if upload.user_id == user.id
+
       # Check explicit permissions set by owner
       permission = Onlyoffice::Permission.find_by(upload_id: upload.id, user_id: user.id)
       return permission.permission_type if permission
-      
+
       # Everyone else (including staff) gets viewer by default
-      'viewer'
+      "viewer"
     end
 
     def can_manage_permissions?(upload)
       return false unless current_user
-      
+
       # Check if user is post author (if post_id provided)
       if params[:post_id].present?
         post = Post.find_by(id: params[:post_id])
         return true if post && post.user_id == current_user.id
       end
-      
+
       # Only upload owner can manage permissions
       return true if upload.user_id == current_user.id
-      
+
       false
     end
   end
diff --git a/lib/onlyoffice_discourse/onlyoffice_conversion_service.rb b/lib/onlyoffice_discourse/onlyoffice_conversion_service.rb
@@ -11,18 +11,15 @@ def initialize(upload_short_url:, target_format:)
 
     def convert
       validate_parameters!
-      
+
       file_url = get_file_url
       raise "File not found" if file_url.blank?
 
       full_file_url = build_full_url(file_url)
       converted_file_url = request_conversion(full_file_url, file_url)
 
       original_filename = File.basename(file_url, ".*")
-      {
-        download_url: converted_file_url,
-        filename: "#{original_filename}.#{@target_format}"
-      }
+      { download_url: converted_file_url, filename: "#{original_filename}.#{@target_format}" }
     end
 
     private
@@ -33,9 +30,9 @@ def validate_parameters!
 
     def get_file_url
       file_url = ""
-      PrettyText::Helpers.lookup_upload_urls([@upload_short_url]).each do |short_url, paths|
-        file_url = paths[:url]
-      end
+      PrettyText::Helpers
+        .lookup_upload_urls([@upload_short_url])
+        .each { |short_url, paths| file_url = paths[:url] }
       file_url
     end
 
@@ -46,13 +43,13 @@ def build_full_url(file_url)
     def request_conversion(full_file_url, file_url)
       ds_internal_host = SiteSetting.ONLYOFFICE_Docs_address_for_internal_requests_from_the_server
       conversion_url = "#{ds_internal_host}/ConvertService.ashx"
-      
+
       conversion_request = {
         url: full_file_url,
         outputtype: @target_format,
-        filetype: File.extname(file_url).delete('.').downcase,
+        filetype: File.extname(file_url).delete(".").downcase,
         title: File.basename(file_url, ".*"),
-        async: false
+        async: false,
       }
 
       if Onlyoffice::OnlyofficeJwt.enabled?
@@ -61,26 +58,22 @@ def request_conversion(full_file_url, file_url)
 
       uri = URI(conversion_url)
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.scheme == 'https'
+      http.use_ssl = uri.scheme == "https"
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE if Rails.env.development?
 
       request = Net::HTTP::Post.new(uri.path)
-      request['Content-Type'] = 'application/json'
-      request['Accept'] = 'application/json'
+      request["Content-Type"] = "application/json"
+      request["Accept"] = "application/json"
       request.body = conversion_request.to_json
 
       response = http.request(request)
       result = JSON.parse(response.body)
 
-      if result['error']
-        raise "Conversion failed: #{result['error']}"
-      end
+      raise "Conversion failed: #{result["error"]}" if result["error"]
 
-      unless result['fileUrl']
-        raise "Conversion failed: no file URL returned"
-      end
+      raise "Conversion failed: no file URL returned" unless result["fileUrl"]
 
-      result['fileUrl']
+      result["fileUrl"]
     end
   end
 end
diff --git a/lib/onlyoffice_discourse/onlyoffice_demo.rb b/lib/onlyoffice_discourse/onlyoffice_demo.rb
@@ -10,13 +10,7 @@ class OnlyofficeDemo
     def self.demo_data
       data_json = PluginStore.get(Onlyoffice::PLUGIN_NAME, "demo_data")
 
-      if data_json.nil?
-        return {
-          available: true,
-          enabled: false,
-          start: nil
-        }
-      end
+      return { available: true, enabled: false, start: nil } if data_json.nil?
 
       data = JSON.parse(data_json, symbolize_names: true)
 
@@ -56,7 +50,7 @@ def self.enable_demo(value)
           data[:saved_settings] = {
             address: SiteSetting.ONLYOFFICE_Docs_address,
             secret: SiteSetting.ONLYOFFICE_Docs_secret_key,
-            header: SiteSetting.JWT_header
+            header: SiteSetting.JWT_header,
           }
           PluginStore.set(Onlyoffice::PLUGIN_NAME, "demo_data", data.to_json)
         end
@@ -69,7 +63,8 @@ def self.enable_demo(value)
       else
         # Restore saved settings when demo disabled
         if data[:saved_settings]
-          SiteSetting.ONLYOFFICE_Docs_address = data[:saved_settings][:address] || "http://localhost"
+          SiteSetting.ONLYOFFICE_Docs_address =
+            data[:saved_settings][:address] || "http://localhost"
           SiteSetting.ONLYOFFICE_Docs_secret_key = data[:saved_settings][:secret] || ""
           SiteSetting.JWT_header = data[:saved_settings][:header] || "Authorization"
 
diff --git a/lib/onlyoffice_discourse/onlyoffice_jwt.rb b/lib/onlyoffice_discourse/onlyoffice_jwt.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'jwt'
+require "jwt"
 
 module Onlyoffice
   class OnlyofficeJwt
@@ -10,13 +10,14 @@ def self.enabled?
 
     def self.encode(payload)
       return nil unless enabled?
-      JWT.encode(payload, SiteSetting.ONLYOFFICE_Docs_secret_key, 'HS256')
+      JWT.encode(payload, SiteSetting.ONLYOFFICE_Docs_secret_key, "HS256")
     end
 
     def self.decode(token)
       return nil unless enabled? || token.blank?
-      
-      decoded = JWT.decode(token, SiteSetting.ONLYOFFICE_Docs_secret_key, true, { algorithm: 'HS256' })[0]
+
+      decoded =
+        JWT.decode(token, SiteSetting.ONLYOFFICE_Docs_secret_key, true, { algorithm: "HS256" })[0]
       decoded.to_json
     rescue JWT::DecodeError => e
       Rails.logger.error("JWT decode failed: #{e.message}")
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "lint:hbs:fix": "ember-template-lint {assets,admin/assets,test}/javascripts/**/*.gjs --fix --no-error-on-unmatched-pattern",
     "lint:prettier": "pnpm prettier assets/stylesheets/**/*.scss {assets,admin/assets,test}/javascripts/**/*.js --check --no-error-on-unmatched-pattern",
     "lint:prettier:fix": "pnpm prettier assets/stylesheets/**/*.scss {assets,admin/assets,test}/javascripts/**/*.js -w --no-error-on-unmatched-pattern",
-    "lint:types": "ember-tsc -b"
+    "lint:ruby": "bundle exec rubocop && bundle exec stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake') $(git ls-files '*.thor')",
+    "lint:ruby:fix": "bundle exec rubocop -a && bundle exec stree write Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake') $(git ls-files '*.thor')"
   },
   "devDependencies": {
     "@discourse/lint-configs": "2.32.0",
diff --git a/plugin.rb b/plugin.rb
