Skip to content

fix: Have options for which API #28

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

Open
webbrain-one wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Have options for which API #28

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: 18 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,21 @@ impl TryFrom<String> for ApiVersion {
}
}

#[derive(Debug, Clone, Copy, Eq, PartialEq)]
pub enum ShopifyApi {
Admin,
Storefront,
Custom(&'static str),
}

#[derive(Clone)]
pub struct ShopifyConfig {
pub api_version: ApiVersion,
#[cfg(feature = "webhooks")]
pub shared_secret: Option<String>,
pub token_store: Option<Arc<dyn TokenStore>>,
pub token_refresh_leeway: chrono::Duration,
pub api: ShopifyApi,
pub user_agent: String,
}

Expand All @@ -80,6 +88,7 @@ impl Default for ShopifyConfig {
#[cfg(feature = "webhooks")]
shared_secret: None,
token_store: None,
api: ShopifyApi::Admin,
token_refresh_leeway: chrono::Duration::minutes(5),
user_agent: VERSION.to_string(),
}
Expand Down Expand Up @@ -164,8 +173,14 @@ impl Shopify {
let shop = shop.as_ref().to_string();
let shop_domain = normalize_shop_domain(&shop);
let query_url = format!(
"https://{}/admin/api/{}/graphql.json",
shop_domain, config.api_version
"https://{}/{}/api/{}/graphql.json",
shop_domain,
match config.api {
ShopifyApi::Admin => "admin",
ShopifyApi::Storefront => "api",
ShopifyApi::Custom(path) => path,
},
config.api_version
);
let token_url = format!("https://{}/admin/oauth/access_token", shop_domain);
let mut headers = reqwest::header::HeaderMap::new();
Expand All @@ -181,6 +196,7 @@ impl Shopify {
api_version: config.api_version,
#[cfg(feature = "webhooks")]
shared_secret: config.shared_secret,
// We don't need to store config.api in Shopify struct since it's used in query_url
auth: Arc::new(Mutex::new(auth)),
client,
query_url,
Expand Down