api account fix

2 files changed, 2 insertions, 41 deletions

diff --git a/module/remote/thriftbackend/pyload.thrift b/module/remote/thriftbackend/pyload.thrift
index 00f24f3fa..e7ae10055 100644
--- a/module/remote/thriftbackend/pyload.thrift
+++ b/module/remote/thriftbackend/pyload.thrift
@@ -136,7 +136,7 @@ struct UserData {
 struct AccountInfo {
   1: i64 validuntil,
   2: string login,
-  3: map<string, string> options,
+  3: map<string, list<string>> options,
   4: bool valid,
   5: i64 trafficleft,
   6: i64 maxtraffic,
@@ -144,14 +144,6 @@ struct AccountInfo {
   8: string type,
 }
 
-struct AccountData {
-  1: PluginName type,
-  2: string login,
-  3: optional string password,
-  4: optional map<string, string> options
-}
-
-
 struct ServiceCall {
     1: PluginName plugin,
     2: string func,
diff --git a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py
index 199279dda..4ff110e58 100644
--- a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py
+++ b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py
@@ -528,7 +528,7 @@ class AccountInfo(TBase):
     None, # 0
     (1, TType.I64, 'validuntil', None, None, ), # 1
     (2, TType.STRING, 'login', None, None, ), # 2
-    (3, TType.MAP, 'options', (TType.STRING,None,TType.STRING,None), None, ), # 3
+    (3, TType.MAP, 'options', (TType.STRING,None,TType.LIST,(TType.STRING,None)), None, ), # 3
     (4, TType.BOOL, 'valid', None, None, ), # 4
     (5, TType.I64, 'trafficleft', None, None, ), # 5
     (6, TType.I64, 'maxtraffic', None, None, ), # 6
@@ -547,37 +547,6 @@ class AccountInfo(TBase):
     self.type = type
 
 
-class AccountData(TBase):
-  """
-  Attributes:
-   - type
-   - login
-   - password
-   - options
-  """
-
-  __slots__ = [ 
-    'type',
-    'login',
-    'password',
-    'options',
-   ]
-
-  thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'type', None, None, ), # 1
-    (2, TType.STRING, 'login', None, None, ), # 2
-    (3, TType.STRING, 'password', None, None, ), # 3
-    (4, TType.MAP, 'options', (TType.STRING,None,TType.STRING,None), None, ), # 4
-  )
-
-  def __init__(self, type=None, login=None, password=None, options=None,):
-    self.type = type
-    self.login = login
-    self.password = password
-    self.options = options
-
-
 class ServiceCall(TBase):
   """
   Attributes: