feat: add action call response (#160)

Author: DanielleHuisman

examples/axum/src/main.rs

@@ -43,7 +43,7 @@ async fn main() {
             )
             .client_secret("xcpQsaGbRILTljPtX4npjmYMBjKrariJ")
             .redirect_url(format!(
-                "http://localhost:{}/api/auth/sign-in/callback/oidc/keycloak",
+                "http://localhost:{}/api/auth/oidc/sign-in-callback/keycloak",
                 addr.port()
             ))
             .build()]),

examples/dioxus-axum/src/main.rs

@@ -32,8 +32,8 @@ async fn main() {
     use tracing::{Level, info};
 
     // Initialize Dioxus
-    let addr = fullstack_address_or_localhost();
     dioxus::logger::init(Level::DEBUG).unwrap();
+    let addr = fullstack_address_or_localhost();
 
     // Initialize sessions
     let session_store = MemoryStore::default();
@@ -53,8 +53,10 @@ async fn main() {
             )
             .client_secret("xcpQsaGbRILTljPtX4npjmYMBjKrariJ")
             .redirect_url(format!(
-                "http://localhost:{}/api/auth/sign-in/callback/oidc/keycloak",
-                addr.port()
+                "http://localhost:{}/api/auth/oidc/sign-in-callback/keycloak",
+                dioxus::cli_config::devserver_raw_addr()
+                    .map(|addr| addr.port())
+                    .unwrap_or_else(|| addr.port())
             ))
             .build()]),
         )],

examples/leptos-actix/Cargo.toml

@@ -16,6 +16,8 @@ bin-default-features = false
 lib-features = ["hydrate"]
 lib-default-features = false
 
+site-addr = "127.0.0.1:8080"
+
 [lib]
 crate-type = ["cdylib", "rlib"]
 

examples/leptos-axum/Cargo.toml

@@ -16,6 +16,8 @@ bin-default-features = false
 lib-features = ["hydrate"]
 lib-default-features = false
 
+site-addr = "127.0.0.1:8080"
+
 [lib]
 crate-type = ["cdylib", "rlib"]
 

examples/leptos-axum/src/main.rs

@@ -51,7 +51,7 @@ async fn main() {
             )
             .client_secret("xcpQsaGbRILTljPtX4npjmYMBjKrariJ")
             .redirect_url(format!(
-                "http://localhost:{}/api/auth/sign-in/callback/oidc/keycloak",
+                "http://localhost:{}/api/auth/oidc/sign-in-callback/keycloak",
                 addr.port()
             ))
             .build()]),

keycloak/Shield-realm.json

@@ -612,14 +612,14 @@
             "description": "",
             "rootUrl": "",
             "adminUrl": "",
-            "baseUrl": "http://localhost:3000",
+            "baseUrl": "http://localhost:8080",
             "surrogateAuthRequired": false,
             "enabled": true,
             "alwaysDisplayInConsole": false,
             "clientAuthenticatorType": "client-secret",
             "secret": "xcpQsaGbRILTljPtX4npjmYMBjKrariJ",
-            "redirectUris": ["http://localhost:3000/api/auth/sign-in/callback/oidc/keycloak"],
-            "webOrigins": ["http://localhost:3000"],
+            "redirectUris": ["http://localhost:8080/api/auth/oidc/sign-in-callback/keycloak"],
+            "webOrigins": ["http://localhost:8080"],
             "notBefore": 0,
             "bearerOnly": false,
             "consentRequired": false,

packages/core/shield/src/actions/sign_in_callback.rs

@@ -15,6 +15,6 @@ impl SignInCallbackAction {
     }
 
     pub fn condition<P: Provider>(_provider: &P, _session: Session) -> Result<bool, ShieldError> {
-        Ok(false)
+        Ok(true)
     }
 }

packages/core/shield/src/response.rs

@@ -1,4 +1,6 @@
-#[derive(Clone, Debug)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum Response {
     // TODO: Remove temporary default variant.
     Default,

packages/core/shield/src/shield.rs

@@ -4,9 +4,15 @@ use futures::future::try_join_all;
 use tracing::warn;
 
 use crate::{
-    ActionError, ActionProviderForm, MethodError, ProviderError, Request, action::ActionForms,
-    error::ShieldError, method::ErasedMethod, options::ShieldOptions, session::Session,
-    storage::Storage, user::User,
+    action::{ActionForms, ActionProviderForm},
+    error::{ActionError, MethodError, ProviderError, ShieldError},
+    method::ErasedMethod,
+    options::ShieldOptions,
+    request::Request,
+    response::Response,
+    session::Session,
+    storage::Storage,
+    user::User,
 };
 
 #[derive(Clone)]
@@ -121,7 +127,7 @@ impl<U: User> Shield<U> {
         provider_id: Option<&str>,
         session: Session,
         request: Request,
-    ) -> Result<(), ShieldError> {
+    ) -> Result<Response, ShieldError> {
         let method =
             self.method_by_id(method_id)
                 .ok_or(ShieldError::Method(MethodError::NotFound(
@@ -142,9 +148,12 @@ impl<U: User> Shield<U> {
                     provider_id.map(ToOwned::to_owned),
                 )))?;
 
-        action.erased_call(provider, session, request).await?;
+        let response = action.erased_call(provider, session.clone(), request).await;
 
-        Ok(())
+        // TODO: Should update always be called?
+        session.update().await?;
+
+        response
     }
 }
 

packages/core/shield/src/shield_dyn.rs

@@ -3,8 +3,8 @@ use std::{any::Any, sync::Arc};
 use async_trait::async_trait;
 
 use crate::{
-    action::ActionForms, error::ShieldError, request::Request, session::Session, shield::Shield,
-    user::User,
+    action::ActionForms, error::ShieldError, request::Request, response::Response,
+    session::Session, shield::Shield, user::User,
 };
 
 #[async_trait]
@@ -24,7 +24,7 @@ pub trait DynShield: Send + Sync {
         provider_id: Option<&str>,
         session: Session,
         request: Request,
-    ) -> Result<(), ShieldError>;
+    ) -> Result<Response, ShieldError>;
 }
 
 #[async_trait]
@@ -48,7 +48,7 @@ impl<U: User> DynShield for Shield<U> {
         provider_id: Option<&str>,
         session: Session,
         request: Request,
-    ) -> Result<(), ShieldError> {
+    ) -> Result<Response, ShieldError> {
         self.call(action_id, method_id, provider_id, session, request)
             .await
     }
@@ -80,7 +80,7 @@ impl ShieldDyn {
         provider_id: Option<&str>,
         session: Session,
         request: Request,
-    ) -> Result<(), ShieldError> {
+    ) -> Result<Response, ShieldError> {
         self.0
             .call(action_id, method_id, provider_id, session, request)
             .await