Export token type as well and export external ids as json

Author: rambo

project/access/management/commands/exporttokens.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import json
 import sqlite3
 
 from access.utils import all_tokens
@@ -16,14 +17,14 @@ def handle(self, *args, **options):
         self.connection = sqlite3.connect(options['filepath'], detect_types=sqlite3.PARSE_DECLTYPES)
         self.cursor = self.connection.cursor()
 
-        self.cursor.execute("CREATE TABLE valid_tokens (value TEXT UNIQUE, acl INTEGER, external_ids TEXT);")
-        self.cursor.execute("CREATE TABLE revoked_tokens (value TEXT UNIQUE);")
+        self.cursor.execute("CREATE TABLE valid_tokens (value TEXT UNIQUE, type INTEGER, acl INTEGER, external_ids TEXT);")
+        self.cursor.execute("CREATE TABLE revoked_tokens (value TEXT UNIQUE, type INTEGER);")
         self.connection.commit()
         # TODO: add TokenType filtering
         for t in all_tokens():
             if t.revoked:
-                self.cursor.execute("INSERT INTO revoked_tokens VALUES (?);", t.value)
+                self.cursor.execute("INSERT INTO revoked_tokens VALUES (?,?);", (t.value, t.ttype.pk))
             else:
                 acl = t.acl
-                self.cursor.execute("INSERT INTO valid_tokens VALUES (?,?,?);", (t.value, acl['bits'], ','.join(acl['externals'])))
+                self.cursor.execute("INSERT INTO valid_tokens VALUES (?,?,?,?);", (t.value, t.ttype.pk, acl['bits'], json.dumps(acl['externals'])))
             self.connection.commit()