medical-kiban commited on
Commit
a294a67
ยท
1 Parent(s): bf73759

no message

Browse files
Files changed (1) hide show
  1. app/app.py +18 -8
app/app.py CHANGED
@@ -39,12 +39,12 @@ if not os.path.exists(credentials_path):
39
  else:
40
  print("๊ฒฝ๊ณ : .env ํŒŒ์ผ์— 'GOOGLE_CREDENTIALS_JSON' ๋ณ€์ˆ˜๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค.")
41
 
42
- # if not os.path.exists(token_path):
43
- # print(f"'{token_path}' ํŒŒ์ผ์ด ์—†์–ด ์ƒˆ๋กœ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.")
44
- # token_str = os.getenv('GOOGLE_TOKEN_JSON')
45
- # if token_str:
46
- # with open(token_path, 'w', encoding='utf-8') as f:
47
- # f.write(token_str)
48
 
49
 
50
  CREDENTIALS_FILENAME = credentials_path
@@ -101,26 +101,34 @@ def get_oauth_credentials():
101
  - token.json์ด ์žˆ์œผ๋ฉด ์‚ฌ์šฉํ•˜๊ณ , ์—†๊ฑฐ๋‚˜ ๋งŒ๋ฃŒ๋˜์—ˆ์œผ๋ฉด ์ƒˆ๋กœ ์ธ์ฆํ•ฉ๋‹ˆ๋‹ค.
102
  """
103
  creds = None
 
104
  # token.json ํŒŒ์ผ์ด ์ด๋ฏธ ์กด์žฌํ•˜๋ฉด, ์ €์žฅ๋œ ์ธ์ฆ ์ •๋ณด๋ฅผ ๋ถˆ๋Ÿฌ์˜ต๋‹ˆ๋‹ค.
105
  if os.path.exists(TOKEN_FILENAME):
 
106
  creds = Credentials.from_authorized_user_file(TOKEN_FILENAME, SCOPES)
107
-
108
  # ์ธ์ฆ ์ •๋ณด๊ฐ€ ์—†๊ฑฐ๋‚˜ ์œ ํšจํ•˜์ง€ ์•Š์œผ๋ฉด, ์‚ฌ์šฉ์ž์—๊ฒŒ ๋กœ๊ทธ์ธ์„ ์š”์ฒญํ•ฉ๋‹ˆ๋‹ค.
109
  if not creds or not creds.valid:
 
110
  if creds and creds.expired and creds.refresh_token:
 
111
  # ํ† ํฐ์ด ๋งŒ๋ฃŒ๋˜์—ˆ์œผ๋ฉด, ๋ฆฌํ”„๋ ˆ์‹œ ํ† ํฐ์„ ์‚ฌ์šฉํ•ด ๊ฐฑ์‹ ํ•ฉ๋‹ˆ๋‹ค.
112
  creds.refresh(GoogleRequest())
113
  else:
 
114
  # ํ† ํฐ์ด ์—†์œผ๋ฉด, credentials.json์„ ์ด์šฉํ•ด ์ƒˆ๋กœ์šด ์ธ์ฆ ์ ˆ์ฐจ๋ฅผ ์‹œ์ž‘ํ•ฉ๋‹ˆ๋‹ค.
115
  flow = InstalledAppFlow.from_client_secrets_file(
116
  CREDENTIALS_FILENAME, SCOPES)
 
117
  # ์„œ๋ฒ„ ํ™˜๊ฒฝ์„ ์œ„ํ•ด ๋กœ์ปฌ ์„œ๋ฒ„ ๋Œ€์‹  ์ฝ˜์†” ๊ธฐ๋ฐ˜ ์ธ์ฆ์„ ์‹คํ–‰ํ•ฉ๋‹ˆ๋‹ค.
118
  creds = flow.run_console()
119
 
120
  # ๋‹ค์Œ ์‹คํ–‰์„ ์œ„ํ•ด ์ƒˆ๋กœ ๋ฐœ๊ธ‰๋ฐ›๊ฑฐ๋‚˜ ๊ฐฑ์‹ ๋œ ์ธ์ฆ ์ •๋ณด๋ฅผ token.json ํŒŒ์ผ์— ์ €์žฅํ•ฉ๋‹ˆ๋‹ค.
 
121
  with open(TOKEN_FILENAME, 'w') as token:
 
122
  token.write(creds.to_json())
123
-
124
  return creds
125
 
126
 
@@ -368,3 +376,5 @@ async def handle_chatwork_webhook(
368
 
369
  # Chatwork์— ์„ฑ๊ณต์ ์œผ๋กœ ์ˆ˜์‹ ํ–ˆ์Œ์„ ์•Œ๋ฆผ
370
  return {"status": "success"}
 
 
 
39
  else:
40
  print("๊ฒฝ๊ณ : .env ํŒŒ์ผ์— 'GOOGLE_CREDENTIALS_JSON' ๋ณ€์ˆ˜๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค.")
41
 
42
+ if not os.path.exists(token_path):
43
+ print(f"'{token_path}' ํŒŒ์ผ์ด ์—†์–ด ์ƒˆ๋กœ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.")
44
+ token_str = os.getenv('GOOGLE_TOKEN_JSON')
45
+ if token_str:
46
+ with open(token_path, 'w', encoding='utf-8') as f:
47
+ f.write(token_str)
48
 
49
 
50
  CREDENTIALS_FILENAME = credentials_path
 
101
  - token.json์ด ์žˆ์œผ๋ฉด ์‚ฌ์šฉํ•˜๊ณ , ์—†๊ฑฐ๋‚˜ ๋งŒ๋ฃŒ๋˜์—ˆ์œผ๋ฉด ์ƒˆ๋กœ ์ธ์ฆํ•ฉ๋‹ˆ๋‹ค.
102
  """
103
  creds = None
104
+ print(f"log1")
105
  # token.json ํŒŒ์ผ์ด ์ด๋ฏธ ์กด์žฌํ•˜๋ฉด, ์ €์žฅ๋œ ์ธ์ฆ ์ •๋ณด๋ฅผ ๋ถˆ๋Ÿฌ์˜ต๋‹ˆ๋‹ค.
106
  if os.path.exists(TOKEN_FILENAME):
107
+ print(f"log2")
108
  creds = Credentials.from_authorized_user_file(TOKEN_FILENAME, SCOPES)
109
+ print(f"log3")
110
  # ์ธ์ฆ ์ •๋ณด๊ฐ€ ์—†๊ฑฐ๋‚˜ ์œ ํšจํ•˜์ง€ ์•Š์œผ๋ฉด, ์‚ฌ์šฉ์ž์—๊ฒŒ ๋กœ๊ทธ์ธ์„ ์š”์ฒญํ•ฉ๋‹ˆ๋‹ค.
111
  if not creds or not creds.valid:
112
+ print(f"log4")
113
  if creds and creds.expired and creds.refresh_token:
114
+ print(f"log5")
115
  # ํ† ํฐ์ด ๋งŒ๋ฃŒ๋˜์—ˆ์œผ๋ฉด, ๋ฆฌํ”„๋ ˆ์‹œ ํ† ํฐ์„ ์‚ฌ์šฉํ•ด ๊ฐฑ์‹ ํ•ฉ๋‹ˆ๋‹ค.
116
  creds.refresh(GoogleRequest())
117
  else:
118
+ print(f"log6")
119
  # ํ† ํฐ์ด ์—†์œผ๋ฉด, credentials.json์„ ์ด์šฉํ•ด ์ƒˆ๋กœ์šด ์ธ์ฆ ์ ˆ์ฐจ๋ฅผ ์‹œ์ž‘ํ•ฉ๋‹ˆ๋‹ค.
120
  flow = InstalledAppFlow.from_client_secrets_file(
121
  CREDENTIALS_FILENAME, SCOPES)
122
+ print(f"log7")
123
  # ์„œ๋ฒ„ ํ™˜๊ฒฝ์„ ์œ„ํ•ด ๋กœ์ปฌ ์„œ๋ฒ„ ๋Œ€์‹  ์ฝ˜์†” ๊ธฐ๋ฐ˜ ์ธ์ฆ์„ ์‹คํ–‰ํ•ฉ๋‹ˆ๋‹ค.
124
  creds = flow.run_console()
125
 
126
  # ๋‹ค์Œ ์‹คํ–‰์„ ์œ„ํ•ด ์ƒˆ๋กœ ๋ฐœ๊ธ‰๋ฐ›๊ฑฐ๋‚˜ ๊ฐฑ์‹ ๋œ ์ธ์ฆ ์ •๋ณด๋ฅผ token.json ํŒŒ์ผ์— ์ €์žฅํ•ฉ๋‹ˆ๋‹ค.
127
+ print(f"log8")
128
  with open(TOKEN_FILENAME, 'w') as token:
129
+ print(f"log9")
130
  token.write(creds.to_json())
131
+ print(f"log10")
132
  return creds
133
 
134
 
 
376
 
377
  # Chatwork์— ์„ฑ๊ณต์ ์œผ๋กœ ์ˆ˜์‹ ํ–ˆ์Œ์„ ์•Œ๋ฆผ
378
  return {"status": "success"}
379
+
380
+ get_oauth_credentials()