Revert "fix(google): can't mix admin with calendar scopes"

This reverts commit 9fca2ba.

Author: stakach

shard.yml

@@ -1,5 +1,5 @@
 name: place_calendar
-version: 3.0.0
+version: 2.0.1
 
 authors:
   - Toby Carvan <toby@redant.com.au>

spec/spec_helper.cr

@@ -12,9 +12,9 @@ end
 def google_creds
   {
     file_path: "",
-    # scopes:    "https://www.googleapis.com/auth/calendar https://www.googleapis.com/auth/directory.user.readonly https://www.googleapis.com/auth/drive",
-    domain: "",
-    sub:    "",
+    scopes:    "https://www.googleapis.com/auth/calendar https://www.googleapis.com/auth/directory.user.readonly https://www.googleapis.com/auth/drive",
+    domain:    "",
+    sub:       "",
   }
 end
 

src/google.cr

@@ -4,9 +4,8 @@ module PlaceCalendar
   class Google < Interface
     def initialize(
       @file_path : String,
+      @scopes : String | Array(String),
       @domain : String,
-      @calendar_scope : String = "https://www.googleapis.com/auth/calendar",
-      @directory_scope : String = "https://www.googleapis.com/auth/admin.directory.user.readonly",
       @sub : String = "",
       @user_agent : String = "PlaceOS"
     )
@@ -17,20 +16,19 @@ module PlaceCalendar
     def initialize(
       @issuer : String,
       @signing_key : String,
+      @scopes : String | Array(String),
       @domain : String,
-      @calendar_scope : String = "https://www.googleapis.com/auth/calendar",
-      @directory_scope : String = "https://www.googleapis.com/auth/admin.directory.user.readonly",
       @sub : String = "",
       @user_agent : String = "PlaceOS"
     )
       @file_path = ""
     end
 
-    def auth(scope, sub = @sub) : ::Google::FileAuth | ::Google::Auth
+    def auth(sub = @sub) : ::Google::FileAuth | ::Google::Auth
       if @file_path.empty?
-        ::Google::Auth.new(issuer: @issuer, signing_key: @signing_key, scopes: scope, sub: sub, user_agent: @user_agent)
+        ::Google::Auth.new(issuer: @issuer, signing_key: @signing_key, scopes: @scopes, sub: sub, user_agent: @user_agent)
       else
-        ::Google::FileAuth.new(file_path: @file_path, scopes: scope, sub: sub, user_agent: @user_agent)
+        ::Google::FileAuth.new(file_path: @file_path, scopes: @scopes, sub: sub, user_agent: @user_agent)
       end
     rescue ex : ::Google::Exception
       handle_google_exception(ex)
@@ -128,19 +126,19 @@ module PlaceCalendar
     end
 
     def directory : ::Google::Directory
-      @directory ||= ::Google::Directory.new(auth: auth(@directory_scope), domain: @domain)
+      @directory ||= ::Google::Directory.new(auth: auth, domain: @domain)
     end
 
     def calendar(sub = @sub)
-      @calendar ||= ::Google::Calendar.new(auth: auth(@calendar_scope, sub))
+      @calendar ||= ::Google::Calendar.new(auth: auth(sub))
     end
 
     private def handle_google_exception(ex : ::Google::Exception)
       raise PlaceCalendar::Exception.new(ex.http_status, ex.http_body, ex.message)
     end
 
     private def drive_files(sub = @sub)
-      @drive_files ||= ::Google::Files.new(auth: auth("https://www.googleapis.com/auth/drive.file", sub))
+      @drive_files ||= ::Google::Files.new(auth: auth(sub))
     end
 
     private def event_params(event, calendar_id)

src/place_calendar.cr

@@ -25,27 +25,12 @@ module PlaceCalendar
       list_attachments, get_attachment, create_attachment, delete_attachment,
       get_availability, to: @calendar
 
-    def initialize(
-      file_path : String,
-      domain : String,
-      calendar_scope : String = "https://www.googleapis.com/auth/calendar",
-      directory_scope : String = "https://www.googleapis.com/auth/admin.directory.user.readonly",
-      sub : String = "",
-      user_agent = "PlaceOS"
-    )
-      @calendar = Google.new(file_path, domain, calendar_scope, directory_scope, sub, user_agent)
+    def initialize(file_path : String, scopes : String | Array(String), domain : String, sub : String = "", user_agent = "PlaceOS")
+      @calendar = Google.new(file_path, scopes, domain, sub, user_agent)
     end
 
-    def initialize(
-      issuer : String,
-      signing_key : String,
-      domain : String,
-      calendar_scope : String = "https://www.googleapis.com/auth/calendar",
-      directory_scope : String = "https://www.googleapis.com/auth/admin.directory.user.readonly",
-      sub : String = "",
-      user_agent = "PlaceOS"
-    )
-      @calendar = Google.new(issuer, signing_key, domain, calendar_scope, directory_scope, sub, user_agent)
+    def initialize(issuer : String, signing_key : String, scopes : String | Array(String), domain : String, sub : String = "", user_agent = "PlaceOS")
+      @calendar = Google.new(issuer, signing_key, scopes, domain, sub, user_agent)
     end
 
     def initialize(tenant : String, client_id : String, client_secret : String)