1 files changed, 8 insertions, 8 deletions
diff --git a/src/datatype/command.rs b/src/datatype/command.rs
index 71567da..c88e8d5 100644
--- a/src/datatype/command.rs
+++ b/src/datatype/command.rs
@@ -3,8 +3,8 @@ use std::str;
 use std::str::FromStr;
 
 use nom::{IResult, space, eof};
-use datatype::{ClientCredentials, ClientId, ClientSecret, Error, InstalledSoftware,
-               Package, UpdateReport, UpdateRequestId, UpdateResultCode};
+use datatype::{ClientCredentials, Error, InstalledSoftware, Package, UpdateReport,
+               UpdateRequestId, UpdateResultCode};
 
 
 /// System-wide commands that are sent to the interpreter.
@@ -111,8 +111,9 @@ fn parse_arguments(cmd: Command, args: Vec<&str>) -> Result<Command, Error> {
             0 => Ok(Command::Authenticate(None)),
             1 => Err(Error::Command("usage: auth <client-id> <client-secret>".to_string())),
             2 => Ok(Command::Authenticate(Some(ClientCredentials {
-                    client_id:     ClientId(args[0].to_string()),
-                    client_secret: ClientSecret(args[1].to_string())}))),
+                client_id:     args[0].to_string(),
+                client_secret: args[1].to_string()
+            }))),
             _ => Err(Error::Command(format!("unexpected Authenticate args: {:?}", args))),
         },
 
@@ -192,8 +193,7 @@ fn parse_arguments(cmd: Command, args: Vec<&str>) -> Result<Command, Error> {
 #[cfg(test)]
 mod tests {
     use super::{command, arguments};
-    use datatype::{Command, ClientCredentials, ClientId, ClientSecret, Package,
-                   UpdateReport, UpdateResultCode};
+    use datatype::{Command, ClientCredentials, Package, UpdateReport, UpdateResultCode};
     use nom::IResult;
 
 
@@ -224,8 +224,8 @@ mod tests {
         assert_eq!("auth".parse::<Command>().unwrap(), Command::Authenticate(None));
         assert_eq!("auth user pass".parse::<Command>().unwrap(),
                    Command::Authenticate(Some(ClientCredentials {
-                       client_id:     ClientId("user".to_string()),
-                       client_secret: ClientSecret("pass".to_string()),
+                       client_id:     "user".to_string(),
+                       client_secret: "pass".to_string(),
                    })));
         assert!("auth one".parse::<Command>().is_err());
         assert!("auth one two three".parse::<Command>().is_err());