Client changes for disabled dasher account

sync/protocol/sync_protocol_error.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_
 #define SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_
 
 #include <string>
 
 #include "base/values.h"
 #include "sync/base/sync_export.h"
@@ skipping 21 matching lines @@
   // been taken.
   NON_RETRIABLE_ERROR,
 
   // Indicates the datatypes have been migrated and the client should resync
   // them to get the latest progress markers.
   MIGRATION_DONE,
 
   // Invalid Credential.
   INVALID_CREDENTIAL,
 
+  // An administrator disabled the account.

[Andrew T Wilson (Slow), 2013/05/13 11:51:13]

See my previous comment - I think "disabled the account" is a bit vague, since
the admin is really disabling the sync service on the domain, not actually
disabling the user acct.

[pavely, 2013/05/13 22:37:09]

Done.

+  DISABLED_BY_ADMIN,
+
   // The default value.
   UNKNOWN_ERROR
 };
 
 enum ClientAction {
   // Upgrade the client to latest version.
   UPGRADE_CLIENT,
 
   // Clear user data and setup sync again.
   CLEAR_USER_DATA_AND_RESYNC,
 
   // Set the bit on the account to enable sync.
   ENABLE_SYNC_ON_ACCOUNT,
 
   // Stop sync and restart sync.
   STOP_AND_RESTART_SYNC,
 
   // Wipe this client of any sync data.
   DISABLE_SYNC_ON_CLIENT,
 
+  // Account is disabled by admin. Stop sync, clear prefs and show message on
+  // settings page that account is disabled.
+  STOP_SYNC_FOR_DISABLED_ACCOUNT,

[tim (not reviewing), 2013/05/13 04:18:58]

Why is this here as a ClientAction? It isn't part of the actionable error proto
and I'm not sure it really fits, since it's a lot more specific than these...

[pavely, 2013/05/13 22:37:09]

I followed pattern of DISABLE_SYNC_ON_CLIENT. It is not really an action sent by
server but triggered by client based on server's error code. See
syncer_proto_util.cc: ConvertLegacyErrorCodeToNewError.
It is needed because error is detected on sync thread but action should be taken
on browser thread and ActionableError provides mechanism for it.

+
   // The default. No action.
   UNKNOWN_ACTION
 };
 
 struct SYNC_EXPORT SyncProtocolError {
   SyncProtocolErrorType error_type;
   std::string error_description;
   std::string url;
   ClientAction action;
   ModelTypeSet error_data_types;
   SyncProtocolError();
   ~SyncProtocolError();
   DictionaryValue* ToValue() const;
 };
 
 SYNC_EXPORT const char* GetSyncErrorTypeString(SyncProtocolErrorType type);
 SYNC_EXPORT const char* GetClientActionString(ClientAction action);
 }  // namespace syncer
 #endif  // SYNC_PROTOCOL_SYNC_PROTOCOL_ERROR_H_