From f5b0fc6a8f776faa63c8b176011867b3e565e43d Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 10 Mar 2025 16:04:06 -0700 Subject: [PATCH 1/2] Fix AuthInfo Provider not being set --- controller/EmbeddedNetworkController.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 14c37250b..a45c8bec4 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -1548,7 +1548,8 @@ void EmbeddedNetworkController::_request( authInfo.add(ZT_AUTHINFO_DICT_KEY_CENTRAL_ENDPOINT_URL, info.centralAuthURL.c_str()); authInfo.add(ZT_AUTHINFO_DICT_KEY_NONCE, info.ssoNonce.c_str()); authInfo.add(ZT_AUTHINFO_DICT_KEY_STATE, info.ssoState.c_str()); - authInfo.add(ZT_AUTHINFO_DICT_KEY_CLIENT_ID, info.ssoClientID.c_str()); + authInfo.add(ZT_AUTHINFO_DICT_KEY_CLIENT_ID, info.ssoClientID.c_str()); + authInfo.add(ZT_AUTHINFO_DICT_KEY_SSO_PROVIDER, info.ssoProvider.c_str()); _sender->ncSendError(nwid,requestPacketId,identity.address(),NetworkController::NC_ERROR_AUTHENTICATION_REQUIRED, authInfo.data(), authInfo.sizeBytes()); } DB::cleanMember(member); From 5630d48a66c817bbe8f06dd53bf066e837b2fa27 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 10 Mar 2025 16:35:10 -0700 Subject: [PATCH 2/2] temporal sdk fix missing WorkflowIdConflictPolicy --- rustybits/smeeclient/src/lib.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rustybits/smeeclient/src/lib.rs b/rustybits/smeeclient/src/lib.rs index d48876e2a..426daad79 100644 --- a/rustybits/smeeclient/src/lib.rs +++ b/rustybits/smeeclient/src/lib.rs @@ -16,7 +16,10 @@ use serde::{Deserialize, Serialize}; use std::str::FromStr; use std::time::Duration; use temporal_client::{Client, ClientOptionsBuilder, RetryClient, WorkflowClientTrait, WorkflowOptions}; -use temporal_sdk_core_protos::{coresdk::AsJsonPayloadExt, temporal::api::enums::v1::WorkflowIdReusePolicy}; +use temporal_sdk_core_protos::{ + coresdk::AsJsonPayloadExt, + temporal::api::enums::v1::{WorkflowIdConflictPolicy, WorkflowIdReusePolicy}, +}; use url::Url; use uuid::Uuid; @@ -72,6 +75,7 @@ impl SmeeClient { println!("notifying network joined"); let options = WorkflowOptions { id_reuse_policy: WorkflowIdReusePolicy::RejectDuplicate, + id_conflict_policy: WorkflowIdConflictPolicy::Fail, execution_timeout: None, run_timeout: None, task_timeout: None,