Skip to content

feat(oauth,oidc): support relative redirect URL #280

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

Merged
DanielleHuisman merged 1 commit into from
Jan 28, 2026
Merged

feat(oauth,oidc): support relative redirect URL #280

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
20 changes: 9 additions & 11 deletions packages/methods/shield-oauth/src/actions/sign_in.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use crate::{
#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SignInData {
pub redirect_origin: Option<Url>,
pub redirect_url: Option<Url>,
pub redirect_origin: Url,
pub redirect_url: Option<String>,
}

pub struct OauthSignInAction {
Expand Down Expand Up @@ -91,15 +91,13 @@ impl Action<OauthProvider, OauthSession> for OauthSignInAction {
let data = serde_json::from_value::<SignInData>(request.form_data)
.map_err(|err| ShieldError::Validation(err.to_string()))?;

let redirect_url = data.redirect_url.or_else(|| {
data.redirect_origin.and_then(|redirect_origin| {
redirect_origin.join(&self.options.sign_in_redirect).ok()
})
});
let redirect_url = data
.redirect_url
.map(|redirect_url| data.redirect_origin.join(&redirect_url))
.unwrap_or_else(|| data.redirect_origin.join(&self.options.sign_in_redirect))
.map_err(|err| ShieldError::Validation(format!("redirect URL parse error: {err}")))?;

if let Some(redirect_url) = &redirect_url
&& let Some(redirect_origins) = &self.options.redirect_origins
{
if let Some(redirect_origins) = &self.options.redirect_origins {
let redirect_origin = Url::parse(&redirect_url.origin().ascii_serialization())
.map_err(|err| {
ShieldError::Validation(format!("redirect origin parse error: {err}"))
Expand Down Expand Up @@ -148,7 +146,7 @@ impl Action<OauthProvider, OauthSession> for OauthSignInAction {
Ok(Response::new(ResponseType::Redirect(auth_url.to_string()))
.session_action(SessionAction::Unauthenticate)
.session_action(SessionAction::data(OauthSession {
redirect_url,
redirect_url: Some(redirect_url),
csrf: Some(csrf_token.secret().clone()),
pkce_verifier: pkce_code_challenge
.map(|(_, pkce_code_verifier)| pkce_code_verifier.secret().clone()),
Expand Down
20 changes: 9 additions & 11 deletions packages/methods/shield-oidc/src/actions/sign_in.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ use crate::{
#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SignInData {
pub redirect_origin: Option<Url>,
pub redirect_url: Option<Url>,
pub redirect_origin: Url,
pub redirect_url: Option<String>,
}

pub struct OidcSignInAction {
Expand Down Expand Up @@ -94,15 +94,13 @@ impl Action<OidcProvider, OidcSession> for OidcSignInAction {
let data = serde_json::from_value::<SignInData>(request.form_data)
.map_err(|err| ShieldError::Validation(err.to_string()))?;

let redirect_url = data.redirect_url.or_else(|| {
data.redirect_origin.and_then(|redirect_origin| {
redirect_origin.join(&self.options.sign_in_redirect).ok()
})
});
let redirect_url = data
.redirect_url
.map(|redirect_url| data.redirect_origin.join(&redirect_url))
.unwrap_or_else(|| data.redirect_origin.join(&self.options.sign_in_redirect))
.map_err(|err| ShieldError::Validation(format!("redirect URL parse error: {err}")))?;

if let Some(redirect_url) = &redirect_url
&& let Some(redirect_origins) = &self.options.redirect_origins
{
if let Some(redirect_origins) = &self.options.redirect_origins {
let redirect_origin = Url::parse(&redirect_url.origin().ascii_serialization())
.map_err(|err| {
ShieldError::Validation(format!("redirect origin parse error: {err}"))
Expand Down Expand Up @@ -153,7 +151,7 @@ impl Action<OidcProvider, OidcSession> for OidcSignInAction {
Ok(Response::new(ResponseType::Redirect(auth_url.to_string()))
.session_action(SessionAction::unauthenticate())
.session_action(SessionAction::data(OidcSession {
redirect_url,
redirect_url: Some(redirect_url),
csrf: Some(csrf_token.secret().clone()),
nonce: Some(nonce.secret().clone()),
pkce_verifier: pkce_code_challenge
Expand Down