Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2025-01-29 22:51:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load storage before linked account provider

Browse Source
This commit is contained in:
Vankka 2024-06-29 14:06:28 +03:00
parent d70eddeec5
commit a81e8305a0
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java
View File

@ -694,42 +694,6 @@ public abstract class AbstractDiscordSRV<
scheduler().runAtFixedRate(() -> updateChecker.check(false), Duration.ofHours(6)); scheduler().runAtFixedRate(() -> updateChecker.check(false), Duration.ofHours(6));
} }
if (flags.contains(ReloadFlag.LINKED_ACCOUNT_PROVIDER)) {
LinkedAccountConfig linkedAccountConfig = config().linkedAccounts;
if (linkedAccountConfig != null && linkedAccountConfig.enabled) {
LinkedAccountConfig.Provider provider = linkedAccountConfig.provider;
boolean permitMinecraftAuth = connectionConfig().minecraftAuth.allow;
if (provider == LinkedAccountConfig.Provider.AUTO) {
provider = permitMinecraftAuth && onlineMode().isOnline() ? LinkedAccountConfig.Provider.MINECRAFTAUTH : LinkedAccountConfig.Provider.STORAGE;
}
switch (provider) {
case MINECRAFTAUTH:
if (!permitMinecraftAuth) {
linkProvider = null;
logger().error("minecraftauth.me is disabled in the " + ConnectionConfig.FILE_NAME + ", "
+ "but linked-accounts.provider is set to \"minecraftauth\". Linked accounts will be disabled");
break;
}
dependencyManager.mcAuthLib().downloadRelocateAndLoad().get();
linkProvider = new MinecraftAuthenticationLinker(this);
logger().info("Using minecraftauth.me for linked accounts");
break;
case STORAGE:
linkProvider = new StorageLinker(this);
logger().info("Using storage for linked accounts");
break;
default: {
linkProvider = null;
logger().error("Unknown linked account provider: \"" + provider + "\", linked accounts will not be used");
break;
}
}
} else {
linkProvider = null;
logger().info("Linked accounts are disabled");
}
}
if (flags.contains(ReloadFlag.STORAGE)) { if (flags.contains(ReloadFlag.STORAGE)) {
if (storage != null) { if (storage != null) {
storage.close(); storage.close();
@ -766,6 +730,42 @@ public abstract class AbstractDiscordSRV<
} }
} }
if (flags.contains(ReloadFlag.LINKED_ACCOUNT_PROVIDER)) {
LinkedAccountConfig linkedAccountConfig = config().linkedAccounts;
if (linkedAccountConfig != null && linkedAccountConfig.enabled) {
LinkedAccountConfig.Provider provider = linkedAccountConfig.provider;
boolean permitMinecraftAuth = connectionConfig().minecraftAuth.allow;
if (provider == LinkedAccountConfig.Provider.AUTO) {
provider = permitMinecraftAuth && onlineMode().isOnline() ? LinkedAccountConfig.Provider.MINECRAFTAUTH : LinkedAccountConfig.Provider.STORAGE;
}
switch (provider) {
case MINECRAFTAUTH:
if (!permitMinecraftAuth) {
linkProvider = null;
logger().error("minecraftauth.me is disabled in the " + ConnectionConfig.FILE_NAME + ", "
+ "but linked-accounts.provider is set to \"minecraftauth\". Linked accounts will be disabled");
break;
}
dependencyManager.mcAuthLib().downloadRelocateAndLoad().get();
linkProvider = new MinecraftAuthenticationLinker(this);
logger().info("Using minecraftauth.me for linked accounts");
break;
case STORAGE:
linkProvider = new StorageLinker(this);
logger().info("Using storage for linked accounts");
break;
default: {
linkProvider = null;
logger().error("Unknown linked account provider: \"" + provider + "\", linked accounts will not be used");
break;
}
}
} else {
linkProvider = null;
logger().info("Linked accounts are disabled");
}
}
if (flags.contains(ReloadFlag.DISCORD_CONNECTION)) { if (flags.contains(ReloadFlag.DISCORD_CONNECTION)) {
try { try {
if (discordConnectionManager.instance() != null) { if (discordConnectionManager.instance() != null) {