Skip to content

Commit 51db7db

Browse files
authored
Merge pull request #32 from IEEECS-VIT/aryan
config changes for deployment
2 parents 65d5b52 + 751e387 commit 51db7db

File tree

5 files changed

+14
-160
lines changed

5 files changed

+14
-160
lines changed

config.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
from firebase_admin import credentials
44
import os
55
from dotenv import load_dotenv
6+
import json
7+
import base64
8+
69
load_dotenv()
710

811
def initialize():
@@ -31,8 +34,13 @@ def initialize():
3134
interview_table = dynamodb.Table("enrollments-site-interview")
3235

3336
if not firebase_admin._apps:
34-
cred = credentials.Certificate("./serviceAccountKey.json")
35-
firebase_app = firebase_admin.initialize_app(cred)
37+
encoded_key = os.getenv("FIREBASE_SERVICE_ACCOUNT_KEY")
38+
if encoded_key:
39+
decoded_key = json.loads(base64.b64decode(encoded_key).decode('utf-8'))
40+
cred = credentials.Certificate(decoded_key)
41+
firebase_app = firebase_admin.initialize_app(cred)
42+
else:
43+
raise ValueError("FIREBASE_SERVICE_ACCOUNT_KEY is not set")
3644
else:
3745
firebase_app = firebase_admin.get_app()
3846

main.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
from routes.user import user
55
from routes.answer import ans_app
66
from routes.slots import slot_app
7-
#from routes.quiz_progress import quiz_app
8-
from routes.quiz_status import quiz_status
97
from config import initialize
108

119
resources = initialize()
@@ -33,9 +31,4 @@
3331
app.mount("/user", user)
3432
app.mount("/domain", domain_app)
3533
app.mount("/answer", ans_app)
36-
app.mount("/slots", slot_app)
37-
#app.mount("/quiz", quiz_app)
38-
app.mount("/quiz-status", quiz_status)
39-
@app.get("/ping")
40-
async def ping():
41-
return {"message": "pong"}
34+
app.mount("/slots", slot_app)

routes/domain.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ async def post_domain(domain: Dict[str, List[str]], id_token: str = Depends(get_
3939
raise HTTPException(status_code=400, content=f"Error: {str(e)}")
4040

4141
@domain_app.get('/questions')
42-
async def get_qs(domain: str, round: str):
42+
async def get_qs(domain: str, round: str, id_token: str = Depends(get_access_token)):
4343
try:
44+
decoded_token = auth.verify_id_token(id_token, app=resources['firebase_app'])
45+
email = decoded_token.get('email')
4446
response = quiz_table.get_item(Key={'qid': domain})
4547
field = response.get('Item')
4648
if not field:

routes/quiz_progress.py

Lines changed: 0 additions & 50 deletions
This file was deleted.

routes/quiz_status.py

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)