Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.teamEWSN.gitdeun.common.oauth.dto;

import com.teamEWSN.gitdeun.common.oauth.entity.OauthProvider;
import lombok.AllArgsConstructor;
import lombok.Getter;

import java.util.List;

@Getter
@AllArgsConstructor
public class SocialConnectionResponseDto {
private List<OauthProvider> connectedProviders;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.teamEWSN.gitdeun.common.cookie.CookieUtil;
import com.teamEWSN.gitdeun.common.jwt.CustomUserDetails;
import com.teamEWSN.gitdeun.common.jwt.JwtToken;
import com.teamEWSN.gitdeun.common.oauth.dto.SocialConnectionResponseDto;
import com.teamEWSN.gitdeun.common.oauth.entity.OauthProvider;
import com.teamEWSN.gitdeun.common.oauth.service.OAuthStateService;
import com.teamEWSN.gitdeun.common.oauth.service.SocialTokenRefreshService;
Expand Down Expand Up @@ -78,4 +79,14 @@ public ResponseEntity<Void> refreshSocial(
socialTokenRefreshService.refreshSocialToken(user.getId(), provider);
return ResponseEntity.noContent().build();
}

// socialconnection 확인용
@GetMapping("/social")
public ResponseEntity<SocialConnectionResponseDto> getSocialConnections(
@AuthenticationPrincipal CustomUserDetails user
) {
SocialConnectionResponseDto response = authService.getConnectedProviders(user.getId());
return ResponseEntity.ok(response);
}

}
17 changes: 17 additions & 0 deletions src/main/java/com/teamEWSN/gitdeun/user/service/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.teamEWSN.gitdeun.common.exception.GlobalException;
import com.teamEWSN.gitdeun.common.cookie.CookieUtil;
import com.teamEWSN.gitdeun.common.jwt.*;
import com.teamEWSN.gitdeun.common.oauth.dto.SocialConnectionResponseDto;
import com.teamEWSN.gitdeun.common.oauth.entity.OauthProvider;
import com.teamEWSN.gitdeun.common.oauth.entity.SocialConnection;
import com.teamEWSN.gitdeun.common.oauth.repository.SocialConnectionRepository;
Expand All @@ -20,7 +21,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;


@Slf4j
Expand Down Expand Up @@ -106,4 +109,18 @@ public void connectGithubAccount(OAuth2User githubUser, Long userId) {
socialConnectionRepository.save(connection);
}

// 사용자의 모든 소셜 연동 정보를 조회
@Transactional(readOnly = true)
public SocialConnectionResponseDto getConnectedProviders(Long userId) {
// userId로 사용자를 조회
User user = userService.findById(userId);

// 사용자의 SocialConnection 리스트에서 Provider 정보만 추출하여 리스트 생성
List<OauthProvider> providers = user.getSocialConnections().stream()
.map(SocialConnection::getProvider)
.collect(Collectors.toList());

// DTO에 담아 반환 변환
return new SocialConnectionResponseDto(providers);
}
}
2 changes: 1 addition & 1 deletion src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spring:
github:
client-id: ${GITHUB_DEV_CLIENT_ID}
client-secret: ${GITHUB_DEV_CLIENT_SECRET}
redirect-uri: http://localhost:8080/api/auth/github/callback
redirect-uri: http://localhost:8080/login/oauth2/code/github
# provider:
# google:
# authorization-uri: https://accounts.google.com/o/oauth2/v2/auth
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spring:
github:
client-id: ${GITHUB_PROD_CLIENT_ID}
client-secret: ${GITHUB_PROD_CLIENT_SECRET}
redirect-uri: https://api.gitdeun.site/api/auth/github/callback
redirect-uri: https://api.gitdeun.site/login/oauth2/code/github


jwt:
Expand Down