From d76220e19a9852c9f6ccff9980d6a12690cd3c37 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 18 May 2017 17:24:54 -0400
Subject: [PATCH] adjust sync interval minimums

---
 src/Console/Program.cs               | 3 ++-
 src/Core/Models/SyncConfiguration.cs | 3 +++
 src/Service/Service.cs               | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Console/Program.cs b/src/Console/Program.cs
index aeba9747..d0332b08 100644
--- a/src/Console/Program.cs
+++ b/src/Console/Program.cs
@@ -750,7 +750,8 @@ namespace Bit.Console
                 }
 
                 Con.Write("Sync interval (minutes, minimum {1}) [{0}]: ", config.IntervalMinutes,
-                    SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.Other ? "30" : "1");
+                    SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.Other ||
+                    SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.GSuite ? "60" : "5");
                 input = Con.ReadLine();
                 int intervalMinutes;
                 if(!string.IsNullOrEmpty(input) && int.TryParse(input, out intervalMinutes))
diff --git a/src/Core/Models/SyncConfiguration.cs b/src/Core/Models/SyncConfiguration.cs
index 64d3bb83..0a41b4f6 100644
--- a/src/Core/Models/SyncConfiguration.cs
+++ b/src/Core/Models/SyncConfiguration.cs
@@ -26,6 +26,9 @@ namespace Bit.Core.Models
                 case DirectoryType.Other:
                     IntervalMinutes = 60;
                     break;
+                case DirectoryType.GSuite:
+                    IntervalMinutes = 60;
+                    break;
                 default:
                     break;
             }
diff --git a/src/Service/Service.cs b/src/Service/Service.cs
index 2a19cfca..5c806624 100644
--- a/src/Service/Service.cs
+++ b/src/Service/Service.cs
@@ -76,13 +76,15 @@ namespace Service
             }
 
             var intervalMinutes = SettingsService.Instance.Sync.IntervalMinutes;
-            if(SettingsService.Instance.Server.Type == Bit.Core.Enums.DirectoryType.Other && intervalMinutes < 60)
+            if((SettingsService.Instance.Server.Type == Bit.Core.Enums.DirectoryType.Other ||
+                SettingsService.Instance.Server.Type == Bit.Core.Enums.DirectoryType.GSuite)
+                && intervalMinutes < 60)
             {
                 intervalMinutes = 60;
             }
-            else if(intervalMinutes < 1)
+            else if(intervalMinutes < 5)
             {
-                intervalMinutes = 1;
+                intervalMinutes = 5;
             }
 
             _eventLog.WriteEntry($"Starting timer with {intervalMinutes} minute interval.", EventLogEntryType.Information);