[Scummvm-git-logs] scummvm-sites cloud--cloud-2023-change -> 00101b6e7e5aadf411fe33a129405da8ea4edb30

Tkachov noreply at scummvm.org
Sat Apr 1 22:10:29 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-sites' repo located at https://github.com/scummvm/scummvm-sites .

Summary:
00101b6e7e CLOUD: minor fixes


Commit: 00101b6e7e5aadf411fe33a129405da8ea4edb30
    https://github.com/scummvm/scummvm-sites/commit/00101b6e7e5aadf411fe33a129405da8ea4edb30
Author: Alexander Tkachov (alexander at tkachov.ru)
Date: 2023-04-02T00:10:25+02:00

Commit Message:
CLOUD: minor fixes

- refer to JSON response as "JSON code", not just "code", like we do in application;
- reset $_SESSION value if old flow is used, in case new flow was used in that session already, so the final step executes in the old flow correctly.

Changed paths:
    src/routes.php
    templates/connect.phtml


diff --git a/src/routes.php b/src/routes.php
index c1c1fa7..bb15733 100644
--- a/src/routes.php
+++ b/src/routes.php
@@ -88,6 +88,7 @@ return function (App $app) {
                 // If we don't have an authorization code then get one
                 $authUrl = $providerAndScope['provider']->getAuthorizationUrl($providerAndScope['scope']);
                 $_SESSION['oauth2state'] = $providerAndScope['provider']->getState();
+                $_SESSION['newFlow'] = "270";
 
                 return $response->withRedirect($authUrl);
 
diff --git a/templates/connect.phtml b/templates/connect.phtml
index d337b3f..d052c65 100644
--- a/templates/connect.phtml
+++ b/templates/connect.phtml
@@ -40,7 +40,7 @@
 
                 <br/><br/>
                 <p><b>2. Use Manual mode</b></p>
-                <p>In ScummVM, go back and use Manual mode in connection wizard.<br/>Copy this code in there:</p>
+                <p>In ScummVM, go back and use Manual mode in connection wizard.<br/>Copy this JSON code in there:</p>
                 <textarea id="json" readonly></textarea>
             </div>
             <div class="content hidden" id="state_connect_failed">




More information about the Scummvm-git-logs mailing list