Merge remote-tracking branch 'origin/main' into work-176

Author: abnegate

composer.json

@@ -22,10 +22,11 @@
         "check": "./vendor/bin/phpstan analyse --level 3 src tests --memory-limit 2G"
     },
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.2",
         "ext-curl": "*",
         "ext-openssl": "*",
-        "appwrite/appwrite": "19.*",
+
+        "appwrite/appwrite": "24.*",
         "utopia-php/database": "5.*",
         "utopia-php/storage": "2.*",
         "utopia-php/dsn": "0.2.*",
@@ -38,9 +39,6 @@
         "laravel/pint": "1.*",
         "phpstan/phpstan": "1.*"
     },
-    "platform": {
-        "php": "8.1"
-    },
     "config": {
         "allow-plugins": {
             "php-http/discovery": true,

composer.lock

@@ -2,20 +2,69 @@
 
 namespace Utopia\Migration\Destinations;
 
-/**
- * Behavior when a destination row with an existing ID is encountered.
- */
+enum SchemaAction
+{
+    case Create;
+    case Skip;
+    case Overwrite;
+}
+
 enum OnDuplicate: string
 {
     case Fail = 'fail';
     case Skip = 'skip';
-    case Upsert = 'upsert';
+    case Overwrite = 'overwrite';
 
     /**
-     * @return array<string>
+     * @return list<string>
      */
     public static function values(): array
     {
-        return \array_map(fn (self $case) => $case->value, self::cases());
+        return \array_values(\array_map(fn (self $case) => $case->value, self::cases()));
+    }
+
+    /**
+     * Coarse routing for re-migration. The caller follows up with a spec-match
+     * check that overrides Overwrite to Skip when source and dest
+     * already have identical spec — see DestinationAppwrite for the full flow.
+     */
+    public function resolveSchemaAction(
+        bool $exists,
+        ?string $sourceUpdatedAt = null,
+        ?string $destUpdatedAt = null,
+    ): SchemaAction {
+        if (!$exists) {
+            return SchemaAction::Create;
+        }
+        return match ($this) {
+            self::Fail   => SchemaAction::Create,
+            self::Skip   => SchemaAction::Skip,
+            self::Overwrite => $this->sourceIsNewer($sourceUpdatedAt, $destUpdatedAt)
+                ? SchemaAction::Overwrite
+                : SchemaAction::Skip,
+        };
+    }
+
+    private function sourceIsNewer(?string $source, ?string $dest): bool
+    {
+        $src = $this->parseTimestamp($source);
+        $dst = $this->parseTimestamp($dest);
+        return $src !== null && $dst !== null && $src > $dst;
+    }
+
+    /**
+     * strtotime accepts '0000-00-00' leniently (returns a large negative epoch,
+     * not false), so non-positive epochs are rejected too.
+     */
+    private function parseTimestamp(?string $value): ?int
+    {
+        if ($value === null || $value === '') {
+            return null;
+        }
+        $epoch = \strtotime($value);
+        if ($epoch === false || $epoch <= 0) {
+            return null;
+        }
+        return $epoch;
     }
 }

src/Migration/Destinations/Appwrite.php

@@ -69,10 +69,35 @@ abstract class Resource implements \JsonSerializable
 
     public const TYPE_HASH = 'hash';
 
+    public const TYPE_AUTH_METHODS = 'auth-methods';
+
+    public const TYPE_POLICIES = 'policies';
+
+    // One type shared by all OAuth2 provider Resource classes (dispatch is by
+    // `instanceof` on the destination). A per-provider type would overflow the
+    // migration document's 3KB `statusCounters` column when OAuth is selected.
+    public const TYPE_OAUTH2_PROVIDER = 'oauth2-provider';
+
     public const TYPE_ENVIRONMENT_VARIABLE = 'environment-variable';
 
-    public const TYPE_SUBSCRIBER = 'subscriber';
+    // Integrations
+    public const TYPE_PLATFORM = 'platform';
+    public const TYPE_API_KEY = 'api-key';
+    public const TYPE_WEBHOOK = 'webhook';
+    public const TYPE_SMTP = 'smtp';
 
+    // Project (per-project singleton/settings resources)
+    public const TYPE_PROJECT_VARIABLE = 'project-variable';
+    public const TYPE_PROJECT_PROTOCOLS = 'project-protocols';
+    public const TYPE_PROJECT_LABELS = 'project-labels';
+    public const TYPE_PROJECT_SERVICES = 'project-services';
+    public const TYPE_PROJECT_EMAIL_TEMPLATE = 'project-email-template';
+
+    // Domains
+    public const TYPE_RULE = 'rule';
+
+    // Messaging
+    public const TYPE_SUBSCRIBER = 'subscriber';
     public const TYPE_MESSAGE = 'message';
 
     // Backups
@@ -109,6 +134,19 @@ abstract class Resource implements \JsonSerializable
         self::TYPE_ENVIRONMENT_VARIABLE,
         self::TYPE_TEAM,
         self::TYPE_MEMBERSHIP,
+        self::TYPE_AUTH_METHODS,
+        self::TYPE_POLICIES,
+        self::TYPE_OAUTH2_PROVIDER,
+        self::TYPE_PLATFORM,
+        self::TYPE_API_KEY,
+        self::TYPE_WEBHOOK,
+        self::TYPE_SMTP,
+        self::TYPE_PROJECT_VARIABLE,
+        self::TYPE_PROJECT_PROTOCOLS,
+        self::TYPE_PROJECT_LABELS,
+        self::TYPE_PROJECT_SERVICES,
+        self::TYPE_PROJECT_EMAIL_TEMPLATE,
+        self::TYPE_RULE,
         self::TYPE_PROVIDER,
         self::TYPE_TOPIC,
         self::TYPE_SUBSCRIBER,

src/Migration/Destinations/OnDuplicate.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Utopia\Migration\Resources\Auth;
+
+use Utopia\Migration\Resource;
+use Utopia\Migration\Transfer;
+
+/**
+ * Singleton resource representing the project's auth-method flags.
+ * One per project; the destination updates the project doc, not a new row.
+ */
+class AuthMethods extends Resource
+{
+    public function __construct(
+        string $id,
+        private readonly bool $emailPassword = true,
+        private readonly bool $magicURL = true,
+        private readonly bool $emailOtp = true,
+        private readonly bool $anonymous = true,
+        private readonly bool $invites = true,
+        private readonly bool $jwt = true,
+        private readonly bool $phone = true,
+        string $createdAt = '',
+        string $updatedAt = '',
+    ) {
+        $this->id = $id;
+        $this->createdAt = $createdAt;
+        $this->updatedAt = $updatedAt;
+    }
+
+    /**
+     * @param array<string, mixed> $array
+     */
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            $array['id'],
+            (bool) ($array['emailPassword'] ?? true),
+            (bool) ($array['magicURL'] ?? true),
+            (bool) ($array['emailOtp'] ?? true),
+            (bool) ($array['anonymous'] ?? true),
+            (bool) ($array['invites'] ?? true),
+            (bool) ($array['jwt'] ?? true),
+            (bool) ($array['phone'] ?? true),
+            createdAt: $array['createdAt'] ?? '',
+            updatedAt: $array['updatedAt'] ?? '',
+        );
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'id' => $this->id,
+            'emailPassword' => $this->emailPassword,
+            'magicURL' => $this->magicURL,
+            'emailOtp' => $this->emailOtp,
+            'anonymous' => $this->anonymous,
+            'invites' => $this->invites,
+            'jwt' => $this->jwt,
+            'phone' => $this->phone,
+            'createdAt' => $this->createdAt,
+            'updatedAt' => $this->updatedAt,
+        ];
+    }
+
+    public static function getName(): string
+    {
+        return Resource::TYPE_AUTH_METHODS;
+    }
+
+    public function getGroup(): string
+    {
+        return Transfer::GROUP_AUTH;
+    }
+
+    public function getEmailPassword(): bool
+    {
+        return $this->emailPassword;
+    }
+
+    public function getMagicURL(): bool
+    {
+        return $this->magicURL;
+    }
+
+    public function getEmailOtp(): bool
+    {
+        return $this->emailOtp;
+    }
+
+    public function getAnonymous(): bool
+    {
+        return $this->anonymous;
+    }
+
+    public function getInvites(): bool
+    {
+        return $this->invites;
+    }
+
+    public function getJwt(): bool
+    {
+        return $this->jwt;
+    }
+
+    public function getPhone(): bool
+    {
+        return $this->phone;
+    }
+}