Merge pull request #1 from mrmueller/main

Allow Edge, Improve authentication
pcgeek86 · Jul 9, 2023 · ac0ff58 · ac0ff58
2 parents d7581dc + e3f0006
commit ac0ff58
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/functions/Get-YouTubeChannel.ps1 b/functions/Get-YouTubeChannel.ps1
@@ -9,7 +9,8 @@ function Get-YouTubeChannel {
   [CmdletBinding()]
   param (
     [Parameter(ParameterSetName = 'ChannelId')]
-    [string[]] $Id
+    [string[]] $Id,
+    [switch] $Raw
   )
   $Uri = 'https://www.googleapis.com/youtube/v3/channels?part=brandingSettings,contentDetails,contentOwnerDetails,id,snippet,localizations,statistics,status,topicDetails'
 
@@ -24,4 +25,4 @@ function Get-YouTubeChannel {
 
   if ($Raw) { return $Result }
   $Result.items
-}
+}
diff --git a/functions/Grant-YouTubeOauth.ps1 b/functions/Grant-YouTubeOauth.ps1
@@ -17,23 +17,28 @@ function Grant-YoutubeOauth {
     Start-PodeServer -ScriptBlock {
       Add-PodeEndpoint -Port 8000 -Protocol Http
       Add-PodeRoute -Method Get -Path /auth/complete -ScriptBlock {
-        @{
-          access_token = $WebEvent.Query['access_token']
-        } | ConvertTo-Json | Set-Content -Path $HOME/.pwsh.youtube.oauth.json
-
         $Response = @'
         <h1 style="font-family: sans-serif;">Authentication Complete</h1>
         <h3 style="font-family: sans-serif;">You may close this browser window.</h3>
         <script>
           console.log(window.location.hash);
           let access_token_regex = /access_token=(?<access_token>.*?)&token_type/;
           let result = access_token_regex.exec(window.location.hash);
-          fetch(`/auth/complete?access_token=${result.groups.access_token}`);
+          fetch(`/auth/receive?access_token=${result.groups.access_token}`);
         </script>
 '@
-        Write-PodeHtmlResponse -Value $Response
+        Write-PodeHtmlResponse -Value $Response -StatusCode 200
+      }
+
+      Add-Poderoute -Method Get -Path /auth/receive -ScriptBlock{
+        Out-PodeVariable -Name access_token -Value $WebEvent.Query['access_token']
+        Close-PodeServer
       }
-    }
+    }    
+    $token = @{
+      access_token = $access_token
+    } 
+    $token | ConvertTo-Json | Out-File -Path $HOME/.pwsh.youtube.oauth.json
   }
 
   $Client = Get-Content -Path $ConfigPath | ConvertFrom-Json
@@ -43,16 +48,10 @@ function Grant-YoutubeOauth {
     'https://www.googleapis.com/auth/youtube.force-ssl'
     'https://www.googleapis.com/auth/youtube.readonly'
   )
-  $Uri = 'https://accounts.google.com/o/oauth2/v2/auth?include_granted_scopes=true&response_type=token&client_id={0}&redirect_uri={1}&scope={3}&state={2}' -f $Client.client_id, $RedirectUri, (New-Guid).Guid, ($ScopeList -join ' ')
+  $scopesURI = [System.Web.HttpUtility]::UrlEncode($ScopeList -join ' ')
+  $Uri = 'https://accounts.google.com/o/oauth2/v2/auth?include_granted_scopes=true&response_type=token&client_id={0}&redirect_uri={1}&scope={2}&state={2}' -f $Client.client_id, $RedirectUri, ($scopesURI), (New-Guid).Guid
 
   $Browser = $BrowserCommand ? $BrowserCommand : (Find-Browser)
   Write-Verbose -Message ('Browser command line is: ' -f $Browser)
-  Start-Process -FilePath $Browser -ArgumentList ('"{0}"' -f $Uri) -Wait
-
-  if (!$IsMacOS) {
-    Stop-Job -Name $JobName
-  }
-  else {
-    Write-Warning -Message 'Please manually stop the Background Job running the Pode web server after completing authentication. Cannot wait for browser process to complete on MacOS.'
-  }
-}
+  Start-Process -FilePath $Browser -ArgumentList ('"{0}"' -f $Uri)
+}
diff --git a/functions/private/Find-Browser.ps1 b/functions/private/Find-Browser.ps1
@@ -24,6 +24,7 @@ function Find-Browser {
     'firefox.exe'
     'chrome'
     'firefox'
+    'MicrosoftEdge.exe'
   )
   foreach ($Command in $CommandList) {
     if (Get-Command -Name $Command) { return $Command }