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 @@ -45,7 +45,7 @@ public RedirectView installApp(
@RequestParam String state
){
Long teamId = slackCommandService.installApp(code, state);
String URL = "http://localhost:5173/slack/complete?teamId="+teamId;
String URL = "https://web.vecoservice.shop/slack/complete?teamId="+teamId;
return new RedirectView(URL);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public WorkspaceResponseDTO.CreateWorkspaceResponseDto createWorkspace(Member me
String slug = slugGenerator.generate(request.getWorkspaceName());
String token = inviteTokenGenerator.generate();
String invitePassword = invitePasswordGenerator.generate();
String workspaceUrl = "https://veco-eight.vercel.app/" + slug;
String workspaceUrl = "https://web.vecoservice.shop/" + slug;
String inviteUrl = workspaceUrl + "/invite?token=" + token;

// 4. 워크스페이스 생성
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.example.Veco.domain.workspace.service;

import com.example.Veco.domain.mapping.entity.MemberTeam;
import com.example.Veco.domain.mapping.repository.MemberTeamRepository;
import com.example.Veco.domain.member.entity.Member;
import com.example.Veco.domain.member.repository.MemberRepository;
Expand All @@ -9,17 +8,14 @@
import com.example.Veco.domain.team.repository.TeamRepository;
import com.example.Veco.domain.workspace.converter.WorkspaceConverter;
import com.example.Veco.domain.workspace.dto.TeamMemberCountDto;
import com.example.Veco.domain.workspace.dto.WorkspaceRequestDTO;
import com.example.Veco.domain.workspace.dto.WorkspaceResponseDTO;
import com.example.Veco.domain.workspace.entity.WorkSpace;
import com.example.Veco.domain.workspace.error.WorkspaceErrorStatus;
import com.example.Veco.domain.workspace.error.WorkspaceHandler;
import com.example.Veco.domain.workspace.repository.WorkspaceQueryDslRepository;
import com.example.Veco.domain.workspace.repository.WorkspaceRepository;
import com.example.Veco.domain.workspace.util.SlugGenerator;
import com.example.Veco.global.apiPayload.exception.VecoException;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -101,6 +97,6 @@ public List<WorkspaceResponseDTO.WorkspaceMemberWithTeamsDto> getWorkspaceMember
public String createPreviewUrl(String workspaceName) {
String slug = slugGenerator.generate(workspaceName);

return "https://veco-eight.vercel.app/" + slug ;
return "https://web.vecoservice.shop/" + slug ;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void onAuthenticationSuccess(
memberCommandService.saveMember(member);

// 로딩 화면으로 리다이렉트
redirectURL = UriComponentsBuilder.fromUriString("http://localhost:5173/onboarding/loading")
redirectURL = UriComponentsBuilder.fromUriString("https://web.vecoservice.shop/onboarding/loading")
.build()
.encode(StandardCharsets.UTF_8)
.toUriString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,21 @@ protected SecurityFilterChain configure(HttpSecurity http) throws Exception {
.httpBasic(AbstractHttpConfigurer::disable)
.formLogin(AbstractHttpConfigurer::disable)
.addFilterBefore(jwtAuthFilter(), UsernamePasswordAuthenticationFilter.class)
.logout(logout -> logout.logoutSuccessUrl("http://localhost:5173/onboarding"))
.logout(logout -> logout.logoutSuccessUrl("https://web.vecoservice.shop/onboarding"))
.sessionManagement(session -> session
.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
.oauth2Login(oauth2 -> oauth2
.authorizationEndpoint(config -> config
.authorizationRequestRepository(new HttpSessionOAuth2AuthorizationRequestRepository())
.authorizationRequestResolver(customAuthorizationRequestResolver)
)
.loginPage("http://localhost:5173/onboarding")
.loginPage("https://web.vecoservice.shop/onboarding")
.successHandler(oAuth2SuccessHandler)
.userInfoEndpoint(userInfo -> userInfo.userService(customOAuth2UserService))
.failureHandler((request, response, exception) -> {
// 로그인 실패 시 처리 로직
log.error("OAuth2 로그인 실패: {}", exception.getMessage());
response.sendRedirect("http://localhost:5173/onboarding");
response.sendRedirect("https://web.vecoservice.shop/onboarding");
})
);
return http.build();
Expand Down