Twitter 登录
@@ -51,6 +55,7 @@ import { API_BASE_URL, toast } from '../main'
import { setToken, loadCurrentUser } from '../utils/auth'
import { googleSignIn } from '../utils/google'
import { githubAuthorize } from '../utils/github'
+import { discordAuthorize } from '../utils/discord'
import { twitterAuthorize } from '../utils/twitter'
import BaseInput from '../components/BaseInput.vue'
export default {
@@ -107,6 +112,9 @@ export default {
loginWithGithub() {
githubAuthorize()
},
+ loginWithDiscord() {
+ discordAuthorize()
+ },
loginWithTwitter() {
twitterAuthorize()
}
diff --git a/open-isle-cli/src/views/SignupPageView.vue b/open-isle-cli/src/views/SignupPageView.vue
index 21ca9c5a4..0471bfeff 100644
--- a/open-isle-cli/src/views/SignupPageView.vue
+++ b/open-isle-cli/src/views/SignupPageView.vue
@@ -80,6 +80,10 @@
GitHub 注册
+
Twitter 注册
@@ -92,6 +96,7 @@
import { API_BASE_URL, toast } from '../main'
import { googleSignIn } from '../utils/google'
import { githubAuthorize } from '../utils/github'
+import { discordAuthorize } from '../utils/discord'
import { twitterAuthorize } from '../utils/twitter'
import BaseInput from '../components/BaseInput.vue'
export default {
@@ -214,6 +219,9 @@ export default {
signupWithGithub() {
githubAuthorize()
},
+ signupWithDiscord() {
+ discordAuthorize()
+ }
signupWithTwitter() {
twitterAuthorize()
}
diff --git a/src/main/java/com/openisle/controller/AuthController.java b/src/main/java/com/openisle/controller/AuthController.java
index 86415ef0b..afe0735c8 100644
--- a/src/main/java/com/openisle/controller/AuthController.java
+++ b/src/main/java/com/openisle/controller/AuthController.java
@@ -7,6 +7,7 @@ import com.openisle.service.UserService;
import com.openisle.service.CaptchaService;
import com.openisle.service.GoogleAuthService;
import com.openisle.service.GithubAuthService;
+import com.openisle.service.DiscordAuthService;
import com.openisle.service.TwitterAuthService;
import com.openisle.service.RegisterModeService;
import com.openisle.service.NotificationService;
@@ -31,6 +32,7 @@ public class AuthController {
private final CaptchaService captchaService;
private final GoogleAuthService googleAuthService;
private final GithubAuthService githubAuthService;
+ private final DiscordAuthService discordAuthService;
private final TwitterAuthService twitterAuthService;
private final RegisterModeService registerModeService;
private final NotificationService notificationService;
@@ -199,6 +201,36 @@ public class AuthController {
));
}
+ @PostMapping("/discord")
+ public ResponseEntity loginWithDiscord(@RequestBody DiscordLoginRequest req) {
+ Optional
user = discordAuthService.authenticate(req.getCode(), registerModeService.getRegisterMode(), req.getRedirectUri());
+ if (user.isPresent()) {
+ if (RegisterMode.DIRECT.equals(registerModeService.getRegisterMode())) {
+ return ResponseEntity.ok(Map.of("token", jwtService.generateToken(user.get().getUsername())));
+ }
+ if (!user.get().isApproved()) {
+ if (user.get().getRegisterReason() != null && !user.get().getRegisterReason().isEmpty()) {
+ return ResponseEntity.badRequest().body(Map.of(
+ "error", "Account awaiting approval",
+ "reason_code", "IS_APPROVING",
+ "token", jwtService.generateReasonToken(user.get().getUsername())
+ ));
+ }
+ return ResponseEntity.badRequest().body(Map.of(
+ "error", "Account awaiting approval",
+ "reason_code", "NOT_APPROVED",
+ "token", jwtService.generateReasonToken(user.get().getUsername())
+ ));
+ }
+
+ return ResponseEntity.ok(Map.of("token", jwtService.generateToken(user.get().getUsername())));
+ }
+ return ResponseEntity.badRequest().body(Map.of(
+ "error", "Invalid discord code",
+ "reason_code", "INVALID_CREDENTIALS"
+ ));
+ }
+
@PostMapping("/twitter")
public ResponseEntity loginWithTwitter(@RequestBody TwitterLoginRequest req) {
Optional user = twitterAuthService.authenticate(req.getCode(), registerModeService.getRegisterMode(), req.getRedirectUri());
@@ -260,6 +292,12 @@ public class AuthController {
private String redirectUri;
}
+ @Data
+ private static class DiscordLoginRequest {
+ private String code;
+ private String redirectUri;
+ }
+
@Data
private static class TwitterLoginRequest {
private String code;
diff --git a/src/main/java/com/openisle/service/DiscordAuthService.java b/src/main/java/com/openisle/service/DiscordAuthService.java
new file mode 100644
index 000000000..670c248dc
--- /dev/null
+++ b/src/main/java/com/openisle/service/DiscordAuthService.java
@@ -0,0 +1,107 @@
+package com.openisle.service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.openisle.model.Role;
+import com.openisle.model.User;
+import com.openisle.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class DiscordAuthService {
+ private final UserRepository userRepository;
+ private final RestTemplate restTemplate = new RestTemplate();
+
+ @Value("${discord.client-id:}")
+ private String clientId;
+
+ @Value("${discord.client-secret:}")
+ private String clientSecret;
+
+ public Optional authenticate(String code, com.openisle.model.RegisterMode mode, String redirectUri) {
+ try {
+ String tokenUrl = "https://discord.com/api/oauth2/token";
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+ MultiValueMap body = new LinkedMultiValueMap<>();
+ body.add("client_id", clientId);
+ body.add("client_secret", clientSecret);
+ body.add("grant_type", "authorization_code");
+ body.add("code", code);
+ if (redirectUri != null) {
+ body.add("redirect_uri", redirectUri);
+ }
+ body.add("scope", "identify email");
+
+ HttpEntity> request = new HttpEntity<>(body, headers);
+ ResponseEntity tokenRes = restTemplate.postForEntity(tokenUrl, request, JsonNode.class);
+ if (!tokenRes.getStatusCode().is2xxSuccessful() || tokenRes.getBody() == null || !tokenRes.getBody().has("access_token")) {
+ return Optional.empty();
+ }
+ String accessToken = tokenRes.getBody().get("access_token").asText();
+ HttpHeaders authHeaders = new HttpHeaders();
+ authHeaders.setBearerAuth(accessToken);
+ HttpEntity entity = new HttpEntity<>(authHeaders);
+ ResponseEntity userRes = restTemplate.exchange(
+ "https://discord.com/api/users/@me", HttpMethod.GET, entity, JsonNode.class);
+ if (!userRes.getStatusCode().is2xxSuccessful() || userRes.getBody() == null) {
+ return Optional.empty();
+ }
+ JsonNode userNode = userRes.getBody();
+ String email = userNode.hasNonNull("email") ? userNode.get("email").asText() : null;
+ String username = userNode.hasNonNull("username") ? userNode.get("username").asText() : null;
+ String id = userNode.hasNonNull("id") ? userNode.get("id").asText() : null;
+ String avatar = null;
+ if (userNode.hasNonNull("avatar") && id != null) {
+ avatar = "https://cdn.discordapp.com/avatars/" + id + "/" + userNode.get("avatar").asText() + ".png";
+ }
+ if (email == null) {
+ email = (username != null ? username : id) + "@users.noreply.discord.com";
+ }
+ return Optional.of(processUser(email, username, avatar, mode));
+ } catch (Exception e) {
+ return Optional.empty();
+ }
+ }
+
+ private User processUser(String email, String username, String avatar, com.openisle.model.RegisterMode mode) {
+ Optional existing = userRepository.findByEmail(email);
+ if (existing.isPresent()) {
+ User user = existing.get();
+ if (!user.isVerified()) {
+ user.setVerified(true);
+ user.setVerificationCode(null);
+ userRepository.save(user);
+ }
+ return user;
+ }
+ String baseUsername = username != null ? username : email.split("@")[0];
+ String finalUsername = baseUsername;
+ int suffix = 1;
+ while (userRepository.findByUsername(finalUsername).isPresent()) {
+ finalUsername = baseUsername + suffix++;
+ }
+ User user = new User();
+ user.setUsername(finalUsername);
+ user.setEmail(email);
+ user.setPassword("");
+ user.setRole(Role.USER);
+ user.setVerified(true);
+ user.setApproved(mode == com.openisle.model.RegisterMode.DIRECT);
+ if (avatar != null) {
+ user.setAvatar(avatar);
+ } else {
+ user.setAvatar("https://cdn.discordapp.com/embed/avatars/0.png");
+ }
+ return userRepository.save(user);
+ }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c101524cf..686c0ec3a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -53,6 +53,9 @@ google.client-id=${GOOGLE_CLIENT_ID:}
# GitHub OAuth configuration
github.client-id=${GITHUB_CLIENT_ID:}
github.client-secret=${GITHUB_CLIENT_SECRET:}
+# Discord OAuth configuration
+discord.client-id=${DISCORD_CLIENT_ID:}
+discord.client-secret=${DISCORD_CLIENT_SECRET:}
# Twitter OAuth configuration
twitter.client-id=${TWITTER_CLIENT_ID:}
twitter.client-secret=${TWITTER_CLIENT_SECRET:}
+
+