daniel543x/artcraft
1
0 Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-11-06 02:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

update signup source

Browse Source
This commit is contained in:
Brandon Thomas committed 2026-02-01 01:50:02 -05:00
1 parent 57e4887cbf
commit 9ea44e4aa6
4 files changed
+53 -124
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/lib/actix_artcraft/src/requests/get_request_signup_source.rs
-117
View File
@@ -1,117 +0,0 @@
use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri;
use actix_web::HttpRequest;
use log::warn;
const ARTCRAFT : &str = "artcraft";
const FAKEYOU : &str = "fakeyou";
const STORYTELLER : &str = "storyteller";
/// This is for the users table `maybe_source` field which is populated during account creation.
/// While we could back this with an enum, there may be a motivation to use this VARCHAR(255) field
/// for more robust payloads and user tracking in the future.
pub fn get_request_signup_source(http_request: &HttpRequest) -> Option<&'static str> {
// NB: "Origin" vs "Referrer"
//
// Basically:
// - "In order to preserve privacy, any browser request can decide to omit the Referer header."
// - "The Origin header is similar to the Referer header, but does not disclose the path, and may be null."
// - "Origin" is sent on cross-origin, same-origin (except GET and HEAD requests - typically).
//
// Reading:
// - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin
// - https://stackoverflow.com/a/71040145
//
let maybe_origin = get_request_origin_uri(&http_request);
match maybe_origin {
Ok(Some(uri)) => {
if let Some(host) = uri.host() {
if host.contains(ARTCRAFT) {
return Some(ARTCRAFT);
} else if host.contains(STORYTELLER) {
return Some(STORYTELLER);
} else if host.contains(FAKEYOU) {
return Some(FAKEYOU);
}
}
}
// Fail open for now.
Ok(None) => {}
Err(err) => {
warn!("Origin header error: {:?}", err);
}
}
// NB: We don't want to check the "Host" header because we might have misconfigured
// a future frontend to talk to some other API gateway and might be improperly and
// silently misattributing signup statistics.
None
}
#[cfg(test)]
mod tests {
use actix_web::test::TestRequest;
mod origin_header_str {
use super::*;
use crate::requests::get_request_signup_source::get_request_signup_source;
#[test]
fn artcraft_dot_ai() {
let request = TestRequest::get()
.insert_header(("origin", "https://artcraft.ai"))
.to_http_request();
assert_eq!(get_request_signup_source(&request), Some("artcraft"));
}
#[test]
fn get_artcraft_dot_com() {
let request = TestRequest::get()
.insert_header(("origin", "https://getartcraft.com"))
.to_http_request();
assert_eq!(get_request_signup_source(&request), Some("artcraft"));
}
#[test]
fn api_dot_get_artcraft_dot_com() {
let request = TestRequest::get()
.insert_header(("origin", "https://api.getartcraft.com"))
.to_http_request();
assert_eq!(get_request_signup_source(&request), Some("artcraft"));
}
#[test]
fn fakeyou_dot_com() {
let request = TestRequest::get()
.insert_header(("origin", "https://fakeyou.com"))
.to_http_request();
assert_eq!(get_request_signup_source(&request), Some("fakeyou"));
}
#[test]
fn api_dot_fakeyou_dot_com() {
let request = TestRequest::get()
.insert_header(("origin", "https://api.fakeyou.com"))
.to_http_request();
assert_eq!(get_request_signup_source(&request), Some("fakeyou"));
}
#[test]
fn storyteller_dot_ai() {
let request = TestRequest::get()
.insert_header(("origin", "https://storyteller.ai"))
.to_http_request();
assert_eq!(get_request_signup_source(&request), Some("storyteller"));
}
#[test]
fn api_dot_storyteller_dot_ai() {
let request = TestRequest::get()
.insert_header(("origin", "https://api.storyteller.ai"))
.to_http_request();
assert_eq!(get_request_signup_source(&request), Some("storyteller"));
}
}
}
crates/lib/actix_artcraft/src/requests/get_request_signup_source_enum.rs
+44 -6
View File
@@ -1,10 +1,48 @@
use crate::requests::get_request_signup_source::get_request_signup_source;
use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri;
use actix_web::HttpRequest;
use enums::by_table::users::user_signup_source::UserSignupSource;
use log::warn;
pub fn get_request_signup_source_enum(http_request: &HttpRequest) -> Option<UserSignupSource> {
get_request_signup_source(http_request)
.and_then(|source_str| UserSignupSource::from_str(source_str).ok())
// NB: "Origin" vs "Referrer"
//
// Basically:
// - "In order to preserve privacy, any browser request can decide to omit the Referer header."
// - "The Origin header is similar to the Referer header, but does not disclose the path, and may be null."
// - "Origin" is sent on cross-origin, same-origin (except GET and HEAD requests - typically).
//
// Reading:
// - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin
// - https://stackoverflow.com/a/71040145
//
let maybe_origin = get_request_origin_uri(&http_request);
match maybe_origin {
Ok(Some(uri)) => {
if let Some(host) = uri.host() {
if host.contains("getartcraft.com") {
return Some(UserSignupSource::ArtCraftGetWeb);
} else if host.contains("artcraft.ai") {
return Some(UserSignupSource::ArtCraftAiWeb);
} else if host.contains("storyteller") {
return Some(UserSignupSource::Storyteller);
} else if host.contains("fakeyou") {
return Some(UserSignupSource::FakeYou);
}
}
}
// Fail open for now.
Ok(None) => {}
Err(err) => {
warn!("Origin header error: {:?}", err);
}
}
// NB: We don't want to check the "Host" header because we might have misconfigured
// a future frontend to talk to some other API gateway and might be improperly and
// silently misattributing signup statistics.
None
}
#[cfg(test)]
@@ -21,7 +59,7 @@ mod tests {
let request = TestRequest::get()
.insert_header(("origin", "https://artcraft.ai"))
.to_http_request();
assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraft));
assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraftAiWeb));
}
#[test]
@@ -29,7 +67,7 @@ mod tests {
let request = TestRequest::get()
.insert_header(("origin", "https://getartcraft.com"))
.to_http_request();
assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraft));
assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraftGetWeb));
}
#[test]
@@ -37,7 +75,7 @@ mod tests {
let request = TestRequest::get()
.insert_header(("origin", "https://api.getartcraft.com"))
.to_http_request();
assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraft));
assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraftGetWeb));
}
#[test]
crates/lib/actix_artcraft/src/requests/mod.rs
-1
View File
@@ -1,2 +1 @@
pub mod get_request_signup_source;
pub mod get_request_signup_source_enum;
crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/user_creation_case.rs
+9
View File
@@ -6,6 +6,7 @@ use crate::utils::create_checkout::create_subscription_checkout_session::{create
use actix_artcraft::requests::get_request_signup_source_enum::get_request_signup_source_enum;
use actix_web::HttpRequest;
use enums::by_table::users::user_feature_flag::UserFeatureFlag;
use enums::by_table::users::user_signup_source::UserSignupSource;
use http_server_common::request::get_request_ip::get_request_ip;
use log::{error, info, warn};
use mysql_queries::queries::users::user::create::create_account_error::CreateAccountError;
@@ -37,8 +38,16 @@ pub (super) async fn user_creation_case(
})?;
let ip_address = get_request_ip(&http_request);
let maybe_source = get_request_signup_source_enum(&http_request);
// NB: Adjust the signup source to the Stripe onboarding equivalent.
let maybe_source = match maybe_source {
Some(UserSignupSource::ArtCraftAiWeb) => Some(UserSignupSource::ArtCraftAiStripe),
Some(UserSignupSource::ArtCraftGetWeb) => Some(UserSignupSource::ArtCraftGetStripe),
_ => maybe_source,
};
// NB: Not sure if these lock important functionality, so we're keeping this
let user_feature_flags = vec![
UserFeatureFlag::Studio,