From 7edca0ef66013f25c337a1f87bcf78ff0067bb97 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 17 Jul 2020 16:18:42 +0300
Subject: [PATCH] Tokens

---
 lib/data/models/company_model.dart         | 1 +
 lib/data/models/company_model.g.dart       | 4 ++--
 lib/data/repositories/auth_repository.dart | 1 -
 lib/redux/token/token_selectors.dart       | 9 +++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart
index 3efbd8339..90b46d684 100644
--- a/lib/data/models/company_model.dart
+++ b/lib/data/models/company_model.dart
@@ -227,6 +227,7 @@ abstract class CompanyEntity extends Object
 
   BuiltList<DesignEntity> get designs;
 
+  @BuiltValueField(wireName: 'tokens_hashed')
   BuiltList<TokenEntity> get tokens;
 
   BuiltList<WebhookEntity> get webhooks;
diff --git a/lib/data/models/company_model.g.dart b/lib/data/models/company_model.g.dart
index 03c989142..f1ea50807 100644
--- a/lib/data/models/company_model.g.dart
+++ b/lib/data/models/company_model.g.dart
@@ -184,7 +184,7 @@ class _$CompanyEntitySerializer implements StructuredSerializer<CompanyEntity> {
       serializers.serialize(object.designs,
           specifiedType:
               const FullType(BuiltList, const [const FullType(DesignEntity)])),
-      'tokens',
+      'tokens_hashed',
       serializers.serialize(object.tokens,
           specifiedType:
               const FullType(BuiltList, const [const FullType(TokenEntity)])),
@@ -500,7 +500,7 @@ class _$CompanyEntitySerializer implements StructuredSerializer<CompanyEntity> {
                       BuiltList, const [const FullType(DesignEntity)]))
               as BuiltList<Object>);
           break;
-        case 'tokens':
+        case 'tokens_hashed':
           result.tokens.replace(serializers.deserialize(value,
                   specifiedType: const FullType(
                       BuiltList, const [const FullType(TokenEntity)]))
diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart
index 96264f701..4a56cfde2 100644
--- a/lib/data/repositories/auth_repository.dart
+++ b/lib/data/repositories/auth_repository.dart
@@ -107,7 +107,6 @@ class AuthRepository {
     url = formatApiUrl(url) + '/refresh';
 
     if (updatedAt > 0) {
-      // TODO re-enable this
       //url += '?updated_at=$updatedAt';
       includeStatic = includeStatic ||
           DateTime.now().millisecondsSinceEpoch - (updatedAt * 1000) >
diff --git a/lib/redux/token/token_selectors.dart b/lib/redux/token/token_selectors.dart
index a61e39ff6..b68001f55 100644
--- a/lib/redux/token/token_selectors.dart
+++ b/lib/redux/token/token_selectors.dart
@@ -12,11 +12,6 @@ List<String> dropdownTokensSelector(BuiltMap<String, TokenEntity> tokenMap,
     BuiltList<String> tokenList, String clientId) {
   final list = tokenList.where((tokenId) {
     final token = tokenMap[tokenId];
-    /*
-    if (clientId != null && clientId > 0 && token.clientId != clientId) {
-      return false;
-    }
-    */
     return token.isActive;
   }).toList();
 
@@ -40,7 +35,9 @@ List<String> filteredTokensSelector(BuiltMap<String, TokenEntity> tokenMap,
     if (tokenListState.filterEntityId != null &&
         token.id != tokenListState.filterEntityId) {
       return false;
-    } else {}
+    } else {
+      //
+    }
 
     if (!token.matchesStates(tokenListState.stateFilters)) {
       return false;