Merge branch 'master' into score-recent

ppy · Jan 30, 2024 · d6ccbb0 · d6ccbb0
2 parents 671d3a9 + baaac81
commit d6ccbb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/Models/OAuth/Token.php b/app/Models/OAuth/Token.php
@@ -236,6 +236,8 @@ private function setVerifiedState(): void
     {
         // client credential doesn't have user attached and auth code is
         // already verified during grant process
-        $this->verified ??= $this->user === null || !$this->client->password_client;
+        $this->verified ??= $GLOBALS['cfg']['osu']['user']['bypass_verification']
+            || $this->user === null
+            || !$this->client->password_client;
     }
 }
diff --git a/tests/Browser/SanityTest.php b/tests/Browser/SanityTest.php
@@ -281,6 +281,9 @@ private static function filterLog(array $log)
             } elseif ($line['message'] === "security - Error with Permissions-Policy header: Unrecognized feature: 'ch-ua-form-factor'.") {
                 // we don't use ch-ua-* crap and this error is thrown by youtube.com as of 2023-05-16
                 continue;
+            } elseif (str_ends_with($line['message'], ' Third-party cookie will be blocked. Learn more in the Issues tab.')) {
+                // thanks, youtube
+                continue;
             }
 
             $return[] = $line;