Handle legacy credentials and fix accounts query

src/api.rs

@@ -9,7 +9,7 @@ use crate::{constant, credential::AccessToken};
 pub enum Error {
     #[error(transparent)]
     ReqwestError(#[from] reqwest::Error),
-    #[error("Invalid token, authenticate with `slot auth login`")]
+    #[error("Invalid token, please authenticate with `slot auth login`")]
     Unauthorized,
 }
 

src/command/deployments/accounts.graphql

@@ -8,7 +8,11 @@ query KatanaAccounts($project: String!) {
       ... on KatanaConfig {
         seed
         genesis
-        accounts
+        accounts {
+          address
+          publicKey
+          privateKey
+        }
       }
     }
   }

src/command/deployments/accounts.rs

@@ -67,7 +67,7 @@ impl AccountsArgs {
                     }
 
                     let total = match config.accounts {
-                        Some(accounts) => accounts as u16,
+                        Some(accounts) => accounts.len() as u16,
                         None => 10,
                     };
 

src/credential.rs

@@ -8,12 +8,28 @@ use crate::command::auth::info::me::MeMe;
 const SLOT_DIR: &str = "slot";
 const CREDENTIALS_FILE: &str = "credentials.json";
 
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error(transparent)]
+    IO(#[from] io::Error),
+    #[error("No credentials found, please authenticate with `slot auth login`")]
+    Unauthorized,
+    #[error("Legacy credentials found, please reauthenticate with `slot auth login`")]
+    LegacyCredentials,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AccessToken {
     pub token: String,
     pub r#type: String,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct LegacyCredentials {
+    pub access_token: String,
+    pub token_type: String,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Credentials {
     #[serde(flatten)]
@@ -29,11 +45,18 @@ impl Credentials {
         }
     }
 
-    pub fn load() -> io::Result<Self> {
+    pub fn load() -> Result<Self, Error> {
         let path = get_file_path();
-        let content = fs::read_to_string(path)?;
-        let credentials = serde_json::from_str(&content)?;
-        Ok(credentials)
+        if !path.exists() {
+            return Err(Error::Unauthorized);
+        }
+
+        let content = fs::read_to_string(path.clone())?;
+        let credentials: Result<Credentials, _> = serde_json::from_str(&content);
+        match credentials {
+            Ok(creds) => Ok(creds),
+            Err(_) => Err(Error::LegacyCredentials),
+        }
     }
 
     pub fn write(&self) -> io::Result<()> {