mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-17 04:35:25 +08:00
3332e9f4c3
`.annotaterb.yml` has carried `classified_sort: true` since the project
switched from `annotate` to `annotaterb` (commit 0eab7daea4, July 2025),
but annotaterb's default behaviour is to compare the existing schema
block against what it would generate and skip the rewrite when the
column list matches — even when the *ordering* of those columns differs.
The result is that models which haven't had a schema change since the
config landed never get reordered, and `classified_sort` drift
accumulates indefinitely.
`--force` makes annotaterb always rewrite, so a single `bin/rake
annotate:clean` run brings every model into the canonical format and
keeps them there. Every schema block is now grouped primary-key →
regular columns → timestamps → foreign keys (alphabetical within each
group). Pure annotation comment change — no code modifications.
Also cleans up the rake task to avoid string interpolation for `system`
calls.
38 lines
1 KiB
Ruby
38 lines
1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class UserApiKeyClient < ActiveRecord::Base
|
|
has_many :keys, class_name: "UserApiKey", dependent: :destroy
|
|
has_many :scopes,
|
|
class_name: "UserApiKeyClientScope",
|
|
foreign_key: "user_api_key_client_id",
|
|
dependent: :destroy
|
|
|
|
def allowed_scopes
|
|
Set.new(scopes.map(&:name))
|
|
end
|
|
|
|
def self.invalid_auth_redirect?(auth_redirect, client: nil)
|
|
return false if client&.auth_redirect == auth_redirect
|
|
SiteSetting
|
|
.allowed_user_api_auth_redirects
|
|
.split("|")
|
|
.none? { |u| WildcardUrlChecker.check_url(u, auth_redirect) }
|
|
end
|
|
end
|
|
|
|
# == Schema Information
|
|
#
|
|
# Table name: user_api_key_clients
|
|
#
|
|
# id :bigint not null, primary key
|
|
# application_name :string not null
|
|
# auth_redirect :string
|
|
# public_key :string
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# client_id :string not null
|
|
#
|
|
# Indexes
|
|
#
|
|
# index_user_api_key_clients_on_client_id (client_id) UNIQUE
|
|
#
|
