Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 🎸 修复页面跳转问题 #759

Merged
merged 1 commit into from
Apr 12, 2022
Merged

feat: 🎸 修复页面跳转问题 #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion djangosaml2idp/mxins/LoginRequiredMixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def dispatch(self, request, tenant_uuid, app_id, *args, **kwargs):
return super().dispatch(request, tenant_uuid, app_id, *args, **kwargs)
except Exception as err: # pylint: disable=broad-except
logger.debug(err)
next = f"{get_app_config().get_host()}{request.path}?{'&'.join([f'{k}={request.GET[k]}'for k in request.GET.keys()])}"
next = f"{request.path}?{'&'.join([f'{k}={request.GET[k]}'for k in request.GET.keys()])}"

if next.endswith("?"):
# 如无参数 则去掉？
Expand Down
4 changes: 1 addition & 3 deletions djangosaml2idp/views/FakeLoginView.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ def get(self, request, tenant_uuid, app_id): # pylint: disable=no-self-use
next = request.GET.get("next",None)
if request.GET.get("token",None):
token = request.GET.get("token")
params=[f'{k}={request.GET[k]}' for k in request.GET.keys() if k != "token" ]
return redirect(f"{next}&spauthn={token}")

params=[f'{k}={request.GET[k]}' for k in request.GET.keys() ]
login_url = f"{get_app_config().get_frontend_host()}/login?tenant={str(tenant_uuid).replace('-','')}&next={next}"
login_url = f"/login?tenant={str(tenant_uuid).replace('-','')}&next={next}"
# login_url = urllib.parse.quote(login_url)
return render(request, 'djangosaml2idp/fake_login.html', context={'login_url': login_url, "next": next})
8 changes: 4 additions & 4 deletions extension_root/saml2idp/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ def create(self, app: App, data: Dict) -> Dict: # pylint: disable=arguments-dif
os.remove(
BASEDIR + '/djangosaml2idp/saml2_config/sp_cert/%s.pem' % filename)

app.url = f'{get_app_config().get_host()}{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'
app.url = f'{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'

if data.get("sso_url", None) in ["", None]:
data["sso_url"] = f'{get_app_config().get_host()}{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'
data["sso_url"] = f'{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'

return data

Expand Down Expand Up @@ -180,9 +180,9 @@ def update(self, app: App, data: Dict) -> Dict: # pylint: disable=arguments-dif
os.remove(
BASEDIR + '/djangosaml2idp/saml2_config/sp_cert/%s.pem' % filename)

app.url = f'{get_app_config().get_host()}{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'
app.url = f'{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'
if data.get("sso_url", None) in ["", None]:
data["sso_url"] = f'{get_app_config().get_host()}{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'
data["sso_url"] = f'{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'
return data

def delete(self):
Expand Down
8 changes: 4 additions & 4 deletions extension_root/saml2idp_aliyun_ram/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ def create(self, app: App, data: Dict) -> Dict: # pylint: disable=arguments-dif
os.remove(
BASEDIR + '/djangosaml2idp/saml2_config/sp_cert/%s.pem' % filename)

app.url = f'{get_app_config().get_host()}{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'
app.url = f'{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'

if data.get("sso_url", None) in ["", None]:
data["sso_url"] = f'{get_app_config().get_host()}{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'
data["sso_url"] = f'{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'

return data

Expand Down Expand Up @@ -180,9 +180,9 @@ def update(self, app: App, data: Dict) -> Dict: # pylint: disable=arguments-dif
os.remove(
BASEDIR + '/djangosaml2idp/saml2_config/sp_cert/%s.pem' % filename)

app.url = f'{get_app_config().get_host()}{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'
app.url = f'{reverse("api:saml2idp:saml_sso_hook",args=(app.tenant.uuid,app.id))}?spauthn='+'{token}'
if data.get("sso_url", None) in ["", None]:
data["sso_url"] = f'{get_app_config().get_host()}{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'
data["sso_url"] = f'{reverse("api:saml2idp:sso_init",args=(app.tenant.uuid,app.id))}'
return data

def delete(self):
Expand Down