Merge branch '1.8.x' into feat-appwrite-auth

Dockerfile

@@ -98,6 +98,7 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 # Enable Extensions
 RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
 RUN if [ "$DEBUG" = "true" ]; then mkdir -p /tmp/xdebug; fi
+RUN if [ "$DEBUG" = "true" ]; then apk add --update --no-cache openssh-client github-cli; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20230831/xdebug.so; fi
 

app/controllers/api/locale.php

@@ -37,7 +37,6 @@ App::get('/v1/locale')
         $currencies = Config::getParam('locale-currencies');
         $output = [];
         $ip = $request->getIP();
-        $time = (60 * 60 * 24 * 45); // 45 days cache
 
         $output['ip'] = $ip;
 
@@ -68,10 +67,6 @@ App::get('/v1/locale')
             $output['currency'] = $currency;
         }
 
-        $response
-            ->addHeader('Cache-Control', 'public, max-age=' . $time)
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-        ;
         $response->dynamic(new Document($output), Response::MODEL_LOCALE);
     });
 

docker-compose.override.yml

@@ -0,0 +1,7 @@
+services:
+  appwrite:
+    # volumes:
+    #   - ~/.ssh:/root/.ssh
+    environment:
+      - GH_TOKEN=
+      - GIT_EMAIL=

docs/tutorials/release-sdks.md

@@ -26,34 +26,27 @@ Before releasing SDKs, you need to:
 
 To enable SDK releases via GitHub, you need to mount SSH keys and configure GitHub authentication in your Docker environment.
 
-#### Update Dockerfile
+#### Update docker-compose.override.yml
 
-Add the following configuration to your `Dockerfile`:
-
-```dockerfile
-ARG GH_TOKEN
-ENV GH_TOKEN=your_github_token_here
-RUN git config --global user.email "your-email@example.com"
-RUN apk add --update --no-cache openssh-client github-cli
-```
-
-Replace:
-- `your_github_token_here` with your GitHub personal access token (with appropriate permissions)
-- `your-email@example.com` with your Git email address
-
-#### Update docker-compose.yml
-
-Add the SSH key volume mount to the `appwrite` service in `docker-compose.yml`:
+Update `docker-compose.override.yml` to mount SSH keys and set environment variables for the `appwrite` service:
 
 ```yaml
 services:
   appwrite:
     volumes:
       - ~/.ssh:/root/.ssh
-      # ... other volumes
+    environment:
+      - GH_TOKEN=your_github_token_here
+      - GIT_EMAIL=your-email@example.com
 ```
 
-This mounts your SSH keys from the host machine, allowing the container to authenticate with GitHub.
+Uncomment the volumes section.
+
+Replace:
+- `your_github_token_here` with your GitHub personal access token (with appropriate permissions)
+- `your-email@example.com` with your Git email address
+
+This mounts your SSH keys from the host machine and sets the GitHub token and email as environment variables, allowing the container to authenticate with GitHub. The git configuration is handled automatically at runtime.
 
 ### Updating Specs
 

src/Appwrite/Auth/OAuth2/Google.php

@@ -53,7 +53,9 @@ class Google extends OAuth2
             'redirect_uri' => $this->callback,
             'scope' => \implode(' ', $this->getScopes()),
             'state' => \json_encode($this->state),
-            'response_type' => 'code'
+            'response_type' => 'code',
+            'access_type' => 'offline',
+            'prompt' => 'consent'
         ]);
     }
 

src/Appwrite/Platform/Tasks/SDKs.php

@@ -259,6 +259,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                 }
 
                 if ($createRelease) {
+                    Console::execute('git config --global user.email "$GIT_EMAIL"', stdin: '', stdout: '', stderr: '');
+
                     $releaseVersion = $language['version'];
 
                     $repoName = $language['gitUserName'] . '/' . $language['gitRepoName'];

src/Appwrite/Vcs/Comment.php

@@ -11,9 +11,36 @@ class Comment
 {
     // TODO: Add more tips
     protected array $tips = [
-        'Appwrite has a Discord community with over 16 000 members.',
-        'You can use Avatars API to generate QR code for any text or URLs.',
-        'Cursor pagination performs better than offset pagination when loading further pages.',
+        'Appwrite has crossed the 50K GitHub stars milestone with hundreds of active contributors',
+        'Our Discord community has grown to 24K developers, and counting',
+        'Sites auto-generate unique domains with the pattern https://randomstring.appwrite.network',
+        'Every Git commit and branch gets its own deployment URL automatically',
+        'Custom domains work with both CNAME for subdomains and NS records for apex domains',
+        'HTTPS and SSL certificates are handled automatically for all your Sites',
+        'Functions can run for up to 15 minutes before timing out',
+        'Schedule functions to run as often as every minute with cron expressions',
+        'Environment variables can be scoped per function or shared across your project',
+        'Function scopes give you fine-grained control over API permissions',
+        'Sites support three domain rule types: Active deployment, Git branch, and Redirect',
+        'Preview deployments create instant URLs for every branch and commit',
+        'Trigger functions via HTTP, SDKs, events, webhooks, or scheduled cron jobs',
+        'Each function runs in its own isolated container with custom environment variables',
+        'Build commands execute in runtime containers during deployment',
+        'Dynamic API keys are generated automatically for each function execution',
+        'JWT tokens let functions act on behalf of users while preserving their permissions',
+        'Storage files get ClamAV malware scanning and encryption by default',
+        'Roll back Sites deployments instantly by switching between versions',
+        'Git integration provides automatic deployments with optional PR comments',
+        'Silent mode disables those chatty PR comments if you prefer peace and quiet',
+        'Environment variable changes require redeployment to take effect',
+        'SSR frameworks are fully supported with configurable build runtimes',
+        'Global CDN and DDoS protection come free with every Sites deployment',
+        'Deploy functions via zip upload or connect directly to your Git repo',
+        'Realtime gives you live updates for users, storage, functions, and databases',
+        'GraphQL API works alongside REST and WebSocket protocols',
+        'Messaging handles push notifications, emails, and SMS through one unified API',
+        'Teams feature lets you group users with membership management and role permissions',
+        'MCP server integration brings LLM superpowers to Claude Desktop and Cursor IDE',
     ];
 
     protected string $statePrefix = '[appwrite]: #';