mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
DEV: Remove logical OR assignment of constants (#29201)
Constants should always be only assigned once. The logical OR assignment of a constant is a relic of the past before we used zeitwerk for autoloading and had bugs where a file could be loaded twice resulting in constant redefinition warnings.
This commit is contained in:
committed by
GitHub
parent
f3f37c9019
commit
322a3be2db
@@ -23,28 +23,28 @@ require_relative "../route_matcher"
|
||||
# We'll drop support for v0 after Discourse 2.9 is released.
|
||||
|
||||
class Auth::DefaultCurrentUserProvider
|
||||
CURRENT_USER_KEY ||= "_DISCOURSE_CURRENT_USER"
|
||||
USER_TOKEN_KEY ||= "_DISCOURSE_USER_TOKEN"
|
||||
API_KEY ||= "api_key"
|
||||
API_USERNAME ||= "api_username"
|
||||
HEADER_API_KEY ||= "HTTP_API_KEY"
|
||||
HEADER_API_USERNAME ||= "HTTP_API_USERNAME"
|
||||
HEADER_API_USER_EXTERNAL_ID ||= "HTTP_API_USER_EXTERNAL_ID"
|
||||
HEADER_API_USER_ID ||= "HTTP_API_USER_ID"
|
||||
PARAMETER_USER_API_KEY ||= "user_api_key"
|
||||
USER_API_KEY ||= "HTTP_USER_API_KEY"
|
||||
USER_API_CLIENT_ID ||= "HTTP_USER_API_CLIENT_ID"
|
||||
API_KEY_ENV ||= "_DISCOURSE_API"
|
||||
USER_API_KEY_ENV ||= "_DISCOURSE_USER_API"
|
||||
TOKEN_COOKIE ||= ENV["DISCOURSE_TOKEN_COOKIE"] || "_t"
|
||||
PATH_INFO ||= "PATH_INFO"
|
||||
COOKIE_ATTEMPTS_PER_MIN ||= 10
|
||||
BAD_TOKEN ||= "_DISCOURSE_BAD_TOKEN"
|
||||
CURRENT_USER_KEY = "_DISCOURSE_CURRENT_USER"
|
||||
USER_TOKEN_KEY = "_DISCOURSE_USER_TOKEN"
|
||||
API_KEY = "api_key"
|
||||
API_USERNAME = "api_username"
|
||||
HEADER_API_KEY = "HTTP_API_KEY"
|
||||
HEADER_API_USERNAME = "HTTP_API_USERNAME"
|
||||
HEADER_API_USER_EXTERNAL_ID = "HTTP_API_USER_EXTERNAL_ID"
|
||||
HEADER_API_USER_ID = "HTTP_API_USER_ID"
|
||||
PARAMETER_USER_API_KEY = "user_api_key"
|
||||
USER_API_KEY = "HTTP_USER_API_KEY"
|
||||
USER_API_CLIENT_ID = "HTTP_USER_API_CLIENT_ID"
|
||||
API_KEY_ENV = "_DISCOURSE_API"
|
||||
USER_API_KEY_ENV = "_DISCOURSE_USER_API"
|
||||
TOKEN_COOKIE = ENV["DISCOURSE_TOKEN_COOKIE"] || "_t"
|
||||
PATH_INFO = "PATH_INFO"
|
||||
COOKIE_ATTEMPTS_PER_MIN = 10
|
||||
BAD_TOKEN = "_DISCOURSE_BAD_TOKEN"
|
||||
DECRYPTED_AUTH_COOKIE = "_DISCOURSE_DECRYPTED_AUTH_COOKIE"
|
||||
|
||||
TOKEN_SIZE = 32
|
||||
|
||||
PARAMETER_API_PATTERNS ||= [
|
||||
PARAMETER_API_PATTERNS = [
|
||||
RouteMatcher.new(
|
||||
methods: :get,
|
||||
actions: [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Auth::FacebookAuthenticator < Auth::ManagedAuthenticator
|
||||
AVATAR_SIZE ||= 480
|
||||
AVATAR_SIZE = 480
|
||||
|
||||
def name
|
||||
"facebook"
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Auth::GoogleOAuth2Authenticator < Auth::ManagedAuthenticator
|
||||
GROUPS_SCOPE ||= "https://www.googleapis.com/auth/admin.directory.group.readonly"
|
||||
GROUPS_DOMAIN ||= "admin.googleapis.com"
|
||||
GROUPS_PATH ||= "/admin/directory/v1/groups"
|
||||
OAUTH2_BASE_URL ||= "https://oauth2.googleapis.com"
|
||||
GROUPS_SCOPE = "https://www.googleapis.com/auth/admin.directory.group.readonly"
|
||||
GROUPS_DOMAIN = "admin.googleapis.com"
|
||||
GROUPS_PATH = "/admin/directory/v1/groups"
|
||||
OAUTH2_BASE_URL = "https://oauth2.googleapis.com"
|
||||
|
||||
def name
|
||||
"google_oauth2"
|
||||
|
||||
Reference in New Issue
Block a user