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
7 changes: 3 additions & 4 deletions services/verify/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import fastapi
from fastapi import Request, Response
from starlette.responses import RedirectResponse

import verify
import send
Expand All @@ -23,8 +24,6 @@
inter_router = None
public_router = None

def redirect(url):
print("You redirected to:",url)

def init(ri: fastapi.APIRouter, rp: fastapi.APIRouter):
global inter_router
Expand Down Expand Up @@ -127,7 +126,7 @@ def verifyOutsideCode():
else:
redirectURI = "ERROR: Invalid Verification Link"

return redirect(redirectURI)
return RedirectResponse(redirectURI)


def verifyInsideCode():
Expand Down Expand Up @@ -158,4 +157,4 @@ def verifyInsideCode():

if __name__ == "__main__":
init(fastapi.APIRouter())
router.run("localhost", 5003)
# router.run("localhost", 5003)
8 changes: 4 additions & 4 deletions services/verify/send.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
def sendEmail(target, uri):
def sendEmail(target, code):
"""
发送验证邮件
"""
Expand Down Expand Up @@ -128,13 +128,13 @@ def sendEmail(target, uri):

您正在进行邮箱验证,请点击以下链接完成验证:
<div id="verificationCode">
<a href="{}"><button class="button">验证邮箱</button></a>
<a href="https://api.openteens.org/userVerify?code={}"><button class="button">验证邮箱</button></a>
</div>
若不是您在操作,请忽略此邮件。
<div id="content_bottom">
<small>
如果您无法点击以上链接,请将此链接复制到浏览器地址栏中访问。
<a href="{}">{}</a>
<a href="https://api.openteens.org/userVerify?code={}">https://api.openteens.org/userVerify?code={}</a>
</small>
</div>
</div>
Expand All @@ -156,6 +156,6 @@ def sendEmail(target, uri):
title = "OpenTeens 邮箱验证"
from_ = "OpenTeens <noreply@openteens.org>"
to = target
content = template.format(uri, uri, uri)
content = template.format(code, code, code)