-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
!deploy v2.21.1 with increased support for non-G Suite Admin users
## 2.21.1 * [Issue #131](#131) - _Free/standard Google Account support_ * Fixed: Handling of scopes in `New-GoogleService` for authentication when a client_secrets.json file is used instead of the typical .p12 key. * Updated: Documentation to show how to use an account that is not a G Suite admin or G Suite user at all with PSGSuite * Updated: `*-PSGSuiteConfig` commands now store the client_secrets.json string contents directly on the encrypted config once provided either the path or the string contents directly, allowing users to remove any plain text credentials once loaded into the encrypted config. * Updated: `Get-GSToken` now uses `New-GoogleService` under the hood, so `client_secrets.json` will work with Contacts API.
- Loading branch information
Showing
9 changed files
with
97 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,60 +2,63 @@ function Set-PSGSuiteConfig { | |
| <# | ||
| .SYNOPSIS | ||
| Creates or updates a config | ||
| .DESCRIPTION | ||
| Creates or updates a config | ||
| .PARAMETER ConfigName | ||
| The friendly name for the config you are creating or updating | ||
| .PARAMETER P12KeyPath | ||
| The path to the P12 Key file downloaded from the Google Developer's Console. If both P12KeyPath and ClientSecretsPath are specified, P12KeyPath takes precedence | ||
| .PARAMETER ClientSecretsPath | ||
| The path to the Client Secrets JSON file downloaded from the Google Developer's Console. Using the ClientSecrets JSON will prompt the user to complete OAuth2 authentication in their browser on the first run and store the retrieved Refresh and Access tokens in the user's home directory. If P12KeyPath is also specified, ClientSecretsPath will be ignored. | ||
| .PARAMETER ClientSecrets | ||
| The string contents of the Client Secrets JSON file downloaded from the Google Developer's Console. Using the ClientSecrets JSON will prompt the user to complete OAuth2 authentication in their browser on the first run and store the retrieved Refresh and Access tokens in the user's home directory. If P12KeyPath is also specified, ClientSecrets will be ignored. | ||
| .PARAMETER AppEmail | ||
| The application email from the Google Developer's Console. This typically looks like the following: | ||
| [email protected] | ||
| .PARAMETER AdminEmail | ||
| The email of the Google Admin running the functions. This will typically be your email. | ||
| .PARAMETER CustomerID | ||
| The Customer ID for your customer. If unknown, you can retrieve it by running Get-GSUser after creating a base config with at least either the P12KeyPath or ClientSecretsPath, the AppEmail and the AdminEmail. | ||
| .PARAMETER Domain | ||
| The domain that you primarily manage for this CustomerID | ||
| .PARAMETER Preference | ||
| Some functions allow you to specify whether you are running in the context of the customer or a specific domain in the customer's realm. This allows you to set your preference. | ||
| Available values are: | ||
| * CustomerID | ||
| * Domain | ||
| .PARAMETER ServiceAccountClientID | ||
| The Service Account's Client ID from the Google Developer's Console. This is optional and is only used as a reference for yourself to prevent needing to check the Developer's Console for the ID when verifying API Client Access. | ||
| .PARAMETER Webhook | ||
| Web | ||
| .PARAMETER Scope | ||
| The scope at which you would like to set this config. | ||
| Available values are: | ||
| * Machine (this would create the config in a location accessible by all users on the machine) | ||
| * Enterprise (this would create the config in the Roaming AppData folder for the user or it's *nix equivalent) | ||
| * User (this would create the config in the Local AppData folder for the user or it's *nix equivalent) | ||
| .PARAMETER SetAsDefaultConfig | ||
| If passed, sets the ConfigName as the default config to load on module import | ||
| .PARAMETER NoImport | ||
| The default behavior when using Set-PSGSuiteConfig is that the new/updated config is imported as active. If -NoImport is passed, this saves the config but retains the previously loaded config as active. | ||
| .EXAMPLE | ||
| Set-PSGSuiteConfig -ConfigName "personal" -P12KeyPath C:\Keys\PersonalKey.p12 -AppEmail "[email protected]" -AdminEmail "[email protected]" -CustomerID "C83030001" -Domain "domain.com" -Preference CustomerID -ServiceAccountClientID 1175798883298324983498 -SetAsDefaultConfig | ||
|
|
@@ -87,6 +90,9 @@ function Set-PSGSuiteConfig { | |
| $ClientSecretsPath, | ||
| [parameter(Mandatory = $false,ValueFromPipelineByPropertyName = $true)] | ||
| [string] | ||
| $ClientSecrets, | ||
| [parameter(Mandatory = $false,ValueFromPipelineByPropertyName = $true)] | ||
| [string] | ||
| $AppEmail, | ||
| [parameter(Mandatory = $false,ValueFromPipelineByPropertyName = $true)] | ||
| [string] | ||
|
|
@@ -149,7 +155,7 @@ function Set-PSGSuiteConfig { | |
| } | ||
| } | ||
| Write-Verbose "Setting config name '$ConfigName'" | ||
| $configParams = @('P12KeyPath','ClientSecretsPath','AppEmail','AdminEmail','CustomerID','Domain','Preference','ServiceAccountClientID','Webhook','Space') | ||
| $configParams = @('P12KeyPath','ClientSecretsPath','ClientSecrets','AppEmail','AdminEmail','CustomerID','Domain','Preference','ServiceAccountClientID','Webhook','Space') | ||
| if ($SetAsDefaultConfig -or !$configHash["DefaultConfig"]) { | ||
| $configHash["DefaultConfig"] = $ConfigName | ||
| } | ||
|
|
@@ -158,6 +164,10 @@ function Set-PSGSuiteConfig { | |
| } | ||
| foreach ($key in ($PSBoundParameters.Keys | Where-Object {$configParams -contains $_})) { | ||
| switch ($key) { | ||
| ClientSecretsPath { | ||
| $configHash["$ConfigName"][$key] = (Encrypt $PSBoundParameters[$key]) | ||
| $configHash["$ConfigName"]['ClientSecrets'] = (Encrypt $(Get-Content $PSBoundParameters[$key] -Raw)) | ||
| } | ||
| Webhook { | ||
| if ($configHash["$ConfigName"].Keys -notcontains 'Chat') { | ||
| $configHash["$ConfigName"]['Chat'] = @{ | ||
|
|
@@ -198,4 +208,4 @@ function Set-PSGSuiteConfig { | |
| Get-PSGSuiteConfig -ConfigName $ConfigName -Verbose:$false | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.