Skip to content

Commit

Permalink
Merge pull request #264 from sopt-makers/chore/#263
Browse files Browse the repository at this point in the history 
#263 [CHORE] Legacy Url 관련 코드 삭제
  • Loading branch information
@KWY0218
KWY0218 authored Jun 16, 2024
2 parents 35d3a67 + 793906c commit 2aaceef
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 77 deletions.
6 changes: 2 additions & 4 deletions operation-auth/src/main/java/org/sopt/makers/operation/config/SecurityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ private void setHttp(HttpSecurity http) throws Exception {
.anyRequest().authenticated())
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.and()
.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(jwtExceptionFilter, JwtAuthenticationFilter.class);
.addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
.addFilterBefore(jwtExceptionFilter, JwtAuthenticationFilter.class);
}

@Bean
Expand All @@ -74,8 +74,6 @@ public CorsConfigurationSource corsConfigurationSource() {

configuration.addAllowedOrigin(valueConfig.getADMIN_PROD_URL());
configuration.addAllowedOrigin(valueConfig.getADMIN_DEV_URL());
configuration.addAllowedOrigin(valueConfig.getADMIN_PROD_URL_LEGACY());
configuration.addAllowedOrigin(valueConfig.getADMIN_DEV_URL_LEGACY());
configuration.addAllowedOrigin(valueConfig.getADMIN_LOCAL_URL());
configuration.addAllowedHeader("*");
configuration.addAllowedMethod("*");
Expand Down
136 changes: 65 additions & 71 deletions operation-common/src/main/java/org/sopt/makers/operation/config/ValueConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,84 +2,78 @@

import java.util.Arrays;
import java.util.List;

import lombok.Getter;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;

import lombok.Getter;

@Configuration
@Getter
public class ValueConfig {

@Value("${sopt.alarm.message.title_end}")
private String ALARM_MESSAGE_TITLE;
@Value("${sopt.alarm.message.content_end}")
private String ALARM_MESSAGE_CONTENT;
@Value("${sopt.current.generation}")
private int GENERATION;
@Value("${admin.url.prod}")
private String ADMIN_PROD_URL;
@Value("${admin.url.dev}")
private String ADMIN_DEV_URL;
@Value("${admin.url.prod_legacy}")
private String ADMIN_PROD_URL_LEGACY;
@Value("${admin.url.dev_legacy}")
private String ADMIN_DEV_URL_LEGACY;
@Value("${admin.url.local}")
private String ADMIN_LOCAL_URL;
@Value("${notification.key}")
private String NOTIFICATION_KEY;
@Value("${notification.url}")
private String NOTIFICATION_URL;
@Value("${sopt.makers.playground.server}")
private String playGroundURI;
@Value("${sopt.makers.playground.token}")
private String playGroundToken;
@Value("${oauth.apple.key.id}")
private String appleKeyId;
@Value("${oauth.apple.key.path}")
private String appleKeyPath;
@Value("${oauth.apple.team.id}")
private String appleTeamId;
@Value("${oauth.apple.aud}")
private String appleAud;
@Value("${oauth.apple.sub}")
private String appleSub;
@Value("${oauth.google.client.id}")
private String googleClientId;
@Value("${oauth.google.client.secret}")
private String googleClientSecret;
@Value("${oauth.google.redirect.url}")
private String googleRedirectUrl;
@Value("${spring.jwt.secretKey.platform_code}")
private String platformCodeSecretKey;
@Value("${sopt.alarm.message.title_end}")
private String ALARM_MESSAGE_TITLE;
@Value("${sopt.alarm.message.content_end}")
private String ALARM_MESSAGE_CONTENT;
@Value("${sopt.current.generation}")
private int GENERATION;
@Value("${admin.url.prod}")
private String ADMIN_PROD_URL;
@Value("${admin.url.dev}")
private String ADMIN_DEV_URL;
@Value("${admin.url.local}")
private String ADMIN_LOCAL_URL;
@Value("${notification.key}")
private String NOTIFICATION_KEY;
@Value("${notification.url}")
private String NOTIFICATION_URL;
@Value("${sopt.makers.playground.server}")
private String playGroundURI;
@Value("${sopt.makers.playground.token}")
private String playGroundToken;
@Value("${oauth.apple.key.id}")
private String appleKeyId;
@Value("${oauth.apple.key.path}")
private String appleKeyPath;
@Value("${oauth.apple.team.id}")
private String appleTeamId;
@Value("${oauth.apple.aud}")
private String appleAud;
@Value("${oauth.apple.sub}")
private String appleSub;
@Value("${oauth.google.client.id}")
private String googleClientId;
@Value("${oauth.google.client.secret}")
private String googleClientSecret;
@Value("${oauth.google.redirect.url}")
private String googleRedirectUrl;
@Value("${spring.jwt.secretKey.platform_code}")
private String platformCodeSecretKey;

private final int SUB_LECTURE_MAX_ROUND = 2;
private final int MAX_LECTURE_COUNT = 2;
private final String ETC_MESSAGE = "출석 점수가 반영되지 않아요.";
private final String SEMINAR_MESSAGE = "";
private final String EVENT_MESSAGE = "행사도 참여하고, 출석점수도 받고, 일석이조!";
private final String SWAGGER_URI = "/swagger-ui/**";
private final int ATTENDANCE_MINUTE = 10;
private final int MIN_SCHEDULE_DURATION = 1;
private final int MAX_SCHEDULE_DURATION = 50;
private final int DAY_DURATION = 1;
private final int TWO_DAYS_DURATION = 2;
private final int HACKATHON_LECTURE_START_HOUR = 16;
private final int SUB_LECTURE_MAX_ROUND = 2;
private final int MAX_LECTURE_COUNT = 2;
private final String ETC_MESSAGE = "출석 점수가 반영되지 않아요.";
private final String SEMINAR_MESSAGE = "";
private final String EVENT_MESSAGE = "행사도 참여하고, 출석점수도 받고, 일석이조!";
private final String SWAGGER_URI = "/swagger-ui/**";
private final int ATTENDANCE_MINUTE = 10;
private final int MIN_SCHEDULE_DURATION = 1;
private final int MAX_SCHEDULE_DURATION = 50;
private final int DAY_DURATION = 1;
private final int TWO_DAYS_DURATION = 2;
private final int HACKATHON_LECTURE_START_HOUR = 16;

private final List<String> APP_LINK_LIST = Arrays.asList(
"home",
"home/notification",
"home/mypage",
"home/attendance",
"home/attendance/attendance-modal",
"home/soptamp",
"home/soptamp/entire-ranking",
"home/soptamp/current-generation-ranking"
);
private final List<String> WEB_LINK_LIST = Arrays.asList(
"https://playground.sopt.org/members",
"https://playground.sopt.org/group"
);
private final List<String> APP_LINK_LIST = Arrays.asList(
"home",
"home/notification",
"home/mypage",
"home/attendance",
"home/attendance/attendance-modal",
"home/soptamp",
"home/soptamp/entire-ranking",
"home/soptamp/current-generation-ranking"
);
private final List<String> WEB_LINK_LIST = Arrays.asList(
"https://playground.sopt.org/members",
"https://playground.sopt.org/group"
);
}
6 changes: 4 additions & 2 deletions operation-domain/src/main/java/org/sopt/makers/operation/auth/domain/TeamOAuthInfo.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package org.sopt.makers.operation.auth.domain;

import static jakarta.persistence.GenerationType.IDENTITY;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;

import static jakarta.persistence.GenerationType.IDENTITY;
import jakarta.persistence.Table;

@Entity
@Table(name = "team_oauth_info")
public class TeamOAuthInfo {

@Id
Expand Down

0 comments on commit 2aaceef

Please sign in to comment.