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
Expand Up @@ -10,7 +10,6 @@
import org.fontory.fontorybe.authentication.adapter.inbound.annotation.Login;
import org.fontory.fontorybe.authentication.application.AuthService;
import org.fontory.fontorybe.authentication.domain.UserPrincipal;
import org.fontory.fontorybe.authentication.domain.exception.AuthenticationRequiredException;
import org.fontory.fontorybe.file.application.port.CloudStorageService;
import org.fontory.fontorybe.file.application.port.FileService;
import org.fontory.fontorybe.file.domain.FileUploadResult;
Expand All @@ -21,6 +20,7 @@
import org.fontory.fontorybe.member.controller.port.MemberLookupService;
import org.fontory.fontorybe.member.controller.port.MemberUpdateService;
import org.fontory.fontorybe.member.domain.Member;
import org.fontory.fontorybe.member.domain.exception.MemberNotFoundException;
import org.fontory.fontorybe.member.infrastructure.entity.MemberStatus;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -51,13 +51,18 @@ public class ProfileController {
)
@GetMapping
public ResponseEntity<MyProfileResponse> getMyProfile(
@Login UserPrincipal me) {
@Login(required = false) UserPrincipal me) {
if (me == null) {
log.info("Request received: getMyInfo - no login");
throw new MemberNotFoundException();
}
Long requestMemberId = me.getId();
log.info("Request received: getMyInfo member ID: {}", requestMemberId);

Member lookupMember = memberLookupService.getOrThrowById(requestMemberId);
if (lookupMember.getStatus().equals(MemberStatus.ONBOARDING)) {
throw new AuthenticationRequiredException();
log.info("Request received: getMyInfo - member is onboarding");
throw new MemberNotFoundException();
}
String fileUrl = cloudStorageService.getProfileImageUrl(lookupMember.getProfileImageKey());
log.info("ProfileImageUrl generated : {}", fileUrl);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-prod.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
spring.jpa.hibernate.ddl-auto=create
spring.jpa.hibernate.ddl-auto=update

cookies.domain=.fontory.co.kr
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ api.server.url=http://localhost:8080

spring.config.import=optional:classpath:application-infrastructure.properties
url.base=http://localhost
url.path.signup=/signup
url.path.signup=/signup/step-one
url.path.auth=
url.cdn=https://cdn.fontory.co.kr

Expand Down
Loading