migrate to open cloud

Author: afujiwara-roblox

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "tarmac"
 description = "Resource compiler and asset manager for Roblox projects"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Lucien Greathouse <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -19,15 +19,9 @@ panic = "abort"
 panic = "abort"
 
 [workspace]
-members = [
-	".",
-	"packos",
-]
-
-default-members = [
-	".",
-	"packos",
-]
+members = [".", "packos"]
+
+default-members = [".", "packos"]
 
 [dependencies]
 packos = { path = "packos", version = "0.1.0" }

Cargo.toml

@@ -7,13 +7,14 @@ use fs_err as fs;
 use crate::asset_name::AssetName;
 use crate::data::Manifest;
 use crate::options::{CreateCacheMapOptions, GlobalOptions};
-use crate::roblox_web_api::RobloxApiClient;
+use crate::roblox_web_api::{RobloxApiClient, RobloxOpenCloudCredentials};
 
 pub fn create_cache_map(
     global: GlobalOptions,
     options: CreateCacheMapOptions,
 ) -> anyhow::Result<()> {
-    let mut api_client = RobloxApiClient::new(global.auth);
+    let credentials = RobloxOpenCloudCredentials::get_credentials(global.auth, global.api_key)?;
+    let mut api_client = RobloxApiClient::new(credentials);
 
     let project_path = match options.project_path {
         Some(path) => path.clone(),

src/commands/create_cache_map.rs

@@ -14,13 +14,13 @@ use walkdir::WalkDir;
 use crate::{
     alpha_bleed::alpha_bleed,
     asset_name::AssetName,
-    auth_cookie::get_auth_cookie,
     codegen::perform_codegen,
     data::{Config, ConfigError, ImageSlice, InputManifest, Manifest, ManifestError, SyncInput},
     dpi_scale,
     image::Image,
     options::{GlobalOptions, SyncOptions, SyncTarget},
-    roblox_web_api::{RobloxApiClient, RobloxApiError},
+    roblox_web_api::{RobloxApiClient, RobloxApiError, RobloxOpenCloudCredentials},
+    roblox_web_api_types::RobloxAuthenticationError,
     sync_backend::{
         DebugSyncBackend, Error as SyncBackendError, NoneSyncBackend, RetryBackend,
         RobloxSyncBackend, SyncBackend, UploadInfo,
@@ -43,7 +43,8 @@ pub fn sync(global: GlobalOptions, options: SyncOptions) -> Result<(), SyncError
         None => env::current_dir()?,
     };
 
-    let mut api_client = RobloxApiClient::new(global.auth.or_else(get_auth_cookie));
+    let credentials = RobloxOpenCloudCredentials::get_credentials(global.auth, global.api_key)?;
+    let mut api_client = RobloxApiClient::new(credentials);
 
     let mut session = SyncSession::new(&fuzzy_config_path)?;
 
@@ -753,6 +754,12 @@ pub enum SyncError {
         #[from]
         source: RobloxApiError,
     },
+
+    #[error(transparent)]
+    RobloxAuthenticationError {
+        #[from]
+        source: RobloxAuthenticationError,
+    },
 }
 
 impl SyncError {

src/commands/sync.rs

@@ -1,35 +1,35 @@
-use std::borrow::Cow;
-
+use anyhow::Ok;
 use fs_err as fs;
 
 use crate::{
-    auth_cookie::get_auth_cookie,
     options::{GlobalOptions, UploadImageOptions},
-    roblox_web_api::{ImageUploadData, RobloxApiClient},
+    roblox_web_api::{RobloxApiClient, RobloxOpenCloudCredentials, DECAL},
+    roblox_web_api_types::{ImageUploadData, ImageUploadMetadata},
 };
 
-pub fn upload_image(global: GlobalOptions, options: UploadImageOptions) {
-    let auth = global
-        .auth
-        .clone()
-        .or_else(get_auth_cookie)
-        .expect("no auth cookie found");
-
+pub fn upload_image(
+    global: GlobalOptions,
+    options: UploadImageOptions,
+) -> Result<(), anyhow::Error> {
     let image_data = fs::read(options.path).expect("couldn't read input file");
+    let credentials = RobloxOpenCloudCredentials::get_credentials(global.auth, global.api_key)?;
 
-    let mut client = RobloxApiClient::new(Some(auth));
+    let mut client = RobloxApiClient::new(credentials);
 
     let upload_data = ImageUploadData {
-        image_data: Cow::Owned(image_data),
-        name: &options.name,
-        description: &options.description,
-        group_id: None,
+        image_data: image_data.into(),
+        image_metadata: ImageUploadMetadata::new(
+            DECAL.to_string(),
+            options.name.to_string(),
+            options.description.to_string(),
+            options.user_id,
+            options.group_id,
+        )?,
     };
 
-    let response = client
-        .upload_image(upload_data)
-        .expect("Roblox API request failed");
+    let response = client.upload_image(upload_data)?;
 
     eprintln!("Image uploaded successfully!");
-    println!("{}", response.backing_asset_id);
+    println!("{}", response.asset_id);
+    Ok(())
 }

src/commands/upload_image.rs

@@ -10,8 +10,8 @@ mod image;
 mod lua_ast;
 mod options;
 mod roblox_web_api;
+mod roblox_web_api_types;
 mod sync_backend;
-
 use std::{env, panic, process};
 
 use backtrace::Backtrace;
@@ -22,7 +22,7 @@ use crate::options::{Options, Subcommand};
 fn run(options: Options) -> Result<(), anyhow::Error> {
     match options.command {
         Subcommand::UploadImage(upload_options) => {
-            commands::upload_image(options.global, upload_options)
+            commands::upload_image(options.global, upload_options)?
         }
         Subcommand::Sync(sync_options) => commands::sync(options.global, sync_options)?,
         Subcommand::CreateCacheMap(sub_options) => {

src/main.rs

@@ -20,6 +20,10 @@ pub struct GlobalOptions {
     #[structopt(long, global(true))]
     pub auth: Option<String>,
 
+    /// The Open Cloud API key tarmac will use to upload assets.
+    #[structopt(long, global(true))]
+    pub api_key: Option<String>,
+
     /// Sets verbosity level. Can be specified multiple times.
     #[structopt(long = "verbose", short, global(true), parse(from_occurrences))]
     pub verbosity: u8,
@@ -54,6 +58,14 @@ pub struct UploadImageOptions {
     /// The description to give to the resulting Decal asset.
     #[structopt(long, default_value = "Uploaded by Tarmac.")]
     pub description: String,
+
+    /// The ID of the user to upload to. Not compatible with `group_id`.
+    #[structopt(long)]
+    pub group_id: Option<u64>,
+
+    /// The ID of the group to upload to. Not compatible with `user_id`.
+    #[structopt(long)]
+    pub user_id: Option<u64>,
 }
 
 #[derive(Debug, StructOpt)]