Skip to content

Commit f7efd56

Browse files
authored
Merge pull request #76 from wafflestudio/haram
2 parents 7bf0aa6 + 0b589a5 commit f7efd56

4 files changed

Lines changed: 11 additions & 18 deletions

File tree

.env.development

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
VITE_API_URL=/api/v1
1+
VITE_API_URL=/api/v1
2+
VITE_SOCIAL_LOGIN_BASE_URL=https://hangsha-api-dev.wafflestudio.com

.github/workflows/_deploy.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,7 @@ jobs:
3535
env:
3636
VITE_GA_MEASUREMENT_ID: ${{ inputs.ga_measurement_id }}
3737
VITE_API_URL: ${{ vars.VITE_API_URL }}
38-
VITE_KAKAO_REDIRECT_URI: ${{ vars.VITE_KAKAO_REDIRECT_URI }}
39-
VITE_GOOGLE_REDIRECT_URI: ${{ vars.VITE_GOOGLE_REDIRECT_URI }}
40-
VITE_NAVER_REDIRECT_URI: ${{ vars.VITE_NAVER_REDIRECT_URI }}
41-
VITE_KAKAO_REST_API_KEY: ${{ secrets.VITE_KAKAO_REST_API_KEY }}
42-
VITE_GOOGLE_CLIENT_ID: ${{ secrets.VITE_GOOGLE_CLIENT_ID }}
43-
VITE_NAVER_CLIENT_ID: ${{ secrets.VITE_NAVER_CLIENT_ID }}
44-
VITE_REST_REQUEST_URL: ${{ secrets.VITE_REST_REQUEST_URL }}
38+
VITE_SOCIAL_LOGIN_BASE_URL: ${{ vars.VITE_SOCIAL_LOGIN_BASE_URL }}
4539

4640
- name: Deploy to S3 and Invalidate Cloudfront
4741
env:

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,7 @@ Create a `.env.development` file (one is already included) or set these variable
8888
| Variable | Description |
8989
|----------|-------------|
9090
| `VITE_API_URL` | Base path for API requests (default: `/api/v1`) |
91-
| `VITE_KAKAO_REST_API_KEY` | Kakao OAuth API key |
92-
| `VITE_GOOGLE_CLIENT_ID` | Google OAuth client ID |
93-
| `VITE_NAVER_CLIENT_ID` | Naver OAuth client ID |
94-
| `VITE_KAKAO_REDIRECT_URI` | Kakao OAuth callback URL |
95-
| `VITE_GOOGLE_REDIRECT_URI` | Google OAuth callback URL |
96-
| `VITE_NAVER_REDIRECT_URI` | Naver OAuth callback URL |
97-
| `VITE_REST_REQUEST_URL` | Production API endpoint |
91+
| `VITE_SOCIAL_LOGIN_BASE_URL` | Social OAuth authorization server base URL |
9892

9993
### Build for Production
10094

src/pages/auth/Home.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ import { useNavigate } from "react-router-dom";
33
import logo from "/assets/logo.png";
44
import styles from "@styles/Home.module.css";
55

6+
const SOCIAL_LOGIN_BASE_URL =
7+
import.meta.env.VITE_SOCIAL_LOGIN_BASE_URL ||
8+
"https://hangsha-api-dev.wafflestudio.com";
9+
610
const SOCIAL_LOGIN_ENTRY = {
7-
google: `https://hangsha-api-dev.wafflestudio.com/oauth2/authorization/google`,
8-
kakao: `https://hangsha-api-dev.wafflestudio.com/oauth2/authorization/kakao`,
9-
naver: `https://hangsha-api-dev.wafflestudio.com/oauth2/authorization/naver`,
11+
google: `${SOCIAL_LOGIN_BASE_URL}/oauth2/authorization/google`,
12+
kakao: `${SOCIAL_LOGIN_BASE_URL}/oauth2/authorization/kakao`,
13+
naver: `${SOCIAL_LOGIN_BASE_URL}/oauth2/authorization/naver`,
1014
} as const;
1115

1216
export default function Home() {

0 commit comments

Comments
 (0)