Merge pull request #4704 from appwrite/fix-migration-usage-region

fix: migration for stats region

CHANGES.md

@@ -1,7 +1,11 @@
-# Version TBD
+# Version 1.1.1
 
 ## Bugs
 - Fix Deletes worker using incorrect device for file deletion [#4662](https://github.com/appwrite/appwrite/pull/4662)
+- Fix Migration for Stats adding the region attribute [#4704](https://github.com/appwrite/appwrite/pull/4704)
+- Fix Migration stopping scheduled functions [#4704](https://github.com/appwrite/appwrite/pull/4704)
+- Fix Migration enabling OAuth providers with data by default [#4704](https://github.com/appwrite/appwrite/pull/4704)
+- Fix Error pages when OAuth providers are disabled [#4704](https://github.com/appwrite/appwrite/pull/4704)
 
 # Version 1.1.0
 ## Features

app/controllers/general.php

@@ -394,11 +394,10 @@ App::error()
     ->inject('utopia')
     ->inject('request')
     ->inject('response')
-    ->inject('layout')
     ->inject('project')
     ->inject('logger')
     ->inject('loggerBreadcrumbs')
-    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, View $layout, Document $project, ?Logger $logger, array $loggerBreadcrumbs) {
+    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, array $loggerBreadcrumbs) {
 
         $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
         $route = $utopia->match($request);
@@ -538,9 +537,10 @@ App::error()
         $template = ($route) ? $route->getLabel('error', null) : null;
 
         if ($template) {
-            $comp = new View($template);
+            $layout = new View($template);
 
-            $comp
+            $layout
+                ->setParam('title', $project->getAttribute('name') . ' - Error')
                 ->setParam('development', App::isDevelopment())
                 ->setParam('projectName', $project->getAttribute('name'))
                 ->setParam('projectURL', $project->getAttribute('url'))
@@ -549,14 +549,6 @@ App::error()
                 ->setParam('trace', $trace)
             ;
 
-            $layout
-                ->setParam('title', $project->getAttribute('name') . ' - Error')
-                ->setParam('description', 'No Description')
-                ->setParam('body', $comp)
-                ->setParam('version', $version)
-                ->setParam('litespeed', false)
-            ;
-
             $response->html($layout->render());
         }
 
@@ -637,7 +629,6 @@ App::get('/.well-known/acme-challenge')
     });
 
 include_once __DIR__ . '/shared/api.php';
-include_once __DIR__ . '/shared/web.php';
 
 foreach (Config::getParam('services', []) as $service) {
     include_once $service['controller'];

app/controllers/shared/web.php

@@ -1,64 +0,0 @@
-<?php
-
-use Utopia\App;
-use Utopia\Config\Config;
-use Appwrite\Utopia\Response;
-use Appwrite\Utopia\Request;
-use Appwrite\Utopia\View;
-
-App::init()
-    ->groups(['web'])
-    ->inject('utopia')
-    ->inject('request')
-    ->inject('response')
-    ->inject('layout')
-    ->action(function (App $utopia, Request $request, Response $response, View $layout) {
-        /* AJAX check  */
-        if (!empty($request->getQuery('version', ''))) {
-            $layout->setPath(__DIR__ . '/../../views/layouts/empty.phtml');
-        }
-
-        $port = $request->getPort();
-        $protocol = $request->getProtocol();
-        $domain = $request->getHostname();
-
-        $layout
-            ->setParam('title', APP_NAME)
-            ->setParam('protocol', $protocol)
-            ->setParam('domain', $domain)
-            ->setParam('endpoint', $protocol . '://' . $domain . ($port != 80 && $port != 443 ? ':' . $port : ''))
-            ->setParam('home', App::getEnv('_APP_HOME'))
-            ->setParam('setup', App::getEnv('_APP_SETUP'))
-            ->setParam('class', 'unknown')
-            ->setParam('icon', '/images/favicon.png')
-            ->setParam('roles', [
-                ['type' => 'owner', 'label' => 'Owner'],
-                ['type' => 'developer', 'label' => 'Developer'],
-                ['type' => 'admin', 'label' => 'Admin'],
-            ])
-            ->setParam('runtimes', Config::getParam('runtimes'))
-            ->setParam('mode', App::getMode())
-        ;
-
-        $time = (60 * 60 * 24 * 45); // 45 days cache
-
-        $response
-            ->addHeader('Cache-Control', 'public, max-age=' . $time)
-            ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $time) . ' GMT') // 45 days cache
-            ->addHeader('X-Frame-Options', 'SAMEORIGIN') // Avoid console and homepage from showing in iframes
-            ->addHeader('X-XSS-Protection', '1; mode=block; report=/v1/xss?url=' . \urlencode($request->getURI()))
-            ->addHeader('X-UA-Compatible', 'IE=Edge') // Deny IE browsers from going into quirks mode
-        ;
-
-        $route = $utopia->match($request);
-
-        $route->label('error', __DIR__ . '/../../views/general/error.phtml');
-
-        $scope = $route->getLabel('scope', '');
-
-        $layout
-            ->setParam('version', App::getEnv('_APP_VERSION', 'UNKNOWN'))
-            ->setParam('isDev', App::isDevelopment())
-            ->setParam('class', $scope)
-        ;
-    });

app/init.php

@@ -730,13 +730,6 @@ App::setResource('loggerBreadcrumbs', function () {
 
 App::setResource('register', fn() => $register);
 
-App::setResource('layout', function ($locale) {
-    $layout = new View(__DIR__ . '/views/layouts/default.phtml');
-    $layout->setParam('locale', $locale);
-
-    return $layout;
-}, ['locale']);
-
 App::setResource('locale', fn() => new Locale(App::getEnv('_APP_LOCALE', 'en')));
 
 // Queues

app/tasks/migrate.php

@@ -9,10 +9,20 @@ use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\Text;
 
+function clearProjectsCache(Redis $redis, Document $project)
+{
+    try {
+        $redis->del($redis->keys("cache-_{$project->getInternalId()}:*"));
+    } catch (\Throwable $th) {
+        Console::error('Failed to clear project ("' . $project->getId() . '") cache with error: ' . $th->getMessage());
+    }
+}
+
 $cli
     ->task('migrate')
     ->param('version', APP_VERSION_STABLE, new Text(32), 'Version to migrate to.', true)
@@ -30,7 +40,7 @@ $cli
 
         $db = $register->get('db', true);
         $redis = $register->get('cache', true);
-        $redis->flushAll();
+
         $cache = new Cache(new RedisCache($redis));
 
         $projectDB = new Database(new MariaDB($db), $cache);
@@ -70,6 +80,8 @@ $cli
                     continue;
                 }
 
+                clearProjectsCache($redis, $project);
+
                 try {
                     $migration
                         ->setProject($project, $projectDB, $consoleDB)
@@ -78,6 +90,8 @@ $cli
                     throw $th;
                     Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
                 }
+
+                clearProjectsCache($redis, $project);
             }
 
             $sum = \count($projects);
@@ -90,6 +104,5 @@ $cli
         }
 
         Swoole\Event::wait(); // Wait for Coroutines to finish
-        $redis->flushAll();
         Console::success('Data Migration Completed');
     });

app/views/general/error.phtml

@@ -6,44 +6,60 @@ $message = $this->getParam('message', '');
 $trace = $this->getParam('trace', []);
 $projectName = $this->getParam('projectName', '');
 $projectURL = $this->getParam('projectURL', '');
+$title = $this->getParam('title', '')
 ?>
 
-<section class="zone large margin-top padding">
-    <h1 class="margin-bottom">Error <?php echo $code; ?></h1>
+<!DOCTYPE html>
+<html lang="en">
 
-    <p><?php echo $message; ?></p>
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title><?php echo $title; ?></title>
+</head>
 
-    <small>Error ID: <?php echo $errorID; ?></small>
+<body>
 
-    <?php if (!empty($projectURL)): ?>
-        <hr class="margin-top margin-bottom" />
+    <section>
+        <h1>Error <?php echo $code; ?></h1>
 
-        <p><a href="<?php echo $this->escape($projectURL); ?>" rel="noopener">Back to <?php echo $projectName; ?></a></p>
-    <?php endif; ?>
+        <p><?php echo $message; ?></p>
 
-    <?php if ($development): ?>
-        <div class="margin-top-xl">
-            
-            <h2 class="margin-bottom-large">Error Trace</h2>
+        <small>Error ID: <?php echo $errorID; ?></small>
+
+        <?php if (!empty($projectURL)) : ?>
+            <hr />
+
+            <p><a href="<?php echo $this->escape($projectURL); ?>" rel="noopener">Back to <?php echo $projectName; ?></a></p>
+        <?php endif; ?>
+
+        <?php if ($development) : ?>
+            <div>
+
+                <h2>Error Trace</h2>
+
+                <?php foreach ($trace as $log) : ?>
+                    <table>
+                        <?php foreach ($log as $key => $value) : ?>
+                            <tr>
+                                <td style="width: 120px"><?php echo $key; ?></td>
+                                <td>
+                                    <?php if (is_array($value)) : ?>
+                                        <?php var_dump($value); ?>
+                                    <?php else : ?>
+                                        <?php echo $value; ?>
+                                    <?php endif; ?>
+                                </td>
+                            </tr>
 
-            <?php foreach($trace as $log): ?>
-                <table class="margin-bottom-xl">
-                    <?php foreach($log as $key => $value): ?>
-                        <tr>
-                            <td style="width: 120px"><?php echo $key; ?></td>
-                            <td>
-                                <?php if (is_array($value)): ?>
-                                    <?php var_dump($value); ?>
-                                <?php else: ?>
-                                    <?php echo $value; ?>
-                                <?php endif; ?>
-                            </td>
-                        </tr>
-                        
                         <?php endforeach; ?>
-                </table>
-            <?php endforeach; ?>
-        </div>
-    <?php endif; ?>
+                    </table>
+                <?php endforeach; ?>
+            </div>
+        <?php endif; ?>
 
-</section>
+    </section>
+</body>
+
+</html>

src/Appwrite/Migration/Version/V16.php

@@ -5,6 +5,7 @@ namespace Appwrite\Migration\Version;
 use Appwrite\Auth\Auth;
 use Appwrite\Migration\Migration;
 use Utopia\CLI\Console;
+use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 
@@ -50,7 +51,7 @@ class V16 extends Migration
                 case 'sessions':
                     try {
                         /**
-                         * Create 'compression' attribute
+                         * Create 'expire' attribute
                          */
                         $this->projectDB->deleteAttribute($id, 'expire');
                     } catch (\Throwable $th) {
@@ -79,6 +80,17 @@ class V16 extends Migration
                     }
                     break;
 
+                case 'stats':
+                    try {
+                        /**
+                         * Create 'region' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'region');
+                    } catch (\Throwable $th) {
+                        Console::warning("'region' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
                 default:
                     break;
             }
@@ -108,6 +120,20 @@ class V16 extends Migration
                 $document->setAttribute('auths', array_merge($document->getAttribute('auths', []), [
                     'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG
                 ]));
+
+
+                $authProviders = $document->getAttribute('authProviders', []);
+
+                foreach (Config::getParam('providers') as $provider => $value) {
+                    if (!$value['enabled']) {
+                        continue;
+                    }
+
+                    if (($authProviders[$provider . 'Appid'] ?? false) && ($authProviders[$provider . 'Secret'] ?? false)) {
+                        $authProviders[$provider . 'Enabled'] = true;
+                    }
+                }
+
                 break;
         }