diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 3daf69a3f3..b55f140413 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -2,9 +2,7 @@ use Ahc\Jwt\JWT; use Appwrite\Auth\Auth; -use Appwrite\Auth\MFA\Challenge; use Appwrite\Auth\MFA\Type; -use Appwrite\Auth\MFA\Type\TOTP; use Appwrite\Auth\OAuth2\Exception as OAuth2Exception; use Appwrite\Auth\Phrase; use Appwrite\Auth\Validator\Password; @@ -4158,943 +4156,6 @@ App::put('/v1/account/verifications/phone') $response->dynamic($verificationDocument, Response::MODEL_TOKEN); }); -App::patch('/v1/account/mfa') - ->desc('Update MFA') - ->groups(['api', 'account']) - ->label('event', 'users.[userId].update.mfa') - ->label('scope', 'account') - ->label('audits.event', 'user.update') - ->label('audits.resource', 'user/{response.$id}') - ->label('audits.userId', '{response.$id}') - ->label('sdk', new Method( - namespace: 'account', - group: 'mfa', - name: 'updateMFA', - description: '/docs/references/account/update-mfa.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_USER, - ) - ], - contentType: ContentType::JSON - )) - ->param('mfa', null, new Boolean(), 'Enable or disable MFA.') - ->inject('requestTimestamp') - ->inject('response') - ->inject('user') - ->inject('session') - ->inject('dbForProject') - ->inject('queueForEvents') - ->action(function (bool $mfa, ?\DateTime $requestTimestamp, Response $response, Document $user, Document $session, Database $dbForProject, Event $queueForEvents) { - - $user->setAttribute('mfa', $mfa); - - $user = $dbForProject->updateDocument('users', $user->getId(), $user); - - if ($mfa) { - $factors = $session->getAttribute('factors', []); - $totp = TOTP::getAuthenticatorFromUser($user); - if ($totp !== null && $totp->getAttribute('verified', false)) { - $factors[] = Type::TOTP; - } - if ($user->getAttribute('email', false) && $user->getAttribute('emailVerification', false)) { - $factors[] = Type::EMAIL; - } - if ($user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false)) { - $factors[] = Type::PHONE; - } - $factors = \array_values(\array_unique($factors)); - - $session->setAttribute('factors', $factors); - $dbForProject->updateDocument('sessions', $session->getId(), $session); - } - - $queueForEvents->setParam('userId', $user->getId()); - - $response->dynamic($user, Response::MODEL_ACCOUNT); - }); - -App::get('/v1/account/mfa/factors') - ->desc('List factors') - ->groups(['api', 'account', 'mfa']) - ->label('scope', 'account') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'listMfaFactors', - description: '/docs/references/account/list-mfa-factors.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_FACTORS, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.listMFAFactors', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'listMFAFactors', - description: '/docs/references/account/list-mfa-factors.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_FACTORS, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->inject('response') - ->inject('user') - ->action(function (Response $response, Document $user) { - - $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); - $recoveryCodeEnabled = \is_array($mfaRecoveryCodes) && \count($mfaRecoveryCodes) > 0; - - $totp = TOTP::getAuthenticatorFromUser($user); - - $factors = new Document([ - Type::TOTP => $totp !== null && $totp->getAttribute('verified', false), - Type::EMAIL => $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false), - Type::PHONE => $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false), - Type::RECOVERY_CODE => $recoveryCodeEnabled - ]); - - $response->dynamic($factors, Response::MODEL_MFA_FACTORS); - }); - -App::post('/v1/account/mfa/authenticators/:type') - ->desc('Create authenticator') - ->groups(['api', 'account']) - ->label('event', 'users.[userId].update.mfa') - ->label('scope', 'account') - ->label('audits.event', 'user.update') - ->label('audits.resource', 'user/{response.$id}') - ->label('audits.userId', '{response.$id}') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'createMfaAuthenticator', - description: '/docs/references/account/create-mfa-authenticator.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_TYPE, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.createMFAAuthenticator', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'createMFAAuthenticator', - description: '/docs/references/account/create-mfa-authenticator.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_TYPE, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->param('type', null, new WhiteList([Type::TOTP]), 'Type of authenticator. Must be `' . Type::TOTP . '`') - ->inject('requestTimestamp') - ->inject('response') - ->inject('project') - ->inject('user') - ->inject('dbForProject') - ->inject('queueForEvents') - ->action(function (string $type, ?\DateTime $requestTimestamp, Response $response, Document $project, Document $user, Database $dbForProject, Event $queueForEvents) { - - $otp = (match ($type) { - Type::TOTP => new TOTP(), - default => throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Unknown type.') // Ideally never happens if param validator stays always in sync - }); - - $otp->setLabel($user->getAttribute('email')); - $otp->setIssuer($project->getAttribute('name')); - - $authenticator = TOTP::getAuthenticatorFromUser($user); - - if ($authenticator) { - if ($authenticator->getAttribute('verified')) { - throw new Exception(Exception::USER_AUTHENTICATOR_ALREADY_VERIFIED); - } - $dbForProject->deleteDocument('authenticators', $authenticator->getId()); - } - - $authenticator = new Document([ - '$id' => ID::unique(), - 'userId' => $user->getId(), - 'userInternalId' => $user->getSequence(), - 'type' => Type::TOTP, - 'verified' => false, - 'data' => [ - 'secret' => $otp->getSecret(), - ], - '$permissions' => [ - Permission::read(Role::user($user->getId())), - Permission::update(Role::user($user->getId())), - Permission::delete(Role::user($user->getId())), - ] - ]); - - $model = new Document([ - 'secret' => $otp->getSecret(), - 'uri' => $otp->getProvisioningUri() - ]); - - $authenticator = $dbForProject->createDocument('authenticators', $authenticator); - $dbForProject->purgeCachedDocument('users', $user->getId()); - - $queueForEvents->setParam('userId', $user->getId()); - - $response->dynamic($model, Response::MODEL_MFA_TYPE); - }); - -App::put('/v1/account/mfa/authenticators/:type') - ->desc('Update authenticator (confirmation)') - ->groups(['api', 'account']) - ->label('event', 'users.[userId].update.mfa') - ->label('scope', 'account') - ->label('audits.event', 'user.update') - ->label('audits.resource', 'user/{response.$id}') - ->label('audits.userId', '{response.$id}') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'updateMfaAuthenticator', - description: '/docs/references/account/update-mfa-authenticator.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_USER, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.updateMFAAuthenticator', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'updateMFAAuthenticator', - description: '/docs/references/account/update-mfa-authenticator.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_USER, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->param('type', null, new WhiteList([Type::TOTP]), 'Type of authenticator.') - ->param('otp', '', new Text(256), 'Valid verification token.') - ->inject('response') - ->inject('user') - ->inject('session') - ->inject('dbForProject') - ->inject('queueForEvents') - ->action(function (string $type, string $otp, Response $response, Document $user, Document $session, Database $dbForProject, Event $queueForEvents) { - - $authenticator = (match ($type) { - Type::TOTP => TOTP::getAuthenticatorFromUser($user), - default => null - }); - - if ($authenticator === null) { - throw new Exception(Exception::USER_AUTHENTICATOR_NOT_FOUND); - } - - if ($authenticator->getAttribute('verified')) { - throw new Exception(Exception::USER_AUTHENTICATOR_ALREADY_VERIFIED); - } - - $success = (match ($type) { - Type::TOTP => Challenge\TOTP::verify($user, $otp), - default => false - }); - - if (!$success) { - throw new Exception(Exception::USER_INVALID_TOKEN); - } - - $authenticator->setAttribute('verified', true); - - $dbForProject->updateDocument('authenticators', $authenticator->getId(), $authenticator); - $dbForProject->purgeCachedDocument('users', $user->getId()); - - $factors = $session->getAttribute('factors', []); - $factors[] = $type; - $factors = \array_values(\array_unique($factors)); - - $session->setAttribute('factors', $factors); - $dbForProject->updateDocument('sessions', $session->getId(), $session); - - $queueForEvents->setParam('userId', $user->getId()); - - $response->dynamic($user, Response::MODEL_ACCOUNT); - }); - -App::post('/v1/account/mfa/recovery-codes') - ->desc('Create MFA recovery codes') - ->groups(['api', 'account']) - ->label('event', 'users.[userId].update.mfa') - ->label('scope', 'account') - ->label('audits.event', 'user.update') - ->label('audits.resource', 'user/{response.$id}') - ->label('audits.userId', '{response.$id}') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'createMfaRecoveryCodes', - description: '/docs/references/account/create-mfa-recovery-codes.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_CREATED, - model: Response::MODEL_MFA_RECOVERY_CODES, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.createMFARecoveryCodes', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'createMFARecoveryCodes', - description: '/docs/references/account/create-mfa-recovery-codes.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_CREATED, - model: Response::MODEL_MFA_RECOVERY_CODES, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->inject('response') - ->inject('user') - ->inject('dbForProject') - ->inject('queueForEvents') - ->action(function (Response $response, Document $user, Database $dbForProject, Event $queueForEvents) { - - $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); - - if (!empty($mfaRecoveryCodes)) { - throw new Exception(Exception::USER_RECOVERY_CODES_ALREADY_EXISTS); - } - - $mfaRecoveryCodes = Type::generateBackupCodes(); - $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes); - $dbForProject->updateDocument('users', $user->getId(), $user); - - $queueForEvents->setParam('userId', $user->getId()); - - $document = new Document([ - 'recoveryCodes' => $mfaRecoveryCodes - ]); - - $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES); - }); - -App::patch('/v1/account/mfa/recovery-codes') - ->desc('Update MFA recovery codes (regenerate)') - ->groups(['api', 'account', 'mfaProtected']) - ->label('event', 'users.[userId].update.mfa') - ->label('scope', 'account') - ->label('audits.event', 'user.update') - ->label('audits.resource', 'user/{response.$id}') - ->label('audits.userId', '{response.$id}') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'updateMfaRecoveryCodes', - description: '/docs/references/account/update-mfa-recovery-codes.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_RECOVERY_CODES, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.updateMFARecoveryCodes', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'updateMFARecoveryCodes', - description: '/docs/references/account/update-mfa-recovery-codes.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_RECOVERY_CODES, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->inject('dbForProject') - ->inject('response') - ->inject('user') - ->inject('queueForEvents') - ->action(function (Database $dbForProject, Response $response, Document $user, Event $queueForEvents) { - - $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); - if (empty($mfaRecoveryCodes)) { - throw new Exception(Exception::USER_RECOVERY_CODES_NOT_FOUND); - } - - $mfaRecoveryCodes = Type::generateBackupCodes(); - $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes); - $dbForProject->updateDocument('users', $user->getId(), $user); - - $queueForEvents->setParam('userId', $user->getId()); - - $document = new Document([ - 'recoveryCodes' => $mfaRecoveryCodes - ]); - - $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES); - }); - -App::get('/v1/account/mfa/recovery-codes') - ->desc('List MFA recovery codes') - ->groups(['api', 'account', 'mfaProtected']) - ->label('scope', 'account') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'getMfaRecoveryCodes', - description: '/docs/references/account/get-mfa-recovery-codes.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_RECOVERY_CODES, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.getMFARecoveryCodes', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'getMFARecoveryCodes', - description: '/docs/references/account/get-mfa-recovery-codes.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_MFA_RECOVERY_CODES, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->inject('response') - ->inject('user') - ->action(function (Response $response, Document $user) { - - $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); - - if (empty($mfaRecoveryCodes)) { - throw new Exception(Exception::USER_RECOVERY_CODES_NOT_FOUND); - } - - $document = new Document([ - 'recoveryCodes' => $mfaRecoveryCodes - ]); - - $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES); - }); - -App::delete('/v1/account/mfa/authenticators/:type') - ->desc('Delete authenticator') - ->groups(['api', 'account', 'mfaProtected']) - ->label('event', 'users.[userId].delete.mfa') - ->label('scope', 'account') - ->label('audits.event', 'user.update') - ->label('audits.resource', 'user/{response.$id}') - ->label('audits.userId', '{response.$id}') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'deleteMfaAuthenticator', - description: '/docs/references/account/delete-mfa-authenticator.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_NOCONTENT, - model: Response::MODEL_NONE, - ) - ], - contentType: ContentType::NONE, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.deleteMFAAuthenticator', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'deleteMFAAuthenticator', - description: '/docs/references/account/delete-mfa-authenticator.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_NOCONTENT, - model: Response::MODEL_NONE, - ) - ], - contentType: ContentType::NONE - ) - ]) - ->param('type', null, new WhiteList([Type::TOTP]), 'Type of authenticator.') - ->inject('response') - ->inject('user') - ->inject('dbForProject') - ->inject('queueForEvents') - ->action(function (string $type, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) { - - $authenticator = (match ($type) { - Type::TOTP => TOTP::getAuthenticatorFromUser($user), - default => null - }); - - if (!$authenticator) { - throw new Exception(Exception::USER_AUTHENTICATOR_NOT_FOUND); - } - - $dbForProject->deleteDocument('authenticators', $authenticator->getId()); - $dbForProject->purgeCachedDocument('users', $user->getId()); - - $queueForEvents->setParam('userId', $user->getId()); - - $response->noContent(); - }); - -App::post('/v1/account/mfa/challenge') - ->desc('Create MFA challenge') - ->groups(['api', 'account', 'mfa']) - ->label('scope', 'account') - ->label('event', 'users.[userId].challenges.[challengeId].create') - ->label('audits.event', 'challenge.create') - ->label('audits.resource', 'user/{response.userId}') - ->label('audits.userId', '{response.userId}') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'createMfaChallenge', - description: '/docs/references/account/create-mfa-challenge.md', - auth: [], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_CREATED, - model: Response::MODEL_MFA_CHALLENGE, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.createMFAChallenge', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'createMFAChallenge', - description: '/docs/references/account/create-mfa-challenge.md', - auth: [], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_CREATED, - model: Response::MODEL_MFA_CHALLENGE, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->label('abuse-limit', 10) - ->label('abuse-key', 'url:{url},userId:{userId}') - ->param('factor', '', new WhiteList([Type::EMAIL, Type::PHONE, Type::TOTP, Type::RECOVERY_CODE]), 'Factor used for verification. Must be one of following: `' . Type::EMAIL . '`, `' . Type::PHONE . '`, `' . Type::TOTP . '`, `' . Type::RECOVERY_CODE . '`.') - ->inject('response') - ->inject('dbForProject') - ->inject('user') - ->inject('locale') - ->inject('project') - ->inject('request') - ->inject('queueForEvents') - ->inject('queueForMessaging') - ->inject('queueForMails') - ->inject('timelimit') - ->inject('queueForStatsUsage') - ->inject('plan') - ->action(function (string $factor, Response $response, Database $dbForProject, Document $user, Locale $locale, Document $project, Request $request, Event $queueForEvents, Messaging $queueForMessaging, Mail $queueForMails, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan) { - - $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM)); - $code = Auth::codeGenerator(); - $challenge = new Document([ - 'userId' => $user->getId(), - 'userInternalId' => $user->getSequence(), - 'type' => $factor, - 'token' => Auth::tokenGenerator(), - 'code' => $code, - 'expire' => $expire, - '$permissions' => [ - Permission::read(Role::user($user->getId())), - Permission::update(Role::user($user->getId())), - Permission::delete(Role::user($user->getId())), - ], - ]); - - $challenge = $dbForProject->createDocument('challenges', $challenge); - - switch ($factor) { - case Type::PHONE: - if (empty(System::getEnv('_APP_SMS_PROVIDER'))) { - throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured'); - } - if (empty($user->getAttribute('phone'))) { - throw new Exception(Exception::USER_PHONE_NOT_FOUND); - } - if (!$user->getAttribute('phoneVerification')) { - throw new Exception(Exception::USER_PHONE_NOT_VERIFIED); - } - - $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/sms-base.tpl'); - - $customTemplate = $project->getAttribute('templates', [])['sms.mfaChallenge-' . $locale->default] ?? []; - if (!empty($customTemplate)) { - $message = $customTemplate['message'] ?? $message; - } - - $messageContent = Template::fromString($locale->getText("sms.verification.body")); - $messageContent - ->setParam('{{project}}', $project->getAttribute('name')) - ->setParam('{{secret}}', $code); - $messageContent = \strip_tags($messageContent->render()); - $message = $message->setParam('{{token}}', $messageContent); - - $message = $message->render(); - - $phone = $user->getAttribute('phone'); - $queueForMessaging - ->setType(MESSAGE_SEND_TYPE_INTERNAL) - ->setMessage(new Document([ - '$id' => $challenge->getId(), - 'data' => [ - 'content' => $code, - ], - ])) - ->setRecipients([$phone]) - ->setProviderType(MESSAGE_TYPE_SMS); - - if (isset($plan['authPhone'])) { - $timelimit = $timelimit('organization:{organizationId}', $plan['authPhone'], 30 * 24 * 60 * 60); // 30 days - $timelimit - ->setParam('{organizationId}', $project->getAttribute('teamId')); - - $abuse = new Abuse($timelimit); - if ($abuse->check() && System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') { - $helper = PhoneNumberUtil::getInstance(); - $countryCode = $helper->parse($phone)->getCountryCode(); - - if (!empty($countryCode)) { - $queueForStatsUsage - ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1); - } - } - $queueForStatsUsage - ->addMetric(METRIC_AUTH_METHOD_PHONE, 1) - ->setProject($project) - ->trigger(); - } - break; - case Type::EMAIL: - if (empty(System::getEnv('_APP_SMTP_HOST'))) { - throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled'); - } - if (empty($user->getAttribute('email'))) { - throw new Exception(Exception::USER_EMAIL_NOT_FOUND); - } - if (!$user->getAttribute('emailVerification')) { - throw new Exception(Exception::USER_EMAIL_NOT_VERIFIED); - } - - $subject = $locale->getText("emails.mfaChallenge.subject"); - $preview = $locale->getText("emails.mfaChallenge.preview"); - $heading = $locale->getText("emails.mfaChallenge.heading"); - - $customTemplate = $project->getAttribute('templates', [])['email.mfaChallenge-' . $locale->default] ?? []; - $smtpBaseTemplate = $project->getAttribute('smtpBaseTemplate', 'email-base'); - - $validator = new FileName(); - if (!$validator->isValid($smtpBaseTemplate)) { - throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Invalid template path'); - } - - $bodyTemplate = __DIR__ . '/../../config/locale/templates/' . $smtpBaseTemplate . '.tpl'; - - $detector = new Detector($request->getUserAgent('UNKNOWN')); - $agentOs = $detector->getOS(); - $agentClient = $detector->getClient(); - $agentDevice = $detector->getDevice(); - - $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-mfa-challenge.tpl'); - $message - ->setParam('{{hello}}', $locale->getText("emails.mfaChallenge.hello")) - ->setParam('{{description}}', $locale->getText("emails.mfaChallenge.description")) - ->setParam('{{clientInfo}}', $locale->getText("emails.mfaChallenge.clientInfo")) - ->setParam('{{thanks}}', $locale->getText("emails.mfaChallenge.thanks")) - ->setParam('{{signature}}', $locale->getText("emails.mfaChallenge.signature")); - - $body = $message->render(); - - $smtp = $project->getAttribute('smtp', []); - $smtpEnabled = $smtp['enabled'] ?? false; - - $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM); - $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'); - $replyTo = ""; - - if ($smtpEnabled) { - if (!empty($smtp['senderEmail'])) { - $senderEmail = $smtp['senderEmail']; - } - if (!empty($smtp['senderName'])) { - $senderName = $smtp['senderName']; - } - if (!empty($smtp['replyTo'])) { - $replyTo = $smtp['replyTo']; - } - - $queueForMails - ->setSmtpHost($smtp['host'] ?? '') - ->setSmtpPort($smtp['port'] ?? '') - ->setSmtpUsername($smtp['username'] ?? '') - ->setSmtpPassword($smtp['password'] ?? '') - ->setSmtpSecure($smtp['secure'] ?? ''); - - if (!empty($customTemplate)) { - if (!empty($customTemplate['senderEmail'])) { - $senderEmail = $customTemplate['senderEmail']; - } - if (!empty($customTemplate['senderName'])) { - $senderName = $customTemplate['senderName']; - } - if (!empty($customTemplate['replyTo'])) { - $replyTo = $customTemplate['replyTo']; - } - - $body = $customTemplate['message'] ?? ''; - $subject = $customTemplate['subject'] ?? $subject; - } - - $queueForMails - ->setSmtpReplyTo($replyTo) - ->setSmtpSenderEmail($senderEmail) - ->setSmtpSenderName($senderName); - } - - $emailVariables = [ - 'heading' => $heading, - 'direction' => $locale->getText('settings.direction'), - // {{user}}, {{project}} and {{otp}} are required in the templates - 'user' => $user->getAttribute('name'), - 'project' => $project->getAttribute('name'), - 'otp' => $code, - 'agentDevice' => $agentDevice['deviceBrand'] ?? $agentDevice['deviceBrand'] ?? 'UNKNOWN', - 'agentClient' => $agentClient['clientName'] ?? 'UNKNOWN', - 'agentOs' => $agentOs['osName'] ?? 'UNKNOWN', - ]; - - if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) { - $emailVariables = array_merge($emailVariables, [ - 'accentColor' => APP_EMAIL_ACCENT_COLOR, - 'logoUrl' => APP_EMAIL_LOGO_URL, - 'twitterUrl' => APP_SOCIAL_TWITTER, - 'discordUrl' => APP_SOCIAL_DISCORD, - 'githubUrl' => APP_SOCIAL_GITHUB_APPWRITE, - 'termsUrl' => APP_EMAIL_TERMS_URL, - 'privacyUrl' => APP_EMAIL_PRIVACY_URL, - ]); - } - - $queueForMails - ->setSubject($subject) - ->setPreview($preview) - ->setBody($body) - ->setBodyTemplate($bodyTemplate) - ->setVariables($emailVariables) - ->setRecipient($user->getAttribute('email')) - ->trigger(); - break; - } - - $queueForEvents - ->setParam('userId', $user->getId()) - ->setParam('challengeId', $challenge->getId()); - - $response->dynamic($challenge, Response::MODEL_MFA_CHALLENGE); - }); - -App::put('/v1/account/mfa/challenge') - ->desc('Update MFA challenge (confirmation)') - ->groups(['api', 'account', 'mfa']) - ->label('scope', 'account') - ->label('event', 'users.[userId].sessions.[sessionId].create') - ->label('audits.event', 'challenges.update') - ->label('audits.resource', 'user/{response.userId}') - ->label('audits.userId', '{response.userId}') - ->label('sdk', [ - new Method( - namespace: 'account', - group: 'mfa', - name: 'updateMfaChallenge', - description: '/docs/references/account/update-mfa-challenge.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_SESSION, - ) - ], - contentType: ContentType::JSON, - deprecated: new Deprecated( - since: '1.8.0', - replaceWith: 'account.updateMFAChallenge', - ), - ), - new Method( - namespace: 'account', - group: 'mfa', - name: 'updateMFAChallenge', - description: '/docs/references/account/update-mfa-challenge.md', - auth: [AuthType::SESSION, AuthType::JWT], - responses: [ - new SDKResponse( - code: Response::STATUS_CODE_OK, - model: Response::MODEL_SESSION, - ) - ], - contentType: ContentType::JSON - ) - ]) - ->label('abuse-limit', 10) - ->label('abuse-key', 'url:{url},challengeId:{param-challengeId}') - ->param('challengeId', '', new Text(256), 'ID of the challenge.') - ->param('otp', '', new Text(256), 'Valid verification token.') - ->inject('project') - ->inject('response') - ->inject('user') - ->inject('session') - ->inject('dbForProject') - ->inject('queueForEvents') - ->action(function (string $challengeId, string $otp, Document $project, Response $response, Document $user, Document $session, Database $dbForProject, Event $queueForEvents) { - - $challenge = $dbForProject->getDocument('challenges', $challengeId); - - if ($challenge->isEmpty()) { - throw new Exception(Exception::USER_INVALID_TOKEN); - } - - $type = $challenge->getAttribute('type'); - - $recoveryCodeChallenge = function (Document $challenge, Document $user, string $otp) use ($dbForProject) { - if ( - $challenge->isSet('type') && - $challenge->getAttribute('type') === \strtolower(Type::RECOVERY_CODE) - ) { - $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); - if (in_array($otp, $mfaRecoveryCodes)) { - $mfaRecoveryCodes = array_diff($mfaRecoveryCodes, [$otp]); - $mfaRecoveryCodes = array_values($mfaRecoveryCodes); - $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes); - $dbForProject->updateDocument('users', $user->getId(), $user); - - return true; - } - - return false; - } - - return false; - }; - - $success = (match ($type) { - Type::TOTP => Challenge\TOTP::challenge($challenge, $user, $otp), - Type::PHONE => Challenge\Phone::challenge($challenge, $user, $otp), - Type::EMAIL => Challenge\Email::challenge($challenge, $user, $otp), - \strtolower(Type::RECOVERY_CODE) => $recoveryCodeChallenge($challenge, $user, $otp), - default => false - }); - - if (!$success) { - throw new Exception(Exception::USER_INVALID_TOKEN); - } - - $dbForProject->deleteDocument('challenges', $challengeId); - $dbForProject->purgeCachedDocument('users', $user->getId()); - - $factors = $session->getAttribute('factors', []); - $factors[] = $type; - $factors = \array_values(\array_unique($factors)); - - $session - ->setAttribute('factors', $factors) - ->setAttribute('mfaUpdatedAt', DateTime::now()); - - $dbForProject->updateDocument('sessions', $session->getId(), $session); - - $queueForEvents - ->setParam('userId', $user->getId()) - ->setParam('sessionId', $session->getId()); - - $response->dynamic($session, Response::MODEL_SESSION); - }); - App::post('/v1/account/targets/push') ->desc('Create push target') ->groups(['api', 'account']) diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php index 204957f485..ab8e9195b3 100644 --- a/app/controllers/api/vcs.php +++ b/app/controllers/api/vcs.php @@ -5,6 +5,7 @@ use Appwrite\Event\Build; use Appwrite\Event\Delete; use Appwrite\Extend\Exception; use Appwrite\Network\Validator\Redirect; +use Appwrite\Platform\Modules\Compute\Base as ComputeBase; use Appwrite\SDK\AuthType; use Appwrite\SDK\ContentType; use Appwrite\SDK\Method; @@ -433,6 +434,8 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId } } + ComputeBase::updateEmptyManualRule($project, $resource, $deployment, $dbForPlatform); + if ($resource->getCollection() === 'sites' && !empty($latestCommentId) && !empty($previewRuleId)) { $retries = 0; $lockAcquired = false; diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 1d4cdcd643..45d2f51c15 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -880,7 +880,7 @@ $dbService = $this->getParam('database'); - _APP_ASSISTANT_OPENAI_API_KEY appwrite-browser: - image: appwrite/browser:0.3.1 + image: appwrite/browser:0.3.2 container_name: appwrite-browser <<: *x-logging restart: unless-stopped diff --git a/composer.lock b/composer.lock index 0d2dae8f0b..6bd82a6452 100644 --- a/composer.lock +++ b/composer.lock @@ -4451,16 +4451,16 @@ }, { "name": "utopia-php/migration", - "version": "1.3.3", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/utopia-php/migration.git", - "reference": "731b3a963c58c30e0b2368695d57a7e8fcb7455c" + "reference": "4abe70cc242bbffebfa377e4126ee2a4a1c9ef7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/migration/zipball/731b3a963c58c30e0b2368695d57a7e8fcb7455c", - "reference": "731b3a963c58c30e0b2368695d57a7e8fcb7455c", + "url": "https://api.github.com/repos/utopia-php/migration/zipball/4abe70cc242bbffebfa377e4126ee2a4a1c9ef7e", + "reference": "4abe70cc242bbffebfa377e4126ee2a4a1c9ef7e", "shasum": "" }, "require": { @@ -4500,9 +4500,9 @@ ], "support": { "issues": "https://github.com/utopia-php/migration/issues", - "source": "https://github.com/utopia-php/migration/tree/1.3.3" + "source": "https://github.com/utopia-php/migration/tree/1.3.6" }, - "time": "2025-10-28T04:02:08+00:00" + "time": "2025-11-25T11:36:57+00:00" }, { "name": "utopia-php/mongo", @@ -5374,16 +5374,16 @@ "packages-dev": [ { "name": "appwrite/sdk-generator", - "version": "1.5.8", + "version": "1.5.9", "source": { "type": "git", "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "05367bc4a4c3e020e9aca114ae875b626ce8fc55" + "reference": "ee434aa00a9185380b9a39bb46bf86d7104d3a93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/05367bc4a4c3e020e9aca114ae875b626ce8fc55", - "reference": "05367bc4a4c3e020e9aca114ae875b626ce8fc55", + "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/ee434aa00a9185380b9a39bb46bf86d7104d3a93", + "reference": "ee434aa00a9185380b9a39bb46bf86d7104d3a93", "shasum": "" }, "require": { @@ -5419,9 +5419,9 @@ "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", - "source": "https://github.com/appwrite/sdk-generator/tree/1.5.8" + "source": "https://github.com/appwrite/sdk-generator/tree/1.5.9" }, - "time": "2025-11-20T11:00:34+00:00" + "time": "2025-11-25T05:22:25+00:00" }, { "name": "doctrine/annotations", @@ -8912,5 +8912,5 @@ "platform-overrides": { "php": "8.3" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/docker-compose.yml b/docker-compose.yml index b9f2ffafd9..b783659264 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -977,7 +977,7 @@ services: appwrite-browser: container_name: appwrite-browser - image: appwrite/browser:0.3.1 + image: appwrite/browser:0.3.2 networks: - appwrite diff --git a/docs/examples/1.5.x/client-rest/examples/account/create-challenge.md b/docs/examples/1.5.x/client-rest/examples/account/create-challenge.md index dbdbc1f16a..8d803e56a9 100644 --- a/docs/examples/1.5.x/client-rest/examples/account/create-challenge.md +++ b/docs/examples/1.5.x/client-rest/examples/account/create-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.5.0 diff --git a/docs/examples/1.5.x/client-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.5.x/client-rest/examples/account/create-mfa-challenge.md index 2019a1e52c..0553c4b5ba 100644 --- a/docs/examples/1.5.x/client-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.5.x/client-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: <REGION>.cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.5.x/client-rest/examples/account/create2f-a-challenge.md b/docs/examples/1.5.x/client-rest/examples/account/create2f-a-challenge.md index dbdbc1f16a..8d803e56a9 100644 --- a/docs/examples/1.5.x/client-rest/examples/account/create2f-a-challenge.md +++ b/docs/examples/1.5.x/client-rest/examples/account/create2f-a-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.5.0 diff --git a/docs/examples/1.5.x/client-rest/examples/account/update-challenge.md b/docs/examples/1.5.x/client-rest/examples/account/update-challenge.md index 5e50a0e88d..00c85da373 100644 --- a/docs/examples/1.5.x/client-rest/examples/account/update-challenge.md +++ b/docs/examples/1.5.x/client-rest/examples/account/update-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.5.0 diff --git a/docs/examples/1.5.x/client-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.5.x/client-rest/examples/account/update-mfa-challenge.md index 520b587562..093cc37930 100644 --- a/docs/examples/1.5.x/client-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.5.x/client-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: <REGION>.cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.5.x/server-rest/examples/account/create-challenge.md b/docs/examples/1.5.x/server-rest/examples/account/create-challenge.md index dbdbc1f16a..8d803e56a9 100644 --- a/docs/examples/1.5.x/server-rest/examples/account/create-challenge.md +++ b/docs/examples/1.5.x/server-rest/examples/account/create-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.5.0 diff --git a/docs/examples/1.5.x/server-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.5.x/server-rest/examples/account/create-mfa-challenge.md index 2019a1e52c..0553c4b5ba 100644 --- a/docs/examples/1.5.x/server-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.5.x/server-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: <REGION>.cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.5.x/server-rest/examples/account/create2f-a-challenge.md b/docs/examples/1.5.x/server-rest/examples/account/create2f-a-challenge.md index dbdbc1f16a..8d803e56a9 100644 --- a/docs/examples/1.5.x/server-rest/examples/account/create2f-a-challenge.md +++ b/docs/examples/1.5.x/server-rest/examples/account/create2f-a-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.5.0 diff --git a/docs/examples/1.5.x/server-rest/examples/account/update-challenge.md b/docs/examples/1.5.x/server-rest/examples/account/update-challenge.md index 5e50a0e88d..00c85da373 100644 --- a/docs/examples/1.5.x/server-rest/examples/account/update-challenge.md +++ b/docs/examples/1.5.x/server-rest/examples/account/update-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.5.0 diff --git a/docs/examples/1.5.x/server-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.5.x/server-rest/examples/account/update-mfa-challenge.md index 520b587562..093cc37930 100644 --- a/docs/examples/1.5.x/server-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.5.x/server-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: <REGION>.cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.6.x/client-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.6.x/client-rest/examples/account/create-mfa-challenge.md index 95bf2c4926..c3007fc290 100644 --- a/docs/examples/1.6.x/client-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.6.x/client-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.6.x/client-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.6.x/client-rest/examples/account/update-mfa-challenge.md index 5bd401cc4e..779aeb2ecd 100644 --- a/docs/examples/1.6.x/client-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.6.x/client-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.6.x/server-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.6.x/server-rest/examples/account/create-mfa-challenge.md index 95bf2c4926..c3007fc290 100644 --- a/docs/examples/1.6.x/server-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.6.x/server-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.6.x/server-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.6.x/server-rest/examples/account/update-mfa-challenge.md index 5bd401cc4e..779aeb2ecd 100644 --- a/docs/examples/1.6.x/server-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.6.x/server-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.6.0 diff --git a/docs/examples/1.7.x/client-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.7.x/client-rest/examples/account/create-mfa-challenge.md index 9a84c0ef69..bda2de889d 100644 --- a/docs/examples/1.7.x/client-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.7.x/client-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.7.0 diff --git a/docs/examples/1.7.x/client-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.7.x/client-rest/examples/account/update-mfa-challenge.md index ddc27ae334..506059dc3d 100644 --- a/docs/examples/1.7.x/client-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.7.x/client-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.7.0 diff --git a/docs/examples/1.7.x/server-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.7.x/server-rest/examples/account/create-mfa-challenge.md index 9a84c0ef69..bda2de889d 100644 --- a/docs/examples/1.7.x/server-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.7.x/server-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.7.0 diff --git a/docs/examples/1.7.x/server-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.7.x/server-rest/examples/account/update-mfa-challenge.md index ddc27ae334..506059dc3d 100644 --- a/docs/examples/1.7.x/server-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.7.x/server-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.7.0 diff --git a/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-session.md b/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-session.md index 4420859ce3..5ada9368ea 100644 --- a/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-session.md +++ b/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-session.md @@ -13,7 +13,7 @@ account.createOAuth2Session( OAuthProvider.AMAZON, // provider "https://example.com", // success (optional) "https://example.com", // failure (optional) - listOf(), // scopes (optional) + List.of(), // scopes (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-token.md b/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-token.md index e5590c8ceb..f1122dc8f3 100644 --- a/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-token.md +++ b/docs/examples/1.8.x/client-android/java/account/create-o-auth-2-token.md @@ -13,7 +13,7 @@ account.createOAuth2Token( OAuthProvider.AMAZON, // provider "https://example.com", // success (optional) "https://example.com", // failure (optional) - listOf(), // scopes (optional) + List.of(), // scopes (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/account/list-identities.md b/docs/examples/1.8.x/client-android/java/account/list-identities.md index 327fe39537..e5dd44d9b7 100644 --- a/docs/examples/1.8.x/client-android/java/account/list-identities.md +++ b/docs/examples/1.8.x/client-android/java/account/list-identities.md @@ -9,7 +9,7 @@ Client client = new Client(context) Account account = new Account(client); account.listIdentities( - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/account/list-logs.md b/docs/examples/1.8.x/client-android/java/account/list-logs.md index 4562ecc3ba..8b6ec85067 100644 --- a/docs/examples/1.8.x/client-android/java/account/list-logs.md +++ b/docs/examples/1.8.x/client-android/java/account/list-logs.md @@ -9,7 +9,7 @@ Client client = new Client(context) Account account = new Account(client); account.listLogs( - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/account/update-prefs.md b/docs/examples/1.8.x/client-android/java/account/update-prefs.md index 4bd6940c61..2682fe3aeb 100644 --- a/docs/examples/1.8.x/client-android/java/account/update-prefs.md +++ b/docs/examples/1.8.x/client-android/java/account/update-prefs.md @@ -9,10 +9,10 @@ Client client = new Client(context) Account account = new Account(client); account.updatePrefs( - mapOf( - "language" to "en", - "timezone" to "UTC", - "darkTheme" to true + Map.of( + "language", "en", + "timezone", "UTC", + "darkTheme", true ), // prefs new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/avatars/get-screenshot.md b/docs/examples/1.8.x/client-android/java/avatars/get-screenshot.md index 48babdca20..0f6e41451a 100644 --- a/docs/examples/1.8.x/client-android/java/avatars/get-screenshot.md +++ b/docs/examples/1.8.x/client-android/java/avatars/get-screenshot.md @@ -13,7 +13,7 @@ Avatars avatars = new Avatars(client); avatars.getScreenshot( "https://example.com", // url - mapOf( "a" to "b" ), // headers (optional) + Map.of("a", "b"), // headers (optional) 1, // viewportWidth (optional) 1, // viewportHeight (optional) 0.1, // scale (optional) @@ -26,7 +26,7 @@ avatars.getScreenshot( -180, // longitude (optional) 0, // accuracy (optional) false, // touch (optional) - listOf(), // permissions (optional) + List.of(), // permissions (optional) 0, // sleep (optional) 0, // width (optional) 0, // height (optional) diff --git a/docs/examples/1.8.x/client-android/java/databases/create-document.md b/docs/examples/1.8.x/client-android/java/databases/create-document.md index bfd4601ab4..d95db8a9b0 100644 --- a/docs/examples/1.8.x/client-android/java/databases/create-document.md +++ b/docs/examples/1.8.x/client-android/java/databases/create-document.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -14,14 +14,14 @@ databases.createDocument( "", // databaseId "", // collectionId "", // documentId - mapOf( - "username" to "walter.obrien", - "email" to "walter.obrien@example.com", - "fullName" to "Walter O'Brien", - "age" to 30, - "isAdmin" to false + Map.of( + "username", "walter.obrien", + "email", "walter.obrien@example.com", + "fullName", "Walter O'Brien", + "age", 30, + "isAdmin", false ), // data - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/databases/create-operations.md b/docs/examples/1.8.x/client-android/java/databases/create-operations.md index def58af773..a8635d81e9 100644 --- a/docs/examples/1.8.x/client-android/java/databases/create-operations.md +++ b/docs/examples/1.8.x/client-android/java/databases/create-operations.md @@ -10,17 +10,15 @@ Databases databases = new Databases(client); databases.createOperations( "", // transactionId - listOf( - { - "action": "create", - "databaseId": "", - "collectionId": "", - "documentId": "", - "data": { - "name": "Walter O'Brien" - } - } - ), // operations (optional) + List.of(Map.of( + "action", "create", + "databaseId", "", + "collectionId", "", + "documentId", "", + "data", Map.of( + "name", "Walter O'Brien" + ) + )), // operations (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/databases/get-document.md b/docs/examples/1.8.x/client-android/java/databases/get-document.md index 92d6b5ed23..85f9bb9b13 100644 --- a/docs/examples/1.8.x/client-android/java/databases/get-document.md +++ b/docs/examples/1.8.x/client-android/java/databases/get-document.md @@ -12,7 +12,7 @@ databases.getDocument( "", // databaseId "", // collectionId "", // documentId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/databases/list-documents.md b/docs/examples/1.8.x/client-android/java/databases/list-documents.md index e4102ec542..5440f786cc 100644 --- a/docs/examples/1.8.x/client-android/java/databases/list-documents.md +++ b/docs/examples/1.8.x/client-android/java/databases/list-documents.md @@ -11,7 +11,7 @@ Databases databases = new Databases(client); databases.listDocuments( "", // databaseId "", // collectionId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // transactionId (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/client-android/java/databases/list-transactions.md b/docs/examples/1.8.x/client-android/java/databases/list-transactions.md index 39f58f3490..899a3ea181 100644 --- a/docs/examples/1.8.x/client-android/java/databases/list-transactions.md +++ b/docs/examples/1.8.x/client-android/java/databases/list-transactions.md @@ -9,7 +9,7 @@ Client client = new Client(context) Databases databases = new Databases(client); databases.listTransactions( - listOf(), // queries (optional) + List.of(), // queries (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/databases/update-document.md b/docs/examples/1.8.x/client-android/java/databases/update-document.md index d3a3967d5b..0f13f74e08 100644 --- a/docs/examples/1.8.x/client-android/java/databases/update-document.md +++ b/docs/examples/1.8.x/client-android/java/databases/update-document.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -14,8 +14,8 @@ databases.updateDocument( "", // databaseId "", // collectionId "", // documentId - mapOf( "a" to "b" ), // data (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/databases/upsert-document.md b/docs/examples/1.8.x/client-android/java/databases/upsert-document.md index e46afa10a9..8c72734f98 100644 --- a/docs/examples/1.8.x/client-android/java/databases/upsert-document.md +++ b/docs/examples/1.8.x/client-android/java/databases/upsert-document.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -14,8 +14,8 @@ databases.upsertDocument( "", // databaseId "", // collectionId "", // documentId - mapOf( "a" to "b" ), // data - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/functions/create-execution.md b/docs/examples/1.8.x/client-android/java/functions/create-execution.md index 758881d13c..4aea0929f1 100644 --- a/docs/examples/1.8.x/client-android/java/functions/create-execution.md +++ b/docs/examples/1.8.x/client-android/java/functions/create-execution.md @@ -15,7 +15,7 @@ functions.createExecution( false, // async (optional) "", // path (optional) ExecutionMethod.GET, // method (optional) - mapOf( "a" to "b" ), // headers (optional) + Map.of("a", "b"), // headers (optional) "", // scheduledAt (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/functions/list-executions.md b/docs/examples/1.8.x/client-android/java/functions/list-executions.md index c9a1df107e..893d098998 100644 --- a/docs/examples/1.8.x/client-android/java/functions/list-executions.md +++ b/docs/examples/1.8.x/client-android/java/functions/list-executions.md @@ -10,7 +10,7 @@ Functions functions = new Functions(client); functions.listExecutions( "", // functionId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/graphql/mutation.md b/docs/examples/1.8.x/client-android/java/graphql/mutation.md index 25f095e1b1..445195275a 100644 --- a/docs/examples/1.8.x/client-android/java/graphql/mutation.md +++ b/docs/examples/1.8.x/client-android/java/graphql/mutation.md @@ -9,7 +9,7 @@ Client client = new Client(context) Graphql graphql = new Graphql(client); graphql.mutation( - mapOf( "a" to "b" ), // query + Map.of("a", "b"), // query new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/graphql/query.md b/docs/examples/1.8.x/client-android/java/graphql/query.md index 6b2a04d0b6..b39f128165 100644 --- a/docs/examples/1.8.x/client-android/java/graphql/query.md +++ b/docs/examples/1.8.x/client-android/java/graphql/query.md @@ -9,7 +9,7 @@ Client client = new Client(context) Graphql graphql = new Graphql(client); graphql.query( - mapOf( "a" to "b" ), // query + Map.of("a", "b"), // query new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/storage/create-file.md b/docs/examples/1.8.x/client-android/java/storage/create-file.md index 8de00099b0..518bbc9d29 100644 --- a/docs/examples/1.8.x/client-android/java/storage/create-file.md +++ b/docs/examples/1.8.x/client-android/java/storage/create-file.md @@ -1,9 +1,9 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; import io.appwrite.models.InputFile; -import io.appwrite.services.Storage; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Storage; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ storage.createFile( "", // bucketId "", // fileId InputFile.fromPath("file.png"), // file - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/storage/list-files.md b/docs/examples/1.8.x/client-android/java/storage/list-files.md index 178027cc5d..05292a6465 100644 --- a/docs/examples/1.8.x/client-android/java/storage/list-files.md +++ b/docs/examples/1.8.x/client-android/java/storage/list-files.md @@ -10,7 +10,7 @@ Storage storage = new Storage(client); storage.listFiles( "", // bucketId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/client-android/java/storage/update-file.md b/docs/examples/1.8.x/client-android/java/storage/update-file.md index 1e21b3fae1..40cc61b1bf 100644 --- a/docs/examples/1.8.x/client-android/java/storage/update-file.md +++ b/docs/examples/1.8.x/client-android/java/storage/update-file.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Storage; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Storage; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -14,7 +14,7 @@ storage.updateFile( "", // bucketId "", // fileId "", // name (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/tablesdb/create-operations.md b/docs/examples/1.8.x/client-android/java/tablesdb/create-operations.md index 7ca288c2ae..0e8cb4b067 100644 --- a/docs/examples/1.8.x/client-android/java/tablesdb/create-operations.md +++ b/docs/examples/1.8.x/client-android/java/tablesdb/create-operations.md @@ -10,17 +10,15 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.createOperations( "", // transactionId - listOf( - { - "action": "create", - "databaseId": "", - "tableId": "", - "rowId": "", - "data": { - "name": "Walter O'Brien" - } - } - ), // operations (optional) + List.of(Map.of( + "action", "create", + "databaseId", "", + "tableId", "", + "rowId", "", + "data", Map.of( + "name", "Walter O'Brien" + ) + )), // operations (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/tablesdb/create-row.md b/docs/examples/1.8.x/client-android/java/tablesdb/create-row.md index f7aa10e5c7..b3e4f310db 100644 --- a/docs/examples/1.8.x/client-android/java/tablesdb/create-row.md +++ b/docs/examples/1.8.x/client-android/java/tablesdb/create-row.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -14,14 +14,14 @@ tablesDB.createRow( "", // databaseId "", // tableId "", // rowId - mapOf( - "username" to "walter.obrien", - "email" to "walter.obrien@example.com", - "fullName" to "Walter O'Brien", - "age" to 30, - "isAdmin" to false + Map.of( + "username", "walter.obrien", + "email", "walter.obrien@example.com", + "fullName", "Walter O'Brien", + "age", 30, + "isAdmin", false ), // data - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/tablesdb/get-row.md b/docs/examples/1.8.x/client-android/java/tablesdb/get-row.md index 45efc6b061..2bf847284a 100644 --- a/docs/examples/1.8.x/client-android/java/tablesdb/get-row.md +++ b/docs/examples/1.8.x/client-android/java/tablesdb/get-row.md @@ -12,7 +12,7 @@ tablesDB.getRow( "", // databaseId "", // tableId "", // rowId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/tablesdb/list-rows.md b/docs/examples/1.8.x/client-android/java/tablesdb/list-rows.md index 3bd1e1c77a..0833929eb1 100644 --- a/docs/examples/1.8.x/client-android/java/tablesdb/list-rows.md +++ b/docs/examples/1.8.x/client-android/java/tablesdb/list-rows.md @@ -11,7 +11,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.listRows( "", // databaseId "", // tableId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // transactionId (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/client-android/java/tablesdb/list-transactions.md b/docs/examples/1.8.x/client-android/java/tablesdb/list-transactions.md index c37ccf1931..ce0147b036 100644 --- a/docs/examples/1.8.x/client-android/java/tablesdb/list-transactions.md +++ b/docs/examples/1.8.x/client-android/java/tablesdb/list-transactions.md @@ -9,7 +9,7 @@ Client client = new Client(context) TablesDB tablesDB = new TablesDB(client); tablesDB.listTransactions( - listOf(), // queries (optional) + List.of(), // queries (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/tablesdb/update-row.md b/docs/examples/1.8.x/client-android/java/tablesdb/update-row.md index 3abaf90603..89f2646d9d 100644 --- a/docs/examples/1.8.x/client-android/java/tablesdb/update-row.md +++ b/docs/examples/1.8.x/client-android/java/tablesdb/update-row.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -14,8 +14,8 @@ tablesDB.updateRow( "", // databaseId "", // tableId "", // rowId - mapOf( "a" to "b" ), // data (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/tablesdb/upsert-row.md b/docs/examples/1.8.x/client-android/java/tablesdb/upsert-row.md index 6f979fc126..c6cfe6d1bc 100644 --- a/docs/examples/1.8.x/client-android/java/tablesdb/upsert-row.md +++ b/docs/examples/1.8.x/client-android/java/tablesdb/upsert-row.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client(context) .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -14,8 +14,8 @@ tablesDB.upsertRow( "", // databaseId "", // tableId "", // rowId - mapOf( "a" to "b" ), // data (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/client-android/java/teams/create-membership.md b/docs/examples/1.8.x/client-android/java/teams/create-membership.md index bb5293ef63..e5eee207dc 100644 --- a/docs/examples/1.8.x/client-android/java/teams/create-membership.md +++ b/docs/examples/1.8.x/client-android/java/teams/create-membership.md @@ -10,7 +10,7 @@ Teams teams = new Teams(client); teams.createMembership( "", // teamId - listOf(), // roles + List.of(), // roles "email@example.com", // email (optional) "", // userId (optional) "+12065550100", // phone (optional) diff --git a/docs/examples/1.8.x/client-android/java/teams/create.md b/docs/examples/1.8.x/client-android/java/teams/create.md index ae2fdf32c8..232d3b38ee 100644 --- a/docs/examples/1.8.x/client-android/java/teams/create.md +++ b/docs/examples/1.8.x/client-android/java/teams/create.md @@ -11,7 +11,7 @@ Teams teams = new Teams(client); teams.create( "", // teamId "", // name - listOf(), // roles (optional) + List.of(), // roles (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/teams/list-memberships.md b/docs/examples/1.8.x/client-android/java/teams/list-memberships.md index ae5cc69b4d..c8d3b610dc 100644 --- a/docs/examples/1.8.x/client-android/java/teams/list-memberships.md +++ b/docs/examples/1.8.x/client-android/java/teams/list-memberships.md @@ -10,7 +10,7 @@ Teams teams = new Teams(client); teams.listMemberships( "", // teamId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/client-android/java/teams/list.md b/docs/examples/1.8.x/client-android/java/teams/list.md index fff14e2992..1db3e67a2e 100644 --- a/docs/examples/1.8.x/client-android/java/teams/list.md +++ b/docs/examples/1.8.x/client-android/java/teams/list.md @@ -9,7 +9,7 @@ Client client = new Client(context) Teams teams = new Teams(client); teams.list( - listOf(), // queries (optional) + List.of(), // queries (optional) "", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/client-android/java/teams/update-membership.md b/docs/examples/1.8.x/client-android/java/teams/update-membership.md index 481be43107..f8adcf1fb8 100644 --- a/docs/examples/1.8.x/client-android/java/teams/update-membership.md +++ b/docs/examples/1.8.x/client-android/java/teams/update-membership.md @@ -11,7 +11,7 @@ Teams teams = new Teams(client); teams.updateMembership( "", // teamId "", // membershipId - listOf(), // roles + List.of(), // roles new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/java/teams/update-prefs.md b/docs/examples/1.8.x/client-android/java/teams/update-prefs.md index 5a0186ff31..9ea1487bd4 100644 --- a/docs/examples/1.8.x/client-android/java/teams/update-prefs.md +++ b/docs/examples/1.8.x/client-android/java/teams/update-prefs.md @@ -10,7 +10,7 @@ Teams teams = new Teams(client); teams.updatePrefs( "", // teamId - mapOf( "a" to "b" ), // prefs + Map.of("a", "b"), // prefs new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/client-android/kotlin/databases/create-operations.md b/docs/examples/1.8.x/client-android/kotlin/databases/create-operations.md index 62c93351e7..f3a419448b 100644 --- a/docs/examples/1.8.x/client-android/kotlin/databases/create-operations.md +++ b/docs/examples/1.8.x/client-android/kotlin/databases/create-operations.md @@ -10,15 +10,13 @@ val databases = Databases(client) val result = databases.createOperations( transactionId = "", - operations = listOf( - { - "action": "create", - "databaseId": "", - "collectionId": "", - "documentId": "", - "data": { - "name": "Walter O'Brien" - } - } - ), // (optional) + operations = listOf(mapOf( + "action" to "create", + "databaseId" to "", + "collectionId" to "", + "documentId" to "", + "data" to mapOf( + "name" to "Walter O'Brien" + ) + )), // (optional) ) \ No newline at end of file diff --git a/docs/examples/1.8.x/client-android/kotlin/tablesdb/create-operations.md b/docs/examples/1.8.x/client-android/kotlin/tablesdb/create-operations.md index 3073a00bca..7807102f27 100644 --- a/docs/examples/1.8.x/client-android/kotlin/tablesdb/create-operations.md +++ b/docs/examples/1.8.x/client-android/kotlin/tablesdb/create-operations.md @@ -10,15 +10,13 @@ val tablesDB = TablesDB(client) val result = tablesDB.createOperations( transactionId = "", - operations = listOf( - { - "action": "create", - "databaseId": "", - "tableId": "", - "rowId": "", - "data": { - "name": "Walter O'Brien" - } - } - ), // (optional) + operations = listOf(mapOf( + "action" to "create", + "databaseId" to "", + "tableId" to "", + "rowId" to "", + "data" to mapOf( + "name" to "Walter O'Brien" + ) + )), // (optional) ) \ No newline at end of file diff --git a/docs/examples/1.8.x/client-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.8.x/client-rest/examples/account/create-mfa-challenge.md index dd5ef4c731..e5a5b0ea05 100644 --- a/docs/examples/1.8.x/client-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.8.x/client-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.8.0 diff --git a/docs/examples/1.8.x/client-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.8.x/client-rest/examples/account/update-mfa-challenge.md index b6a7e92b28..df2cd9a1e8 100644 --- a/docs/examples/1.8.x/client-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.8.x/client-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.8.0 diff --git a/docs/examples/1.8.x/console-web/examples/functions/create-template-deployment.md b/docs/examples/1.8.x/console-web/examples/functions/create-template-deployment.md index 5bf812c1bc..414a0d0bfb 100644 --- a/docs/examples/1.8.x/console-web/examples/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/console-web/examples/functions/create-template-deployment.md @@ -1,4 +1,4 @@ -import { Client, Functions, } from "@appwrite.io/console"; +import { Client, Functions, TemplateReferenceType } from "@appwrite.io/console"; const client = new Client() .setEndpoint('https://.cloud.appwrite.io/v1') // Your API Endpoint @@ -11,7 +11,7 @@ const result = await functions.createTemplateDeployment({ repository: '', owner: '', rootDirectory: '', - type: .Commit, + type: TemplateReferenceType.Commit, reference: '', activate: false // optional }); diff --git a/docs/examples/1.8.x/console-web/examples/functions/create-vcs-deployment.md b/docs/examples/1.8.x/console-web/examples/functions/create-vcs-deployment.md index 33da9bfd70..d6f4e765e3 100644 --- a/docs/examples/1.8.x/console-web/examples/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/console-web/examples/functions/create-vcs-deployment.md @@ -1,4 +1,4 @@ -import { Client, Functions, VCSDeploymentType } from "@appwrite.io/console"; +import { Client, Functions, VCSReferenceType } from "@appwrite.io/console"; const client = new Client() .setEndpoint('https://.cloud.appwrite.io/v1') // Your API Endpoint @@ -8,7 +8,7 @@ const functions = new Functions(client); const result = await functions.createVcsDeployment({ functionId: '', - type: VCSDeploymentType.Branch, + type: VCSReferenceType.Branch, reference: '', activate: false // optional }); diff --git a/docs/examples/1.8.x/console-web/examples/sites/create-template-deployment.md b/docs/examples/1.8.x/console-web/examples/sites/create-template-deployment.md index 4f1d0184f7..1bfaeb6a7e 100644 --- a/docs/examples/1.8.x/console-web/examples/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/console-web/examples/sites/create-template-deployment.md @@ -1,4 +1,4 @@ -import { Client, Sites, } from "@appwrite.io/console"; +import { Client, Sites, TemplateReferenceType } from "@appwrite.io/console"; const client = new Client() .setEndpoint('https://.cloud.appwrite.io/v1') // Your API Endpoint @@ -11,7 +11,7 @@ const result = await sites.createTemplateDeployment({ repository: '', owner: '', rootDirectory: '', - type: .Branch, + type: TemplateReferenceType.Branch, reference: '', activate: false // optional }); diff --git a/docs/examples/1.8.x/console-web/examples/sites/create-vcs-deployment.md b/docs/examples/1.8.x/console-web/examples/sites/create-vcs-deployment.md index cc1fd1d301..80d9403ccb 100644 --- a/docs/examples/1.8.x/console-web/examples/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/console-web/examples/sites/create-vcs-deployment.md @@ -1,4 +1,4 @@ -import { Client, Sites, VCSDeploymentType } from "@appwrite.io/console"; +import { Client, Sites, VCSReferenceType } from "@appwrite.io/console"; const client = new Client() .setEndpoint('https://.cloud.appwrite.io/v1') // Your API Endpoint @@ -8,7 +8,7 @@ const sites = new Sites(client); const result = await sites.createVcsDeployment({ siteId: '', - type: VCSDeploymentType.Branch, + type: VCSReferenceType.Branch, reference: '', activate: false // optional }); diff --git a/docs/examples/1.8.x/server-dart/examples/functions/create-template-deployment.md b/docs/examples/1.8.x/server-dart/examples/functions/create-template-deployment.md index bfd94b1963..f5b6cdeb1f 100644 --- a/docs/examples/1.8.x/server-dart/examples/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-dart/examples/functions/create-template-deployment.md @@ -12,7 +12,7 @@ Deployment result = await functions.createTemplateDeployment( repository: '', owner: '', rootDirectory: '', - type: .commit, + type: TemplateReferenceType.commit, reference: '', activate: false, // (optional) ); diff --git a/docs/examples/1.8.x/server-dart/examples/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-dart/examples/functions/create-vcs-deployment.md index ed315a54e3..0c12315ffc 100644 --- a/docs/examples/1.8.x/server-dart/examples/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-dart/examples/functions/create-vcs-deployment.md @@ -9,7 +9,7 @@ Functions functions = Functions(client); Deployment result = await functions.createVcsDeployment( functionId: '', - type: VCSDeploymentType.branch, + type: VCSReferenceType.branch, reference: '', activate: false, // (optional) ); diff --git a/docs/examples/1.8.x/server-dart/examples/sites/create-template-deployment.md b/docs/examples/1.8.x/server-dart/examples/sites/create-template-deployment.md index 93c9b1d283..8826b1f462 100644 --- a/docs/examples/1.8.x/server-dart/examples/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-dart/examples/sites/create-template-deployment.md @@ -12,7 +12,7 @@ Deployment result = await sites.createTemplateDeployment( repository: '', owner: '', rootDirectory: '', - type: .branch, + type: TemplateReferenceType.branch, reference: '', activate: false, // (optional) ); diff --git a/docs/examples/1.8.x/server-dart/examples/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-dart/examples/sites/create-vcs-deployment.md index 50f65b9603..52133a535e 100644 --- a/docs/examples/1.8.x/server-dart/examples/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-dart/examples/sites/create-vcs-deployment.md @@ -9,7 +9,7 @@ Sites sites = Sites(client); Deployment result = await sites.createVcsDeployment( siteId: '', - type: VCSDeploymentType.branch, + type: VCSReferenceType.branch, reference: '', activate: false, // (optional) ); diff --git a/docs/examples/1.8.x/server-dotnet/examples/functions/create-template-deployment.md b/docs/examples/1.8.x/server-dotnet/examples/functions/create-template-deployment.md index 125eeda5cc..6fcf2398dd 100644 --- a/docs/examples/1.8.x/server-dotnet/examples/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-dotnet/examples/functions/create-template-deployment.md @@ -15,7 +15,7 @@ Deployment result = await functions.CreateTemplateDeployment( repository: "", owner: "", rootDirectory: "", - type: .Commit, + type: TemplateReferenceType.Commit, reference: "", activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-dotnet/examples/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-dotnet/examples/functions/create-vcs-deployment.md index 9651365912..a7403ff116 100644 --- a/docs/examples/1.8.x/server-dotnet/examples/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-dotnet/examples/functions/create-vcs-deployment.md @@ -12,7 +12,7 @@ Functions functions = new Functions(client); Deployment result = await functions.CreateVcsDeployment( functionId: "", - type: VCSDeploymentType.Branch, + type: VCSReferenceType.Branch, reference: "", activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-dotnet/examples/sites/create-template-deployment.md b/docs/examples/1.8.x/server-dotnet/examples/sites/create-template-deployment.md index 9775cb659f..5353b004b8 100644 --- a/docs/examples/1.8.x/server-dotnet/examples/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-dotnet/examples/sites/create-template-deployment.md @@ -15,7 +15,7 @@ Deployment result = await sites.CreateTemplateDeployment( repository: "", owner: "", rootDirectory: "", - type: .Branch, + type: TemplateReferenceType.Branch, reference: "", activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-dotnet/examples/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-dotnet/examples/sites/create-vcs-deployment.md index 4d3e685176..229549befa 100644 --- a/docs/examples/1.8.x/server-dotnet/examples/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-dotnet/examples/sites/create-vcs-deployment.md @@ -12,7 +12,7 @@ Sites sites = new Sites(client); Deployment result = await sites.CreateVcsDeployment( siteId: "", - type: VCSDeploymentType.Branch, + type: VCSReferenceType.Branch, reference: "", activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-kotlin/java/account/create-o-auth-2-token.md b/docs/examples/1.8.x/server-kotlin/java/account/create-o-auth-2-token.md index 5b325f5c61..376d943533 100644 --- a/docs/examples/1.8.x/server-kotlin/java/account/create-o-auth-2-token.md +++ b/docs/examples/1.8.x/server-kotlin/java/account/create-o-auth-2-token.md @@ -13,7 +13,7 @@ account.createOAuth2Token( OAuthProvider.AMAZON, // provider "https://example.com", // success (optional) "https://example.com", // failure (optional) - listOf(), // scopes (optional) + List.of(), // scopes (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/account/list-identities.md b/docs/examples/1.8.x/server-kotlin/java/account/list-identities.md index 8d204d5920..97cdf99b62 100644 --- a/docs/examples/1.8.x/server-kotlin/java/account/list-identities.md +++ b/docs/examples/1.8.x/server-kotlin/java/account/list-identities.md @@ -10,7 +10,7 @@ Client client = new Client() Account account = new Account(client); account.listIdentities( - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/account/list-logs.md b/docs/examples/1.8.x/server-kotlin/java/account/list-logs.md index 4b301a11e0..6c41c7f073 100644 --- a/docs/examples/1.8.x/server-kotlin/java/account/list-logs.md +++ b/docs/examples/1.8.x/server-kotlin/java/account/list-logs.md @@ -10,7 +10,7 @@ Client client = new Client() Account account = new Account(client); account.listLogs( - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/account/update-prefs.md b/docs/examples/1.8.x/server-kotlin/java/account/update-prefs.md index 0b6893916b..4fc1cb5439 100644 --- a/docs/examples/1.8.x/server-kotlin/java/account/update-prefs.md +++ b/docs/examples/1.8.x/server-kotlin/java/account/update-prefs.md @@ -10,10 +10,10 @@ Client client = new Client() Account account = new Account(client); account.updatePrefs( - mapOf( - "language" to "en", - "timezone" to "UTC", - "darkTheme" to true + Map.of( + "language", "en", + "timezone", "UTC", + "darkTheme", true ), // prefs new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/avatars/get-screenshot.md b/docs/examples/1.8.x/server-kotlin/java/avatars/get-screenshot.md index 0f1cb9c2f0..1874358337 100644 --- a/docs/examples/1.8.x/server-kotlin/java/avatars/get-screenshot.md +++ b/docs/examples/1.8.x/server-kotlin/java/avatars/get-screenshot.md @@ -14,7 +14,7 @@ Avatars avatars = new Avatars(client); avatars.getScreenshot( "https://example.com", // url - mapOf( "a" to "b" ), // headers (optional) + Map.of("a", "b"), // headers (optional) 1, // viewportWidth (optional) 1, // viewportHeight (optional) 0.1, // scale (optional) @@ -27,7 +27,7 @@ avatars.getScreenshot( -180, // longitude (optional) 0, // accuracy (optional) false, // touch (optional) - listOf(), // permissions (optional) + List.of(), // permissions (optional) 0, // sleep (optional) 0, // width (optional) 0, // height (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-collection.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-collection.md index 10eed04a4f..eea55558cc 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-collection.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-collection.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client() .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ databases.createCollection( "", // databaseId "", // collectionId "", // name - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) false, // documentSecurity (optional) false, // enabled (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-document.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-document.md index aa6c9ea203..7ff195f613 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-document.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-document.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client() .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,14 +15,14 @@ databases.createDocument( "", // databaseId "", // collectionId "", // documentId - mapOf( - "username" to "walter.obrien", - "email" to "walter.obrien@example.com", - "fullName" to "Walter O'Brien", - "age" to 30, - "isAdmin" to false + Map.of( + "username", "walter.obrien", + "email", "walter.obrien@example.com", + "fullName", "Walter O'Brien", + "age", 30, + "isAdmin", false ), // data - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-documents.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-documents.md index 3a4540974b..be695fe80b 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-documents.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-documents.md @@ -12,7 +12,7 @@ Databases databases = new Databases(client); databases.createDocuments( "", // databaseId "", // collectionId - listOf(), // documents + List.of(), // documents "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-enum-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-enum-attribute.md index 44202086b0..b8666666da 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-enum-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-enum-attribute.md @@ -13,7 +13,7 @@ databases.createEnumAttribute( "", // databaseId "", // collectionId "", // key - listOf(), // elements + List.of(), // elements false, // required "", // default (optional) false, // array (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-index.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-index.md index fe2d9bf66d..1fb1efb826 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-index.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-index.md @@ -15,9 +15,9 @@ databases.createIndex( "", // collectionId "", // key IndexType.KEY, // type - listOf(), // attributes - listOf(), // orders (optional) - listOf(), // lengths (optional) + List.of(), // attributes + List.of(), // orders (optional) + List.of(), // lengths (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-line-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-line-attribute.md index ad988b8773..c0daeac6c3 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-line-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-line-attribute.md @@ -14,7 +14,7 @@ databases.createLineAttribute( "", // collectionId "", // key false, // required - listOf([1, 2], [3, 4], [5, 6]), // default (optional) + List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6)), // default (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-operations.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-operations.md index 2dad8a15ac..c935f82a9a 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-operations.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-operations.md @@ -11,17 +11,15 @@ Databases databases = new Databases(client); databases.createOperations( "", // transactionId - listOf( - { - "action": "create", - "databaseId": "", - "collectionId": "", - "documentId": "", - "data": { - "name": "Walter O'Brien" - } - } - ), // operations (optional) + List.of(Map.of( + "action", "create", + "databaseId", "", + "collectionId", "", + "documentId", "", + "data", Map.of( + "name", "Walter O'Brien" + ) + )), // operations (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-point-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-point-attribute.md index 89d7cc7177..c3b5d503b2 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-point-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-point-attribute.md @@ -14,7 +14,7 @@ databases.createPointAttribute( "", // collectionId "", // key false, // required - listOf(1, 2), // default (optional) + List.of(1, 2), // default (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/create-polygon-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/create-polygon-attribute.md index 556fb38481..4f8fe0369e 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/create-polygon-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/create-polygon-attribute.md @@ -14,7 +14,7 @@ databases.createPolygonAttribute( "", // collectionId "", // key false, // required - listOf([[1, 2], [3, 4], [5, 6], [1, 2]]), // default (optional) + List.of(List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6), List.of(1, 2))), // default (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/delete-documents.md b/docs/examples/1.8.x/server-kotlin/java/databases/delete-documents.md index 958c40c382..f535ae7780 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/delete-documents.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/delete-documents.md @@ -12,7 +12,7 @@ Databases databases = new Databases(client); databases.deleteDocuments( "", // databaseId "", // collectionId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/get-document.md b/docs/examples/1.8.x/server-kotlin/java/databases/get-document.md index 489447f599..d3e8b8b3d4 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/get-document.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/get-document.md @@ -13,7 +13,7 @@ databases.getDocument( "", // databaseId "", // collectionId "", // documentId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/list-attributes.md b/docs/examples/1.8.x/server-kotlin/java/databases/list-attributes.md index b1b3bd1b9c..dd883e232f 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/list-attributes.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/list-attributes.md @@ -12,7 +12,7 @@ Databases databases = new Databases(client); databases.listAttributes( "", // databaseId "", // collectionId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/list-collections.md b/docs/examples/1.8.x/server-kotlin/java/databases/list-collections.md index efb0e7f89b..ddb47c9989 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/list-collections.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/list-collections.md @@ -11,7 +11,7 @@ Databases databases = new Databases(client); databases.listCollections( "", // databaseId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/list-documents.md b/docs/examples/1.8.x/server-kotlin/java/databases/list-documents.md index 472d15ba27..b8ef0717ea 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/list-documents.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/list-documents.md @@ -12,7 +12,7 @@ Databases databases = new Databases(client); databases.listDocuments( "", // databaseId "", // collectionId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // transactionId (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/list-indexes.md b/docs/examples/1.8.x/server-kotlin/java/databases/list-indexes.md index 5715af7d47..c701904157 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/list-indexes.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/list-indexes.md @@ -12,7 +12,7 @@ Databases databases = new Databases(client); databases.listIndexes( "", // databaseId "", // collectionId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/list-transactions.md b/docs/examples/1.8.x/server-kotlin/java/databases/list-transactions.md index 281fc1205b..8a6f60544f 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/list-transactions.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/list-transactions.md @@ -10,7 +10,7 @@ Client client = new Client() Databases databases = new Databases(client); databases.listTransactions( - listOf(), // queries (optional) + List.of(), // queries (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/list.md b/docs/examples/1.8.x/server-kotlin/java/databases/list.md index a3f2d51fed..32ef454a73 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/list.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/list.md @@ -10,7 +10,7 @@ Client client = new Client() Databases databases = new Databases(client); databases.list( - listOf(), // queries (optional) + List.of(), // queries (optional) "", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/update-collection.md b/docs/examples/1.8.x/server-kotlin/java/databases/update-collection.md index 24d312da8c..898f1aafe5 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/update-collection.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/update-collection.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client() .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ databases.updateCollection( "", // databaseId "", // collectionId "", // name - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) false, // documentSecurity (optional) false, // enabled (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/update-document.md b/docs/examples/1.8.x/server-kotlin/java/databases/update-document.md index 749de99fce..0638225bfd 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/update-document.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/update-document.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client() .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,8 +15,8 @@ databases.updateDocument( "", // databaseId "", // collectionId "", // documentId - mapOf( "a" to "b" ), // data (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/update-documents.md b/docs/examples/1.8.x/server-kotlin/java/databases/update-documents.md index a685ac81fc..57a82f56f9 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/update-documents.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/update-documents.md @@ -12,8 +12,8 @@ Databases databases = new Databases(client); databases.updateDocuments( "", // databaseId "", // collectionId - mapOf( "a" to "b" ), // data (optional) - listOf(), // queries (optional) + Map.of("a", "b"), // data (optional) + List.of(), // queries (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/update-enum-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/update-enum-attribute.md index 89606806d9..8870e372a6 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/update-enum-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/update-enum-attribute.md @@ -13,7 +13,7 @@ databases.updateEnumAttribute( "", // databaseId "", // collectionId "", // key - listOf(), // elements + List.of(), // elements false, // required "", // default "", // newKey (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/update-line-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/update-line-attribute.md index 6a4265bbda..14d83eeee5 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/update-line-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/update-line-attribute.md @@ -14,7 +14,7 @@ databases.updateLineAttribute( "", // collectionId "", // key false, // required - listOf([1, 2], [3, 4], [5, 6]), // default (optional) + List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6)), // default (optional) "", // newKey (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/update-point-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/update-point-attribute.md index 38d48c27e8..5d44d7a190 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/update-point-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/update-point-attribute.md @@ -14,7 +14,7 @@ databases.updatePointAttribute( "", // collectionId "", // key false, // required - listOf(1, 2), // default (optional) + List.of(1, 2), // default (optional) "", // newKey (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/update-polygon-attribute.md b/docs/examples/1.8.x/server-kotlin/java/databases/update-polygon-attribute.md index 6e6fd08575..2c530b9aae 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/update-polygon-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/update-polygon-attribute.md @@ -14,7 +14,7 @@ databases.updatePolygonAttribute( "", // collectionId "", // key false, // required - listOf([[1, 2], [3, 4], [5, 6], [1, 2]]), // default (optional) + List.of(List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6), List.of(1, 2))), // default (optional) "", // newKey (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/upsert-document.md b/docs/examples/1.8.x/server-kotlin/java/databases/upsert-document.md index 4f156bbf8b..ec99390e15 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/upsert-document.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/upsert-document.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Databases; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Databases; Client client = new Client() .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,8 +15,8 @@ databases.upsertDocument( "", // databaseId "", // collectionId "", // documentId - mapOf( "a" to "b" ), // data - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data + List.of(Permission.read(Role.any())), // permissions (optional) "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/databases/upsert-documents.md b/docs/examples/1.8.x/server-kotlin/java/databases/upsert-documents.md index b8fcd8781a..ee4450fc29 100644 --- a/docs/examples/1.8.x/server-kotlin/java/databases/upsert-documents.md +++ b/docs/examples/1.8.x/server-kotlin/java/databases/upsert-documents.md @@ -12,7 +12,7 @@ Databases databases = new Databases(client); databases.upsertDocuments( "", // databaseId "", // collectionId - listOf(), // documents + List.of(), // documents "", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/create-execution.md b/docs/examples/1.8.x/server-kotlin/java/functions/create-execution.md index 4abfe236b3..98a4d1b572 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/create-execution.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/create-execution.md @@ -16,7 +16,7 @@ functions.createExecution( false, // async (optional) "", // path (optional) ExecutionMethod.GET, // method (optional) - mapOf( "a" to "b" ), // headers (optional) + Map.of("a", "b"), // headers (optional) "", // scheduledAt (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/create-template-deployment.md b/docs/examples/1.8.x/server-kotlin/java/functions/create-template-deployment.md index 9a0642b04e..59c105dfb1 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/create-template-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; import io.appwrite.services.Functions; -import io.appwrite.enums.Type; +import io.appwrite.enums.TemplateReferenceType; Client client = new Client() .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ functions.createTemplateDeployment( "", // repository "", // owner "", // rootDirectory - .COMMIT, // type + TemplateReferenceType.COMMIT, // type "", // reference false, // activate (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-kotlin/java/functions/create-vcs-deployment.md index 9274cd88c7..25f2f28485 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/create-vcs-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; import io.appwrite.services.Functions; -import io.appwrite.enums.VCSDeploymentType; +import io.appwrite.enums.VCSReferenceType; Client client = new Client() .setEndpoint("https://.cloud.appwrite.io/v1") // Your API Endpoint @@ -12,7 +12,7 @@ Functions functions = new Functions(client); functions.createVcsDeployment( "", // functionId - VCSDeploymentType.BRANCH, // type + VCSReferenceType.BRANCH, // type "", // reference false, // activate (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/create.md b/docs/examples/1.8.x/server-kotlin/java/functions/create.md index 587fd54b9b..17e291140a 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/create.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/create.md @@ -14,15 +14,15 @@ functions.create( "", // functionId "", // name Runtime.NODE_14_5, // runtime - listOf("any"), // execute (optional) - listOf(), // events (optional) + List.of("any"), // execute (optional) + List.of(), // events (optional) "", // schedule (optional) 1, // timeout (optional) false, // enabled (optional) false, // logging (optional) "", // entrypoint (optional) "", // commands (optional) - listOf(), // scopes (optional) + List.of(), // scopes (optional) "", // installationId (optional) "", // providerRepositoryId (optional) "", // providerBranch (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/list-deployments.md b/docs/examples/1.8.x/server-kotlin/java/functions/list-deployments.md index a0ea8b68b3..a92cf0792a 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/list-deployments.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/list-deployments.md @@ -11,7 +11,7 @@ Functions functions = new Functions(client); functions.listDeployments( "", // functionId - listOf(), // queries (optional) + List.of(), // queries (optional) "", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/list-executions.md b/docs/examples/1.8.x/server-kotlin/java/functions/list-executions.md index 8026d4730b..2b97ab3be6 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/list-executions.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/list-executions.md @@ -11,7 +11,7 @@ Functions functions = new Functions(client); functions.listExecutions( "", // functionId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/list.md b/docs/examples/1.8.x/server-kotlin/java/functions/list.md index 5d0f59c3b8..712510db4c 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/list.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/list.md @@ -10,7 +10,7 @@ Client client = new Client() Functions functions = new Functions(client); functions.list( - listOf(), // queries (optional) + List.of(), // queries (optional) "", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/functions/update.md b/docs/examples/1.8.x/server-kotlin/java/functions/update.md index 5cb560e200..4b54a6361d 100644 --- a/docs/examples/1.8.x/server-kotlin/java/functions/update.md +++ b/docs/examples/1.8.x/server-kotlin/java/functions/update.md @@ -14,15 +14,15 @@ functions.update( "", // functionId "", // name Runtime.NODE_14_5, // runtime (optional) - listOf("any"), // execute (optional) - listOf(), // events (optional) + List.of("any"), // execute (optional) + List.of(), // events (optional) "", // schedule (optional) 1, // timeout (optional) false, // enabled (optional) false, // logging (optional) "", // entrypoint (optional) "", // commands (optional) - listOf(), // scopes (optional) + List.of(), // scopes (optional) "", // installationId (optional) "", // providerRepositoryId (optional) "", // providerBranch (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/graphql/mutation.md b/docs/examples/1.8.x/server-kotlin/java/graphql/mutation.md index 778892457b..baf41a8a65 100644 --- a/docs/examples/1.8.x/server-kotlin/java/graphql/mutation.md +++ b/docs/examples/1.8.x/server-kotlin/java/graphql/mutation.md @@ -10,7 +10,7 @@ Client client = new Client() Graphql graphql = new Graphql(client); graphql.mutation( - mapOf( "a" to "b" ), // query + Map.of("a", "b"), // query new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/graphql/query.md b/docs/examples/1.8.x/server-kotlin/java/graphql/query.md index e109d523f8..381da3fb5a 100644 --- a/docs/examples/1.8.x/server-kotlin/java/graphql/query.md +++ b/docs/examples/1.8.x/server-kotlin/java/graphql/query.md @@ -10,7 +10,7 @@ Client client = new Client() Graphql graphql = new Graphql(client); graphql.query( - mapOf( "a" to "b" ), // query + Map.of("a", "b"), // query new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/create-email.md b/docs/examples/1.8.x/server-kotlin/java/messaging/create-email.md index d6ab5ee1bf..ca654e6a08 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/create-email.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/create-email.md @@ -13,12 +13,12 @@ messaging.createEmail( "", // messageId "", // subject "", // content - listOf(), // topics (optional) - listOf(), // users (optional) - listOf(), // targets (optional) - listOf(), // cc (optional) - listOf(), // bcc (optional) - listOf(), // attachments (optional) + List.of(), // topics (optional) + List.of(), // users (optional) + List.of(), // targets (optional) + List.of(), // cc (optional) + List.of(), // bcc (optional) + List.of(), // attachments (optional) false, // draft (optional) false, // html (optional) "", // scheduledAt (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/create-fcm-provider.md b/docs/examples/1.8.x/server-kotlin/java/messaging/create-fcm-provider.md index 0d67e28cf0..554ab3cbcf 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/create-fcm-provider.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/create-fcm-provider.md @@ -12,7 +12,7 @@ Messaging messaging = new Messaging(client); messaging.createFCMProvider( "", // providerId "", // name - mapOf( "a" to "b" ), // serviceAccountJSON (optional) + Map.of("a", "b"), // serviceAccountJSON (optional) false, // enabled (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/create-push.md b/docs/examples/1.8.x/server-kotlin/java/messaging/create-push.md index 94119e6a93..7ab3541a7d 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/create-push.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/create-push.md @@ -14,10 +14,10 @@ messaging.createPush( "", // messageId "", // title (optional) "<BODY>", // body (optional) - listOf(), // topics (optional) - listOf(), // users (optional) - listOf(), // targets (optional) - mapOf( "a" to "b" ), // data (optional) + List.of(), // topics (optional) + List.of(), // users (optional) + List.of(), // targets (optional) + Map.of("a", "b"), // data (optional) "<ACTION>", // action (optional) "<ID1:ID2>", // image (optional) "<ICON>", // icon (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/create-sms.md b/docs/examples/1.8.x/server-kotlin/java/messaging/create-sms.md index ca40cc33a8..5ac95079f7 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/create-sms.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/create-sms.md @@ -12,9 +12,9 @@ Messaging messaging = new Messaging(client); messaging.createSMS( "<MESSAGE_ID>", // messageId "<CONTENT>", // content - listOf(), // topics (optional) - listOf(), // users (optional) - listOf(), // targets (optional) + List.of(), // topics (optional) + List.of(), // users (optional) + List.of(), // targets (optional) false, // draft (optional) "", // scheduledAt (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/create-topic.md b/docs/examples/1.8.x/server-kotlin/java/messaging/create-topic.md index 63a24b467d..ec55053d42 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/create-topic.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/create-topic.md @@ -12,7 +12,7 @@ Messaging messaging = new Messaging(client); messaging.createTopic( "<TOPIC_ID>", // topicId "<NAME>", // name - listOf("any"), // subscribe (optional) + List.of("any"), // subscribe (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-message-logs.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-message-logs.md index 253299ccec..30469ffc09 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-message-logs.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-message-logs.md @@ -11,7 +11,7 @@ Messaging messaging = new Messaging(client); messaging.listMessageLogs( "<MESSAGE_ID>", // messageId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-messages.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-messages.md index 6535222999..8af8085d8e 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-messages.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-messages.md @@ -10,7 +10,7 @@ Client client = new Client() Messaging messaging = new Messaging(client); messaging.listMessages( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-provider-logs.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-provider-logs.md index 3bce21144d..e62dedf89d 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-provider-logs.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-provider-logs.md @@ -11,7 +11,7 @@ Messaging messaging = new Messaging(client); messaging.listProviderLogs( "<PROVIDER_ID>", // providerId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-providers.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-providers.md index 115cd41745..b52408c02d 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-providers.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-providers.md @@ -10,7 +10,7 @@ Client client = new Client() Messaging messaging = new Messaging(client); messaging.listProviders( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscriber-logs.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscriber-logs.md index e2e1e94667..317db32986 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscriber-logs.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscriber-logs.md @@ -11,7 +11,7 @@ Messaging messaging = new Messaging(client); messaging.listSubscriberLogs( "<SUBSCRIBER_ID>", // subscriberId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscribers.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscribers.md index 3b87ed865d..cc552179de 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscribers.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-subscribers.md @@ -11,7 +11,7 @@ Messaging messaging = new Messaging(client); messaging.listSubscribers( "<TOPIC_ID>", // topicId - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-targets.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-targets.md index db6aee1f68..b123218d22 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-targets.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-targets.md @@ -11,7 +11,7 @@ Messaging messaging = new Messaging(client); messaging.listTargets( "<MESSAGE_ID>", // messageId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-topic-logs.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-topic-logs.md index 800bb6b7d2..d2d8809575 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-topic-logs.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-topic-logs.md @@ -11,7 +11,7 @@ Messaging messaging = new Messaging(client); messaging.listTopicLogs( "<TOPIC_ID>", // topicId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/list-topics.md b/docs/examples/1.8.x/server-kotlin/java/messaging/list-topics.md index bd53b41d21..ea258c2759 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/list-topics.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/list-topics.md @@ -10,7 +10,7 @@ Client client = new Client() Messaging messaging = new Messaging(client); messaging.listTopics( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/update-email.md b/docs/examples/1.8.x/server-kotlin/java/messaging/update-email.md index 56e9767861..1bed63b313 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/update-email.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/update-email.md @@ -11,17 +11,17 @@ Messaging messaging = new Messaging(client); messaging.updateEmail( "<MESSAGE_ID>", // messageId - listOf(), // topics (optional) - listOf(), // users (optional) - listOf(), // targets (optional) + List.of(), // topics (optional) + List.of(), // users (optional) + List.of(), // targets (optional) "<SUBJECT>", // subject (optional) "<CONTENT>", // content (optional) false, // draft (optional) false, // html (optional) - listOf(), // cc (optional) - listOf(), // bcc (optional) + List.of(), // cc (optional) + List.of(), // bcc (optional) "", // scheduledAt (optional) - listOf(), // attachments (optional) + List.of(), // attachments (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/update-fcm-provider.md b/docs/examples/1.8.x/server-kotlin/java/messaging/update-fcm-provider.md index dd92f9321f..2976ff5a53 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/update-fcm-provider.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/update-fcm-provider.md @@ -13,7 +13,7 @@ messaging.updateFCMProvider( "<PROVIDER_ID>", // providerId "<NAME>", // name (optional) false, // enabled (optional) - mapOf( "a" to "b" ), // serviceAccountJSON (optional) + Map.of("a", "b"), // serviceAccountJSON (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/update-push.md b/docs/examples/1.8.x/server-kotlin/java/messaging/update-push.md index 80ad6fcd30..80f70130e5 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/update-push.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/update-push.md @@ -12,12 +12,12 @@ Messaging messaging = new Messaging(client); messaging.updatePush( "<MESSAGE_ID>", // messageId - listOf(), // topics (optional) - listOf(), // users (optional) - listOf(), // targets (optional) + List.of(), // topics (optional) + List.of(), // users (optional) + List.of(), // targets (optional) "<TITLE>", // title (optional) "<BODY>", // body (optional) - mapOf( "a" to "b" ), // data (optional) + Map.of("a", "b"), // data (optional) "<ACTION>", // action (optional) "<ID1:ID2>", // image (optional) "<ICON>", // icon (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/update-sms.md b/docs/examples/1.8.x/server-kotlin/java/messaging/update-sms.md index c59505b68a..4df9588f55 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/update-sms.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/update-sms.md @@ -11,9 +11,9 @@ Messaging messaging = new Messaging(client); messaging.updateSMS( "<MESSAGE_ID>", // messageId - listOf(), // topics (optional) - listOf(), // users (optional) - listOf(), // targets (optional) + List.of(), // topics (optional) + List.of(), // users (optional) + List.of(), // targets (optional) "<CONTENT>", // content (optional) false, // draft (optional) "", // scheduledAt (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/messaging/update-topic.md b/docs/examples/1.8.x/server-kotlin/java/messaging/update-topic.md index be9c44dc23..0d651c7895 100644 --- a/docs/examples/1.8.x/server-kotlin/java/messaging/update-topic.md +++ b/docs/examples/1.8.x/server-kotlin/java/messaging/update-topic.md @@ -12,7 +12,7 @@ Messaging messaging = new Messaging(client); messaging.updateTopic( "<TOPIC_ID>", // topicId "<NAME>", // name (optional) - listOf("any"), // subscribe (optional) + List.of("any"), // subscribe (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/sites/create-template-deployment.md b/docs/examples/1.8.x/server-kotlin/java/sites/create-template-deployment.md index a501461a2c..e7fee585a7 100644 --- a/docs/examples/1.8.x/server-kotlin/java/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/java/sites/create-template-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; import io.appwrite.services.Sites; -import io.appwrite.enums.Type; +import io.appwrite.enums.TemplateReferenceType; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ sites.createTemplateDeployment( "<REPOSITORY>", // repository "<OWNER>", // owner "<ROOT_DIRECTORY>", // rootDirectory - .BRANCH, // type + TemplateReferenceType.BRANCH, // type "<REFERENCE>", // reference false, // activate (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-kotlin/java/sites/create-vcs-deployment.md index 754eb26419..8a1dca95cc 100644 --- a/docs/examples/1.8.x/server-kotlin/java/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/java/sites/create-vcs-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; import io.appwrite.services.Sites; -import io.appwrite.enums.VCSDeploymentType; +import io.appwrite.enums.VCSReferenceType; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -12,7 +12,7 @@ Sites sites = new Sites(client); sites.createVcsDeployment( "<SITE_ID>", // siteId - VCSDeploymentType.BRANCH, // type + VCSReferenceType.BRANCH, // type "<REFERENCE>", // reference false, // activate (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/sites/list-deployments.md b/docs/examples/1.8.x/server-kotlin/java/sites/list-deployments.md index a19f4ecf09..a1953cdf6e 100644 --- a/docs/examples/1.8.x/server-kotlin/java/sites/list-deployments.md +++ b/docs/examples/1.8.x/server-kotlin/java/sites/list-deployments.md @@ -11,7 +11,7 @@ Sites sites = new Sites(client); sites.listDeployments( "<SITE_ID>", // siteId - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/sites/list-logs.md b/docs/examples/1.8.x/server-kotlin/java/sites/list-logs.md index 85c2171aa2..095f0ae97a 100644 --- a/docs/examples/1.8.x/server-kotlin/java/sites/list-logs.md +++ b/docs/examples/1.8.x/server-kotlin/java/sites/list-logs.md @@ -11,7 +11,7 @@ Sites sites = new Sites(client); sites.listLogs( "<SITE_ID>", // siteId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/sites/list.md b/docs/examples/1.8.x/server-kotlin/java/sites/list.md index 20b5533c7a..d8c69419fe 100644 --- a/docs/examples/1.8.x/server-kotlin/java/sites/list.md +++ b/docs/examples/1.8.x/server-kotlin/java/sites/list.md @@ -10,7 +10,7 @@ Client client = new Client() Sites sites = new Sites(client); sites.list( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/storage/create-bucket.md b/docs/examples/1.8.x/server-kotlin/java/storage/create-bucket.md index b228408933..0af282a0ca 100644 --- a/docs/examples/1.8.x/server-kotlin/java/storage/create-bucket.md +++ b/docs/examples/1.8.x/server-kotlin/java/storage/create-bucket.md @@ -1,9 +1,9 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Storage; -import io.appwrite.enums.Compression; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Storage; +import io.appwrite.enums.Compression; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,11 +15,11 @@ Storage storage = new Storage(client); storage.createBucket( "<BUCKET_ID>", // bucketId "<NAME>", // name - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) false, // fileSecurity (optional) false, // enabled (optional) 1, // maximumFileSize (optional) - listOf(), // allowedFileExtensions (optional) + List.of(), // allowedFileExtensions (optional) Compression.NONE, // compression (optional) false, // encryption (optional) false, // antivirus (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/storage/create-file.md b/docs/examples/1.8.x/server-kotlin/java/storage/create-file.md index 7ddf8913e1..abaeee3eca 100644 --- a/docs/examples/1.8.x/server-kotlin/java/storage/create-file.md +++ b/docs/examples/1.8.x/server-kotlin/java/storage/create-file.md @@ -1,9 +1,9 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; import io.appwrite.models.InputFile; -import io.appwrite.services.Storage; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Storage; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -16,7 +16,7 @@ storage.createFile( "<BUCKET_ID>", // bucketId "<FILE_ID>", // fileId InputFile.fromPath("file.png"), // file - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/storage/list-buckets.md b/docs/examples/1.8.x/server-kotlin/java/storage/list-buckets.md index 504cfb7ce2..3fde32c73c 100644 --- a/docs/examples/1.8.x/server-kotlin/java/storage/list-buckets.md +++ b/docs/examples/1.8.x/server-kotlin/java/storage/list-buckets.md @@ -10,7 +10,7 @@ Client client = new Client() Storage storage = new Storage(client); storage.listBuckets( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/storage/list-files.md b/docs/examples/1.8.x/server-kotlin/java/storage/list-files.md index 6397ca07bc..712c420011 100644 --- a/docs/examples/1.8.x/server-kotlin/java/storage/list-files.md +++ b/docs/examples/1.8.x/server-kotlin/java/storage/list-files.md @@ -11,7 +11,7 @@ Storage storage = new Storage(client); storage.listFiles( "<BUCKET_ID>", // bucketId - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/storage/update-bucket.md b/docs/examples/1.8.x/server-kotlin/java/storage/update-bucket.md index 26758cf19a..47b322e449 100644 --- a/docs/examples/1.8.x/server-kotlin/java/storage/update-bucket.md +++ b/docs/examples/1.8.x/server-kotlin/java/storage/update-bucket.md @@ -1,9 +1,9 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Storage; -import io.appwrite.enums.Compression; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Storage; +import io.appwrite.enums.Compression; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,11 +15,11 @@ Storage storage = new Storage(client); storage.updateBucket( "<BUCKET_ID>", // bucketId "<NAME>", // name - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) false, // fileSecurity (optional) false, // enabled (optional) 1, // maximumFileSize (optional) - listOf(), // allowedFileExtensions (optional) + List.of(), // allowedFileExtensions (optional) Compression.NONE, // compression (optional) false, // encryption (optional) false, // antivirus (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/storage/update-file.md b/docs/examples/1.8.x/server-kotlin/java/storage/update-file.md index d534e0eb64..b394fd5672 100644 --- a/docs/examples/1.8.x/server-kotlin/java/storage/update-file.md +++ b/docs/examples/1.8.x/server-kotlin/java/storage/update-file.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.Storage; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.Storage; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ storage.updateFile( "<BUCKET_ID>", // bucketId "<FILE_ID>", // fileId "<NAME>", // name (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-enum-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-enum-column.md index bc31bbe79e..ea0452f250 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-enum-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-enum-column.md @@ -13,7 +13,7 @@ tablesDB.createEnumColumn( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "", // key - listOf(), // elements + List.of(), // elements false, // required "<DEFAULT>", // default (optional) false, // array (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-index.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-index.md index 991bd3429b..07076d9763 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-index.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-index.md @@ -15,9 +15,9 @@ tablesDB.createIndex( "<TABLE_ID>", // tableId "", // key IndexType.KEY, // type - listOf(), // columns - listOf(), // orders (optional) - listOf(), // lengths (optional) + List.of(), // columns + List.of(), // orders (optional) + List.of(), // lengths (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-line-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-line-column.md index afe029ebe8..f8351cac79 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-line-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-line-column.md @@ -14,7 +14,7 @@ tablesDB.createLineColumn( "<TABLE_ID>", // tableId "", // key false, // required - listOf([1, 2], [3, 4], [5, 6]), // default (optional) + List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6)), // default (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-operations.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-operations.md index 9504f623b3..a7c3a1bcb8 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-operations.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-operations.md @@ -11,17 +11,15 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.createOperations( "<TRANSACTION_ID>", // transactionId - listOf( - { - "action": "create", - "databaseId": "<DATABASE_ID>", - "tableId": "<TABLE_ID>", - "rowId": "<ROW_ID>", - "data": { - "name": "Walter O'Brien" - } - } - ), // operations (optional) + List.of(Map.of( + "action", "create", + "databaseId", "<DATABASE_ID>", + "tableId", "<TABLE_ID>", + "rowId", "<ROW_ID>", + "data", Map.of( + "name", "Walter O'Brien" + ) + )), // operations (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-point-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-point-column.md index 2c9941b09c..2f6ae0e937 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-point-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-point-column.md @@ -14,7 +14,7 @@ tablesDB.createPointColumn( "<TABLE_ID>", // tableId "", // key false, // required - listOf(1, 2), // default (optional) + List.of(1, 2), // default (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-polygon-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-polygon-column.md index 58ca798381..58caa8a791 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-polygon-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-polygon-column.md @@ -14,7 +14,7 @@ tablesDB.createPolygonColumn( "<TABLE_ID>", // tableId "", // key false, // required - listOf([[1, 2], [3, 4], [5, 6], [1, 2]]), // default (optional) + List.of(List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6), List.of(1, 2))), // default (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-row.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-row.md index 9e47167cd1..3da8c3248e 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-row.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-row.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,14 +15,14 @@ tablesDB.createRow( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "<ROW_ID>", // rowId - mapOf( - "username" to "walter.obrien", - "email" to "walter.obrien@example.com", - "fullName" to "Walter O'Brien", - "age" to 30, - "isAdmin" to false + Map.of( + "username", "walter.obrien", + "email", "walter.obrien@example.com", + "fullName", "Walter O'Brien", + "age", 30, + "isAdmin", false ), // data - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-rows.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-rows.md index 956d812165..e99ea04da4 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-rows.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-rows.md @@ -12,7 +12,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.createRows( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId - listOf(), // rows + List.of(), // rows "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-table.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-table.md index 1f9fd10d5c..615278a2d4 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-table.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/create-table.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ tablesDB.createTable( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "<NAME>", // name - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) false, // rowSecurity (optional) false, // enabled (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/delete-rows.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/delete-rows.md index 80ca0bb40f..f90789d276 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/delete-rows.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/delete-rows.md @@ -12,7 +12,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.deleteRows( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId - listOf(), // queries (optional) + List.of(), // queries (optional) "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/get-row.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/get-row.md index d642ebcaf1..5b18e8f879 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/get-row.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/get-row.md @@ -13,7 +13,7 @@ tablesDB.getRow( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "<ROW_ID>", // rowId - listOf(), // queries (optional) + List.of(), // queries (optional) "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-columns.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-columns.md index bdf376cb33..f7e37f970b 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-columns.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-columns.md @@ -12,7 +12,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.listColumns( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-indexes.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-indexes.md index 5b73204314..ca792c5470 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-indexes.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-indexes.md @@ -12,7 +12,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.listIndexes( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-rows.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-rows.md index 8d7956bbc6..7903da4b32 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-rows.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-rows.md @@ -12,7 +12,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.listRows( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId - listOf(), // queries (optional) + List.of(), // queries (optional) "<TRANSACTION_ID>", // transactionId (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-tables.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-tables.md index 646be0f4a4..9b4c88bdc0 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-tables.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-tables.md @@ -11,7 +11,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.listTables( "<DATABASE_ID>", // databaseId - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-transactions.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-transactions.md index acc4902da4..f0b4db05db 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-transactions.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list-transactions.md @@ -10,7 +10,7 @@ Client client = new Client() TablesDB tablesDB = new TablesDB(client); tablesDB.listTransactions( - listOf(), // queries (optional) + List.of(), // queries (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list.md index 98784df806..cf23036591 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/list.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/list.md @@ -10,7 +10,7 @@ Client client = new Client() TablesDB tablesDB = new TablesDB(client); tablesDB.list( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-enum-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-enum-column.md index 5a8036aebc..0f182b76f0 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-enum-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-enum-column.md @@ -13,7 +13,7 @@ tablesDB.updateEnumColumn( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "", // key - listOf(), // elements + List.of(), // elements false, // required "<DEFAULT>", // default "", // newKey (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-line-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-line-column.md index 4c65a907f7..4ef648fbc9 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-line-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-line-column.md @@ -14,7 +14,7 @@ tablesDB.updateLineColumn( "<TABLE_ID>", // tableId "", // key false, // required - listOf([1, 2], [3, 4], [5, 6]), // default (optional) + List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6)), // default (optional) "", // newKey (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-point-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-point-column.md index 56ac86a6f0..729595dfa6 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-point-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-point-column.md @@ -14,7 +14,7 @@ tablesDB.updatePointColumn( "<TABLE_ID>", // tableId "", // key false, // required - listOf(1, 2), // default (optional) + List.of(1, 2), // default (optional) "", // newKey (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-polygon-column.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-polygon-column.md index 189d473175..bc6ccc93b5 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-polygon-column.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-polygon-column.md @@ -14,7 +14,7 @@ tablesDB.updatePolygonColumn( "<TABLE_ID>", // tableId "", // key false, // required - listOf([[1, 2], [3, 4], [5, 6], [1, 2]]), // default (optional) + List.of(List.of(List.of(1, 2), List.of(3, 4), List.of(5, 6), List.of(1, 2))), // default (optional) "", // newKey (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-row.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-row.md index 835f63b19a..5585274cbb 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-row.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-row.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,8 +15,8 @@ tablesDB.updateRow( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "<ROW_ID>", // rowId - mapOf( "a" to "b" ), // data (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-rows.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-rows.md index 7d39e4422c..b479613856 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-rows.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-rows.md @@ -12,8 +12,8 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.updateRows( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId - mapOf( "a" to "b" ), // data (optional) - listOf(), // queries (optional) + Map.of("a", "b"), // data (optional) + List.of(), // queries (optional) "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-table.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-table.md index 257803b984..cf0c2fbc2b 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-table.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/update-table.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ tablesDB.updateTable( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "<NAME>", // name - listOf(Permission.read(Role.any())), // permissions (optional) + List.of(Permission.read(Role.any())), // permissions (optional) false, // rowSecurity (optional) false, // enabled (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-row.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-row.md index 6ea29e3e8d..adb2095f34 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-row.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-row.md @@ -1,8 +1,8 @@ import io.appwrite.Client; import io.appwrite.coroutines.CoroutineCallback; -import io.appwrite.services.TablesDB; import io.appwrite.Permission; import io.appwrite.Role; +import io.appwrite.services.TablesDB; Client client = new Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,8 +15,8 @@ tablesDB.upsertRow( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId "<ROW_ID>", // rowId - mapOf( "a" to "b" ), // data (optional) - listOf(Permission.read(Role.any())), // permissions (optional) + Map.of("a", "b"), // data (optional) + List.of(Permission.read(Role.any())), // permissions (optional) "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-rows.md b/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-rows.md index c4b2bf3857..e16ecb35c9 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-rows.md +++ b/docs/examples/1.8.x/server-kotlin/java/tablesdb/upsert-rows.md @@ -12,7 +12,7 @@ TablesDB tablesDB = new TablesDB(client); tablesDB.upsertRows( "<DATABASE_ID>", // databaseId "<TABLE_ID>", // tableId - listOf(), // rows + List.of(), // rows "<TRANSACTION_ID>", // transactionId (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/teams/create-membership.md b/docs/examples/1.8.x/server-kotlin/java/teams/create-membership.md index 89e9d96ef6..e71ea2e578 100644 --- a/docs/examples/1.8.x/server-kotlin/java/teams/create-membership.md +++ b/docs/examples/1.8.x/server-kotlin/java/teams/create-membership.md @@ -11,7 +11,7 @@ Teams teams = new Teams(client); teams.createMembership( "<TEAM_ID>", // teamId - listOf(), // roles + List.of(), // roles "email@example.com", // email (optional) "<USER_ID>", // userId (optional) "+12065550100", // phone (optional) diff --git a/docs/examples/1.8.x/server-kotlin/java/teams/create.md b/docs/examples/1.8.x/server-kotlin/java/teams/create.md index 28cc3dada1..bc82cb47e1 100644 --- a/docs/examples/1.8.x/server-kotlin/java/teams/create.md +++ b/docs/examples/1.8.x/server-kotlin/java/teams/create.md @@ -12,7 +12,7 @@ Teams teams = new Teams(client); teams.create( "<TEAM_ID>", // teamId "<NAME>", // name - listOf(), // roles (optional) + List.of(), // roles (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/teams/list-memberships.md b/docs/examples/1.8.x/server-kotlin/java/teams/list-memberships.md index bfbf519db8..5437e6048c 100644 --- a/docs/examples/1.8.x/server-kotlin/java/teams/list-memberships.md +++ b/docs/examples/1.8.x/server-kotlin/java/teams/list-memberships.md @@ -11,7 +11,7 @@ Teams teams = new Teams(client); teams.listMemberships( "<TEAM_ID>", // teamId - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/teams/list.md b/docs/examples/1.8.x/server-kotlin/java/teams/list.md index 7ff98ad86f..06f0034bfe 100644 --- a/docs/examples/1.8.x/server-kotlin/java/teams/list.md +++ b/docs/examples/1.8.x/server-kotlin/java/teams/list.md @@ -10,7 +10,7 @@ Client client = new Client() Teams teams = new Teams(client); teams.list( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/teams/update-membership.md b/docs/examples/1.8.x/server-kotlin/java/teams/update-membership.md index d4816c57f1..2e0de4e3b0 100644 --- a/docs/examples/1.8.x/server-kotlin/java/teams/update-membership.md +++ b/docs/examples/1.8.x/server-kotlin/java/teams/update-membership.md @@ -12,7 +12,7 @@ Teams teams = new Teams(client); teams.updateMembership( "<TEAM_ID>", // teamId "<MEMBERSHIP_ID>", // membershipId - listOf(), // roles + List.of(), // roles new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/teams/update-prefs.md b/docs/examples/1.8.x/server-kotlin/java/teams/update-prefs.md index 2ef05222df..85f18aef1e 100644 --- a/docs/examples/1.8.x/server-kotlin/java/teams/update-prefs.md +++ b/docs/examples/1.8.x/server-kotlin/java/teams/update-prefs.md @@ -11,7 +11,7 @@ Teams teams = new Teams(client); teams.updatePrefs( "<TEAM_ID>", // teamId - mapOf( "a" to "b" ), // prefs + Map.of("a", "b"), // prefs new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/tokens/list.md b/docs/examples/1.8.x/server-kotlin/java/tokens/list.md index 23c51a64ef..1147f6f536 100644 --- a/docs/examples/1.8.x/server-kotlin/java/tokens/list.md +++ b/docs/examples/1.8.x/server-kotlin/java/tokens/list.md @@ -12,7 +12,7 @@ Tokens tokens = new Tokens(client); tokens.list( "<BUCKET_ID>", // bucketId "<FILE_ID>", // fileId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/users/list-identities.md b/docs/examples/1.8.x/server-kotlin/java/users/list-identities.md index fc95c8e48c..2dfa297592 100644 --- a/docs/examples/1.8.x/server-kotlin/java/users/list-identities.md +++ b/docs/examples/1.8.x/server-kotlin/java/users/list-identities.md @@ -10,7 +10,7 @@ Client client = new Client() Users users = new Users(client); users.listIdentities( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/users/list-logs.md b/docs/examples/1.8.x/server-kotlin/java/users/list-logs.md index 4a2e549ed4..ebaa749f56 100644 --- a/docs/examples/1.8.x/server-kotlin/java/users/list-logs.md +++ b/docs/examples/1.8.x/server-kotlin/java/users/list-logs.md @@ -11,7 +11,7 @@ Users users = new Users(client); users.listLogs( "<USER_ID>", // userId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/users/list-memberships.md b/docs/examples/1.8.x/server-kotlin/java/users/list-memberships.md index 36e67ae322..3335e18bc7 100644 --- a/docs/examples/1.8.x/server-kotlin/java/users/list-memberships.md +++ b/docs/examples/1.8.x/server-kotlin/java/users/list-memberships.md @@ -11,7 +11,7 @@ Users users = new Users(client); users.listMemberships( "<USER_ID>", // userId - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/users/list-targets.md b/docs/examples/1.8.x/server-kotlin/java/users/list-targets.md index 156aaefa7e..02fd291cb5 100644 --- a/docs/examples/1.8.x/server-kotlin/java/users/list-targets.md +++ b/docs/examples/1.8.x/server-kotlin/java/users/list-targets.md @@ -11,7 +11,7 @@ Users users = new Users(client); users.listTargets( "<USER_ID>", // userId - listOf(), // queries (optional) + List.of(), // queries (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { if (error != null) { diff --git a/docs/examples/1.8.x/server-kotlin/java/users/list.md b/docs/examples/1.8.x/server-kotlin/java/users/list.md index ec038afded..65ed4b00f8 100644 --- a/docs/examples/1.8.x/server-kotlin/java/users/list.md +++ b/docs/examples/1.8.x/server-kotlin/java/users/list.md @@ -10,7 +10,7 @@ Client client = new Client() Users users = new Users(client); users.list( - listOf(), // queries (optional) + List.of(), // queries (optional) "<SEARCH>", // search (optional) false, // total (optional) new CoroutineCallback<>((result, error) -> { diff --git a/docs/examples/1.8.x/server-kotlin/java/users/update-labels.md b/docs/examples/1.8.x/server-kotlin/java/users/update-labels.md index 379200a56b..953f466290 100644 --- a/docs/examples/1.8.x/server-kotlin/java/users/update-labels.md +++ b/docs/examples/1.8.x/server-kotlin/java/users/update-labels.md @@ -11,7 +11,7 @@ Users users = new Users(client); users.updateLabels( "<USER_ID>", // userId - listOf(), // labels + List.of(), // labels new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/java/users/update-prefs.md b/docs/examples/1.8.x/server-kotlin/java/users/update-prefs.md index c5a9677a20..5a128aa716 100644 --- a/docs/examples/1.8.x/server-kotlin/java/users/update-prefs.md +++ b/docs/examples/1.8.x/server-kotlin/java/users/update-prefs.md @@ -11,7 +11,7 @@ Users users = new Users(client); users.updatePrefs( "<USER_ID>", // userId - mapOf( "a" to "b" ), // prefs + Map.of("a", "b"), // prefs new CoroutineCallback<>((result, error) -> { if (error != null) { error.printStackTrace(); diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-line-attribute.md b/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-line-attribute.md index af9a4d2425..8f1322b3fd 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-line-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-line-attribute.md @@ -14,5 +14,5 @@ val response = databases.createLineAttribute( collectionId = "<COLLECTION_ID>", key = "", required = false, - default = listOf([1, 2], [3, 4], [5, 6]) // optional + default = listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6)) // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-operations.md b/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-operations.md index 1c741818b9..eae10ab609 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-operations.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-operations.md @@ -11,15 +11,13 @@ val databases = Databases(client) val response = databases.createOperations( transactionId = "<TRANSACTION_ID>", - operations = listOf( - { - "action": "create", - "databaseId": "<DATABASE_ID>", - "collectionId": "<COLLECTION_ID>", - "documentId": "<DOCUMENT_ID>", - "data": { - "name": "Walter O'Brien" - } - } - ) // optional + operations = listOf(mapOf( + "action" to "create", + "databaseId" to "<DATABASE_ID>", + "collectionId" to "<COLLECTION_ID>", + "documentId" to "<DOCUMENT_ID>", + "data" to mapOf( + "name" to "Walter O'Brien" + ) + )) // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-polygon-attribute.md b/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-polygon-attribute.md index ffeb3c4398..5a3491c414 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-polygon-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/databases/create-polygon-attribute.md @@ -14,5 +14,5 @@ val response = databases.createPolygonAttribute( collectionId = "<COLLECTION_ID>", key = "", required = false, - default = listOf([[1, 2], [3, 4], [5, 6], [1, 2]]) // optional + default = listOf(listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6), listOf(1, 2))) // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-line-attribute.md b/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-line-attribute.md index 0d6b40a2d8..0a8b50a332 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-line-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-line-attribute.md @@ -14,6 +14,6 @@ val response = databases.updateLineAttribute( collectionId = "<COLLECTION_ID>", key = "", required = false, - default = listOf([1, 2], [3, 4], [5, 6]), // optional + default = listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6)), // optional newKey = "" // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-polygon-attribute.md b/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-polygon-attribute.md index 66bbdea11c..37df6acee0 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-polygon-attribute.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/databases/update-polygon-attribute.md @@ -14,6 +14,6 @@ val response = databases.updatePolygonAttribute( collectionId = "<COLLECTION_ID>", key = "", required = false, - default = listOf([[1, 2], [3, 4], [5, 6], [1, 2]]), // optional + default = listOf(listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6), listOf(1, 2))), // optional newKey = "" // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-template-deployment.md b/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-template-deployment.md index b8eb44b4fa..176620e19d 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-template-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client import io.appwrite.coroutines.CoroutineCallback import io.appwrite.services.Functions -import io.appwrite.enums.Type +import io.appwrite.enums.TemplateReferenceType val client = Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ val response = functions.createTemplateDeployment( repository = "<REPOSITORY>", owner = "<OWNER>", rootDirectory = "<ROOT_DIRECTORY>", - type = .COMMIT, + type = TemplateReferenceType.COMMIT, reference = "<REFERENCE>", activate = false // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-vcs-deployment.md index 08bb5a3097..4e1c21daeb 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/functions/create-vcs-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client import io.appwrite.coroutines.CoroutineCallback import io.appwrite.services.Functions -import io.appwrite.enums.VCSDeploymentType +import io.appwrite.enums.VCSReferenceType val client = Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -12,7 +12,7 @@ val functions = Functions(client) val response = functions.createVcsDeployment( functionId = "<FUNCTION_ID>", - type = VCSDeploymentType.BRANCH, + type = VCSReferenceType.BRANCH, reference = "<REFERENCE>", activate = false // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-template-deployment.md b/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-template-deployment.md index 1f3d7d386a..6ef7414bc4 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-template-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client import io.appwrite.coroutines.CoroutineCallback import io.appwrite.services.Sites -import io.appwrite.enums.Type +import io.appwrite.enums.TemplateReferenceType val client = Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -15,7 +15,7 @@ val response = sites.createTemplateDeployment( repository = "<REPOSITORY>", owner = "<OWNER>", rootDirectory = "<ROOT_DIRECTORY>", - type = .BRANCH, + type = TemplateReferenceType.BRANCH, reference = "<REFERENCE>", activate = false // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-vcs-deployment.md index 141cf3e658..c11e890fc0 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/sites/create-vcs-deployment.md @@ -1,7 +1,7 @@ import io.appwrite.Client import io.appwrite.coroutines.CoroutineCallback import io.appwrite.services.Sites -import io.appwrite.enums.VCSDeploymentType +import io.appwrite.enums.VCSReferenceType val client = Client() .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint @@ -12,7 +12,7 @@ val sites = Sites(client) val response = sites.createVcsDeployment( siteId = "<SITE_ID>", - type = VCSDeploymentType.BRANCH, + type = VCSReferenceType.BRANCH, reference = "<REFERENCE>", activate = false // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-line-column.md b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-line-column.md index 3dd9ebd083..cede289439 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-line-column.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-line-column.md @@ -14,5 +14,5 @@ val response = tablesDB.createLineColumn( tableId = "<TABLE_ID>", key = "", required = false, - default = listOf([1, 2], [3, 4], [5, 6]) // optional + default = listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6)) // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-operations.md b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-operations.md index 40c98d1c81..5b05949715 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-operations.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-operations.md @@ -11,15 +11,13 @@ val tablesDB = TablesDB(client) val response = tablesDB.createOperations( transactionId = "<TRANSACTION_ID>", - operations = listOf( - { - "action": "create", - "databaseId": "<DATABASE_ID>", - "tableId": "<TABLE_ID>", - "rowId": "<ROW_ID>", - "data": { - "name": "Walter O'Brien" - } - } - ) // optional + operations = listOf(mapOf( + "action" to "create", + "databaseId" to "<DATABASE_ID>", + "tableId" to "<TABLE_ID>", + "rowId" to "<ROW_ID>", + "data" to mapOf( + "name" to "Walter O'Brien" + ) + )) // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-polygon-column.md b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-polygon-column.md index 218b4cba33..c4282d1b67 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-polygon-column.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/create-polygon-column.md @@ -14,5 +14,5 @@ val response = tablesDB.createPolygonColumn( tableId = "<TABLE_ID>", key = "", required = false, - default = listOf([[1, 2], [3, 4], [5, 6], [1, 2]]) // optional + default = listOf(listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6), listOf(1, 2))) // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-line-column.md b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-line-column.md index 571d25206c..4b975c0ee0 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-line-column.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-line-column.md @@ -14,6 +14,6 @@ val response = tablesDB.updateLineColumn( tableId = "<TABLE_ID>", key = "", required = false, - default = listOf([1, 2], [3, 4], [5, 6]), // optional + default = listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6)), // optional newKey = "" // optional ) diff --git a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-polygon-column.md b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-polygon-column.md index db3a46bc6c..4042847176 100644 --- a/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-polygon-column.md +++ b/docs/examples/1.8.x/server-kotlin/kotlin/tablesdb/update-polygon-column.md @@ -14,6 +14,6 @@ val response = tablesDB.updatePolygonColumn( tableId = "<TABLE_ID>", key = "", required = false, - default = listOf([[1, 2], [3, 4], [5, 6], [1, 2]]), // optional + default = listOf(listOf(listOf(1, 2), listOf(3, 4), listOf(5, 6), listOf(1, 2))), // optional newKey = "" // optional ) diff --git a/docs/examples/1.8.x/server-nodejs/examples/functions/create-template-deployment.md b/docs/examples/1.8.x/server-nodejs/examples/functions/create-template-deployment.md index 999c029f8f..f1efd7b199 100644 --- a/docs/examples/1.8.x/server-nodejs/examples/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-nodejs/examples/functions/create-template-deployment.md @@ -12,7 +12,7 @@ const result = await functions.createTemplateDeployment({ repository: '<REPOSITORY>', owner: '<OWNER>', rootDirectory: '<ROOT_DIRECTORY>', - type: sdk..Commit, + type: sdk.TemplateReferenceType.Commit, reference: '<REFERENCE>', activate: false // optional }); diff --git a/docs/examples/1.8.x/server-nodejs/examples/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-nodejs/examples/functions/create-vcs-deployment.md index 0aabfcff8a..c648625531 100644 --- a/docs/examples/1.8.x/server-nodejs/examples/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-nodejs/examples/functions/create-vcs-deployment.md @@ -9,7 +9,7 @@ const functions = new sdk.Functions(client); const result = await functions.createVcsDeployment({ functionId: '<FUNCTION_ID>', - type: sdk.VCSDeploymentType.Branch, + type: sdk.VCSReferenceType.Branch, reference: '<REFERENCE>', activate: false // optional }); diff --git a/docs/examples/1.8.x/server-nodejs/examples/sites/create-template-deployment.md b/docs/examples/1.8.x/server-nodejs/examples/sites/create-template-deployment.md index dc9736fa80..3728f7f846 100644 --- a/docs/examples/1.8.x/server-nodejs/examples/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-nodejs/examples/sites/create-template-deployment.md @@ -12,7 +12,7 @@ const result = await sites.createTemplateDeployment({ repository: '<REPOSITORY>', owner: '<OWNER>', rootDirectory: '<ROOT_DIRECTORY>', - type: sdk..Branch, + type: sdk.TemplateReferenceType.Branch, reference: '<REFERENCE>', activate: false // optional }); diff --git a/docs/examples/1.8.x/server-nodejs/examples/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-nodejs/examples/sites/create-vcs-deployment.md index 7f7c2196ba..95cefea9ae 100644 --- a/docs/examples/1.8.x/server-nodejs/examples/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-nodejs/examples/sites/create-vcs-deployment.md @@ -9,7 +9,7 @@ const sites = new sdk.Sites(client); const result = await sites.createVcsDeployment({ siteId: '<SITE_ID>', - type: sdk.VCSDeploymentType.Branch, + type: sdk.VCSReferenceType.Branch, reference: '<REFERENCE>', activate: false // optional }); diff --git a/docs/examples/1.8.x/server-php/examples/functions/create-template-deployment.md b/docs/examples/1.8.x/server-php/examples/functions/create-template-deployment.md index 5888396312..a1272523f7 100644 --- a/docs/examples/1.8.x/server-php/examples/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-php/examples/functions/create-template-deployment.md @@ -2,7 +2,7 @@ use Appwrite\Client; use Appwrite\Services\Functions; -use Appwrite\Enums\Type; +use Appwrite\Enums\TemplateReferenceType; $client = (new Client()) ->setEndpoint('https://<REGION>.cloud.appwrite.io/v1') // Your API Endpoint @@ -16,7 +16,7 @@ $result = $functions->createTemplateDeployment( repository: '<REPOSITORY>', owner: '<OWNER>', rootDirectory: '<ROOT_DIRECTORY>', - type: Type::COMMIT(), + type: TemplateReferenceType::COMMIT(), reference: '<REFERENCE>', activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-php/examples/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-php/examples/functions/create-vcs-deployment.md index bb4622e67a..f044219541 100644 --- a/docs/examples/1.8.x/server-php/examples/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-php/examples/functions/create-vcs-deployment.md @@ -2,7 +2,7 @@ use Appwrite\Client; use Appwrite\Services\Functions; -use Appwrite\Enums\VCSDeploymentType; +use Appwrite\Enums\VCSReferenceType; $client = (new Client()) ->setEndpoint('https://<REGION>.cloud.appwrite.io/v1') // Your API Endpoint @@ -13,7 +13,7 @@ $functions = new Functions($client); $result = $functions->createVcsDeployment( functionId: '<FUNCTION_ID>', - type: VCSDeploymentType::BRANCH(), + type: VCSReferenceType::BRANCH(), reference: '<REFERENCE>', activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-php/examples/sites/create-template-deployment.md b/docs/examples/1.8.x/server-php/examples/sites/create-template-deployment.md index 314ffdd1b9..1661bbb407 100644 --- a/docs/examples/1.8.x/server-php/examples/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-php/examples/sites/create-template-deployment.md @@ -2,7 +2,7 @@ use Appwrite\Client; use Appwrite\Services\Sites; -use Appwrite\Enums\Type; +use Appwrite\Enums\TemplateReferenceType; $client = (new Client()) ->setEndpoint('https://<REGION>.cloud.appwrite.io/v1') // Your API Endpoint @@ -16,7 +16,7 @@ $result = $sites->createTemplateDeployment( repository: '<REPOSITORY>', owner: '<OWNER>', rootDirectory: '<ROOT_DIRECTORY>', - type: Type::BRANCH(), + type: TemplateReferenceType::BRANCH(), reference: '<REFERENCE>', activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-php/examples/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-php/examples/sites/create-vcs-deployment.md index 7f63dffdf8..015bf09d7d 100644 --- a/docs/examples/1.8.x/server-php/examples/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-php/examples/sites/create-vcs-deployment.md @@ -2,7 +2,7 @@ use Appwrite\Client; use Appwrite\Services\Sites; -use Appwrite\Enums\VCSDeploymentType; +use Appwrite\Enums\VCSReferenceType; $client = (new Client()) ->setEndpoint('https://<REGION>.cloud.appwrite.io/v1') // Your API Endpoint @@ -13,7 +13,7 @@ $sites = new Sites($client); $result = $sites->createVcsDeployment( siteId: '<SITE_ID>', - type: VCSDeploymentType::BRANCH(), + type: VCSReferenceType::BRANCH(), reference: '<REFERENCE>', activate: false // optional ); \ No newline at end of file diff --git a/docs/examples/1.8.x/server-python/examples/functions/create-template-deployment.md b/docs/examples/1.8.x/server-python/examples/functions/create-template-deployment.md index d9f8f70a82..db2058a87a 100644 --- a/docs/examples/1.8.x/server-python/examples/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-python/examples/functions/create-template-deployment.md @@ -1,6 +1,6 @@ from appwrite.client import Client from appwrite.services.functions import Functions -from appwrite.enums import +from appwrite.enums import TemplateReferenceType client = Client() client.set_endpoint('https://<REGION>.cloud.appwrite.io/v1') # Your API Endpoint @@ -14,7 +14,7 @@ result = functions.create_template_deployment( repository = '<REPOSITORY>', owner = '<OWNER>', root_directory = '<ROOT_DIRECTORY>', - type = .COMMIT, + type = TemplateReferenceType.COMMIT, reference = '<REFERENCE>', activate = False # optional ) diff --git a/docs/examples/1.8.x/server-python/examples/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-python/examples/functions/create-vcs-deployment.md index 4004baec27..43e198b4b8 100644 --- a/docs/examples/1.8.x/server-python/examples/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-python/examples/functions/create-vcs-deployment.md @@ -1,6 +1,6 @@ from appwrite.client import Client from appwrite.services.functions import Functions -from appwrite.enums import VCSDeploymentType +from appwrite.enums import VCSReferenceType client = Client() client.set_endpoint('https://<REGION>.cloud.appwrite.io/v1') # Your API Endpoint @@ -11,7 +11,7 @@ functions = Functions(client) result = functions.create_vcs_deployment( function_id = '<FUNCTION_ID>', - type = VCSDeploymentType.BRANCH, + type = VCSReferenceType.BRANCH, reference = '<REFERENCE>', activate = False # optional ) diff --git a/docs/examples/1.8.x/server-python/examples/sites/create-template-deployment.md b/docs/examples/1.8.x/server-python/examples/sites/create-template-deployment.md index fb47cb1453..700ca44d1b 100644 --- a/docs/examples/1.8.x/server-python/examples/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-python/examples/sites/create-template-deployment.md @@ -1,6 +1,6 @@ from appwrite.client import Client from appwrite.services.sites import Sites -from appwrite.enums import +from appwrite.enums import TemplateReferenceType client = Client() client.set_endpoint('https://<REGION>.cloud.appwrite.io/v1') # Your API Endpoint @@ -14,7 +14,7 @@ result = sites.create_template_deployment( repository = '<REPOSITORY>', owner = '<OWNER>', root_directory = '<ROOT_DIRECTORY>', - type = .BRANCH, + type = TemplateReferenceType.BRANCH, reference = '<REFERENCE>', activate = False # optional ) diff --git a/docs/examples/1.8.x/server-python/examples/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-python/examples/sites/create-vcs-deployment.md index 089e6c8141..ec02f31c00 100644 --- a/docs/examples/1.8.x/server-python/examples/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-python/examples/sites/create-vcs-deployment.md @@ -1,6 +1,6 @@ from appwrite.client import Client from appwrite.services.sites import Sites -from appwrite.enums import VCSDeploymentType +from appwrite.enums import VCSReferenceType client = Client() client.set_endpoint('https://<REGION>.cloud.appwrite.io/v1') # Your API Endpoint @@ -11,7 +11,7 @@ sites = Sites(client) result = sites.create_vcs_deployment( site_id = '<SITE_ID>', - type = VCSDeploymentType.BRANCH, + type = VCSReferenceType.BRANCH, reference = '<REFERENCE>', activate = False # optional ) diff --git a/docs/examples/1.8.x/server-rest/examples/account/create-mfa-challenge.md b/docs/examples/1.8.x/server-rest/examples/account/create-mfa-challenge.md index dd5ef4c731..e5a5b0ea05 100644 --- a/docs/examples/1.8.x/server-rest/examples/account/create-mfa-challenge.md +++ b/docs/examples/1.8.x/server-rest/examples/account/create-mfa-challenge.md @@ -1,4 +1,4 @@ -POST /v1/account/mfa/challenge HTTP/1.1 +POST /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.8.0 diff --git a/docs/examples/1.8.x/server-rest/examples/account/update-mfa-challenge.md b/docs/examples/1.8.x/server-rest/examples/account/update-mfa-challenge.md index b6a7e92b28..df2cd9a1e8 100644 --- a/docs/examples/1.8.x/server-rest/examples/account/update-mfa-challenge.md +++ b/docs/examples/1.8.x/server-rest/examples/account/update-mfa-challenge.md @@ -1,4 +1,4 @@ -PUT /v1/account/mfa/challenge HTTP/1.1 +PUT /v1/account/mfa/challenges HTTP/1.1 Host: cloud.appwrite.io Content-Type: application/json X-Appwrite-Response-Format: 1.8.0 diff --git a/docs/examples/1.8.x/server-ruby/examples/functions/create-template-deployment.md b/docs/examples/1.8.x/server-ruby/examples/functions/create-template-deployment.md index cfe0adc263..e4c759f3fc 100644 --- a/docs/examples/1.8.x/server-ruby/examples/functions/create-template-deployment.md +++ b/docs/examples/1.8.x/server-ruby/examples/functions/create-template-deployment.md @@ -15,7 +15,7 @@ result = functions.create_template_deployment( repository: '<REPOSITORY>', owner: '<OWNER>', root_directory: '<ROOT_DIRECTORY>', - type: ::COMMIT, + type: TemplateReferenceType::COMMIT, reference: '<REFERENCE>', activate: false # optional ) diff --git a/docs/examples/1.8.x/server-ruby/examples/functions/create-vcs-deployment.md b/docs/examples/1.8.x/server-ruby/examples/functions/create-vcs-deployment.md index 75bd3c49f5..930ec6dc76 100644 --- a/docs/examples/1.8.x/server-ruby/examples/functions/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-ruby/examples/functions/create-vcs-deployment.md @@ -12,7 +12,7 @@ functions = Functions.new(client) result = functions.create_vcs_deployment( function_id: '<FUNCTION_ID>', - type: VCSDeploymentType::BRANCH, + type: VCSReferenceType::BRANCH, reference: '<REFERENCE>', activate: false # optional ) diff --git a/docs/examples/1.8.x/server-ruby/examples/sites/create-template-deployment.md b/docs/examples/1.8.x/server-ruby/examples/sites/create-template-deployment.md index 9e1cc93986..4fb81779fe 100644 --- a/docs/examples/1.8.x/server-ruby/examples/sites/create-template-deployment.md +++ b/docs/examples/1.8.x/server-ruby/examples/sites/create-template-deployment.md @@ -15,7 +15,7 @@ result = sites.create_template_deployment( repository: '<REPOSITORY>', owner: '<OWNER>', root_directory: '<ROOT_DIRECTORY>', - type: ::BRANCH, + type: TemplateReferenceType::BRANCH, reference: '<REFERENCE>', activate: false # optional ) diff --git a/docs/examples/1.8.x/server-ruby/examples/sites/create-vcs-deployment.md b/docs/examples/1.8.x/server-ruby/examples/sites/create-vcs-deployment.md index 2e72b6e3f1..e0a6ff3af0 100644 --- a/docs/examples/1.8.x/server-ruby/examples/sites/create-vcs-deployment.md +++ b/docs/examples/1.8.x/server-ruby/examples/sites/create-vcs-deployment.md @@ -12,7 +12,7 @@ sites = Sites.new(client) result = sites.create_vcs_deployment( site_id: '<SITE_ID>', - type: VCSDeploymentType::BRANCH, + type: VCSReferenceType::BRANCH, reference: '<REFERENCE>', activate: false # optional ) diff --git a/src/Appwrite/Platform/Appwrite.php b/src/Appwrite/Platform/Appwrite.php index a77f894be7..4aa135c4f1 100644 --- a/src/Appwrite/Platform/Appwrite.php +++ b/src/Appwrite/Platform/Appwrite.php @@ -2,6 +2,7 @@ namespace Appwrite\Platform; +use Appwrite\Platform\Modules\Account; use Appwrite\Platform\Modules\Console; use Appwrite\Platform\Modules\Core; use Appwrite\Platform\Modules\Databases; @@ -17,6 +18,7 @@ class Appwrite extends Platform public function __construct() { parent::__construct(new Core()); + $this->addModule(new Account\Module()); $this->addModule(new Databases\Module()); $this->addModule(new Projects\Module()); $this->addModule(new Functions\Module()); diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Create.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Create.php new file mode 100644 index 0000000000..2d83599964 --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Create.php @@ -0,0 +1,141 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Authenticators; + +use Appwrite\Auth\MFA\Type; +use Appwrite\Auth\MFA\Type\TOTP; +use Appwrite\Event\Event; +use Appwrite\Extend\Exception; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Database; +use Utopia\Database\Document; +use Utopia\Database\Helpers\ID; +use Utopia\Database\Helpers\Permission; +use Utopia\Database\Helpers\Role; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; +use Utopia\Validator\WhiteList; + +class Create extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'createMFAAuthenticator'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST) + ->setHttpPath('/v1/account/mfa/authenticators/:type') + ->desc('Create authenticator') + ->groups(['api', 'account']) + ->label('event', 'users.[userId].update.mfa') + ->label('scope', 'account') + ->label('audits.event', 'user.update') + ->label('audits.resource', 'user/{response.$id}') + ->label('audits.userId', '{response.$id}') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'createMfaAuthenticator', + description: '/docs/references/account/create-mfa-authenticator.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_TYPE, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.createMFAAuthenticator', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'createMFAAuthenticator', + description: '/docs/references/account/create-mfa-authenticator.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_TYPE, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->param('type', null, new WhiteList([Type::TOTP]), 'Type of authenticator. Must be `' . Type::TOTP . '`') + ->inject('response') + ->inject('project') + ->inject('user') + ->inject('dbForProject') + ->inject('queueForEvents') + ->callback($this->action(...)); + } + + public function action( + string $type, + Response $response, + Document $project, + Document $user, + Database $dbForProject, + Event $queueForEvents + ): void { + $otp = (match ($type) { + Type::TOTP => new TOTP(), + default => throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Unknown type.') + }); + + $otp->setLabel($user->getAttribute('email')); + $otp->setIssuer($project->getAttribute('name')); + + $authenticator = TOTP::getAuthenticatorFromUser($user); + + if ($authenticator) { + if ($authenticator->getAttribute('verified')) { + throw new Exception(Exception::USER_AUTHENTICATOR_ALREADY_VERIFIED); + } + $dbForProject->deleteDocument('authenticators', $authenticator->getId()); + } + + $authenticator = new Document([ + '$id' => ID::unique(), + 'userId' => $user->getId(), + 'userInternalId' => $user->getSequence(), + 'type' => Type::TOTP, + 'verified' => false, + 'data' => [ + 'secret' => $otp->getSecret(), + ], + '$permissions' => [ + Permission::read(Role::user($user->getId())), + Permission::update(Role::user($user->getId())), + Permission::delete(Role::user($user->getId())), + ] + ]); + + $model = new Document([ + 'secret' => $otp->getSecret(), + 'uri' => $otp->getProvisioningUri() + ]); + + $authenticator = $dbForProject->createDocument('authenticators', $authenticator); + $dbForProject->purgeCachedDocument('users', $user->getId()); + + $queueForEvents->setParam('userId', $user->getId()); + + $response->dynamic($model, Response::MODEL_MFA_TYPE); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Delete.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Delete.php new file mode 100644 index 0000000000..5c92bfff5c --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Delete.php @@ -0,0 +1,107 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Authenticators; + +use Appwrite\Auth\MFA\Type; +use Appwrite\Auth\MFA\Type\TOTP; +use Appwrite\Event\Event; +use Appwrite\Extend\Exception; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Database; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; +use Utopia\Validator\WhiteList; + +class Delete extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'deleteMFAAuthenticator'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_DELETE) + ->setHttpPath('/v1/account/mfa/authenticators/:type') + ->desc('Delete authenticator') + ->groups(['api', 'account', 'mfaProtected']) + ->label('event', 'users.[userId].delete.mfa') + ->label('scope', 'account') + ->label('audits.event', 'user.update') + ->label('audits.resource', 'user/{response.$id}') + ->label('audits.userId', '{response.$id}') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'deleteMfaAuthenticator', + description: '/docs/references/account/delete-mfa-authenticator.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_NOCONTENT, + model: Response::MODEL_NONE, + ) + ], + contentType: ContentType::NONE, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.deleteMFAAuthenticator', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'deleteMFAAuthenticator', + description: '/docs/references/account/delete-mfa-authenticator.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_NOCONTENT, + model: Response::MODEL_NONE, + ) + ], + contentType: ContentType::NONE + ) + ]) + ->param('type', null, new WhiteList([Type::TOTP]), 'Type of authenticator.') + ->inject('response') + ->inject('user') + ->inject('dbForProject') + ->inject('queueForEvents') + ->callback($this->action(...)); + } + + public function action( + string $type, + Response $response, + Document $user, + Database $dbForProject, + Event $queueForEvents + ): void { + $authenticator = (match ($type) { + Type::TOTP => TOTP::getAuthenticatorFromUser($user), + default => null + }); + + if (!$authenticator) { + throw new Exception(Exception::USER_AUTHENTICATOR_NOT_FOUND); + } + + $dbForProject->deleteDocument('authenticators', $authenticator->getId()); + $dbForProject->purgeCachedDocument('users', $user->getId()); + + $queueForEvents->setParam('userId', $user->getId()); + + $response->noContent(); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Update.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Update.php new file mode 100644 index 0000000000..b68a55c20b --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Authenticators/Update.php @@ -0,0 +1,135 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Authenticators; + +use Appwrite\Auth\MFA\Challenge; +use Appwrite\Auth\MFA\Type; +use Appwrite\Auth\MFA\Type\TOTP; +use Appwrite\Event\Event; +use Appwrite\Extend\Exception; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Database; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; +use Utopia\Validator\Text; +use Utopia\Validator\WhiteList; + +class Update extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'updateMFAAuthenticator'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_PUT) + ->setHttpPath('/v1/account/mfa/authenticators/:type') + ->desc('Update authenticator (confirmation)') + ->groups(['api', 'account']) + ->label('event', 'users.[userId].update.mfa') + ->label('scope', 'account') + ->label('audits.event', 'user.update') + ->label('audits.resource', 'user/{response.$id}') + ->label('audits.userId', '{response.$id}') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'updateMfaAuthenticator', + description: '/docs/references/account/update-mfa-authenticator.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_USER, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.updateMFAAuthenticator', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'updateMFAAuthenticator', + description: '/docs/references/account/update-mfa-authenticator.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_USER, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->param('type', null, new WhiteList([Type::TOTP]), 'Type of authenticator.') + ->param('otp', '', new Text(256), 'Valid verification token.') + ->inject('response') + ->inject('user') + ->inject('session') + ->inject('dbForProject') + ->inject('queueForEvents') + ->callback($this->action(...)); + } + + public function action( + string $type, + string $otp, + Response $response, + Document $user, + Document $session, + Database $dbForProject, + Event $queueForEvents + ): void { + $authenticator = (match ($type) { + Type::TOTP => TOTP::getAuthenticatorFromUser($user), + default => null + }); + + if ($authenticator === null) { + throw new Exception(Exception::USER_AUTHENTICATOR_NOT_FOUND); + } + + if ($authenticator->getAttribute('verified')) { + throw new Exception(Exception::USER_AUTHENTICATOR_ALREADY_VERIFIED); + } + + $success = (match ($type) { + Type::TOTP => Challenge\TOTP::verify($user, $otp), + default => false + }); + + if (!$success) { + throw new Exception(Exception::USER_INVALID_TOKEN); + } + + $authenticator->setAttribute('verified', true); + + $dbForProject->updateDocument('authenticators', $authenticator->getId(), $authenticator); + $dbForProject->purgeCachedDocument('users', $user->getId()); + + $factors = $session->getAttribute('factors', []); + $factors[] = $type; + $factors = \array_values(\array_unique($factors)); + + $session->setAttribute('factors', $factors); + $dbForProject->updateDocument('sessions', $session->getId(), $session); + + $queueForEvents->setParam('userId', $user->getId()); + + $response->dynamic($user, Response::MODEL_ACCOUNT); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php new file mode 100644 index 0000000000..2ac53c2d46 --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php @@ -0,0 +1,330 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Challenges; + +use Appwrite\Auth\Auth; +use Appwrite\Auth\MFA\Type; +use Appwrite\Detector\Detector; +use Appwrite\Event\Event; +use Appwrite\Event\Mail; +use Appwrite\Event\Messaging; +use Appwrite\Event\StatsUsage; +use Appwrite\Extend\Exception; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Template\Template; +use Appwrite\Utopia\Request; +use Appwrite\Utopia\Response; +use libphonenumber\PhoneNumberUtil; +use Utopia\Abuse\Abuse; +use Utopia\Database\Database; +use Utopia\Database\DateTime; +use Utopia\Database\Document; +use Utopia\Database\Helpers\Permission; +use Utopia\Database\Helpers\Role; +use Utopia\Locale\Locale; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; +use Utopia\Storage\Validator\FileName; +use Utopia\System\System; +use Utopia\Validator\WhiteList; + +class Create extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'createMFAChallenge'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST) + ->setHttpPath('/v1/account/mfa/challenges') + ->httpAlias('/v1/account/mfa/challenge') + ->desc('Create MFA challenge') + ->groups(['api', 'account', 'mfa']) + ->label('scope', 'account') + ->label('event', 'users.[userId].challenges.[challengeId].create') + ->label('audits.event', 'challenge.create') + ->label('audits.resource', 'user/{response.userId}') + ->label('audits.userId', '{response.userId}') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'createMfaChallenge', + description: '/docs/references/account/create-mfa-challenge.md', + auth: [], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_CREATED, + model: Response::MODEL_MFA_CHALLENGE, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.createMFAChallenge', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'createMFAChallenge', + description: '/docs/references/account/create-mfa-challenge.md', + auth: [], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_CREATED, + model: Response::MODEL_MFA_CHALLENGE, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->label('abuse-limit', 10) + ->label('abuse-key', 'url:{url},userId:{userId}') + ->param('factor', '', new WhiteList([Type::EMAIL, Type::PHONE, Type::TOTP, Type::RECOVERY_CODE]), 'Factor used for verification. Must be one of following: `' . Type::EMAIL . '`, `' . Type::PHONE . '`, `' . Type::TOTP . '`, `' . Type::RECOVERY_CODE . '`.') + ->inject('response') + ->inject('dbForProject') + ->inject('user') + ->inject('locale') + ->inject('project') + ->inject('request') + ->inject('queueForEvents') + ->inject('queueForMessaging') + ->inject('queueForMails') + ->inject('timelimit') + ->inject('queueForStatsUsage') + ->inject('plan') + ->callback($this->action(...)); + } + + public function action( + string $factor, + Response $response, + Database $dbForProject, + Document $user, + Locale $locale, + Document $project, + Request $request, + Event $queueForEvents, + Messaging $queueForMessaging, + Mail $queueForMails, + callable $timelimit, + StatsUsage $queueForStatsUsage, + array $plan + ): void { + $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM)); + $code = Auth::codeGenerator(); + $challenge = new Document([ + 'userId' => $user->getId(), + 'userInternalId' => $user->getSequence(), + 'type' => $factor, + 'token' => Auth::tokenGenerator(), + 'code' => $code, + 'expire' => $expire, + '$permissions' => [ + Permission::read(Role::user($user->getId())), + Permission::update(Role::user($user->getId())), + Permission::delete(Role::user($user->getId())), + ], + ]); + + $challenge = $dbForProject->createDocument('challenges', $challenge); + + $templatesPath = \dirname(__DIR__, 7) . '/app/config/locale/templates'; + + switch ($factor) { + case Type::PHONE: + if (empty(System::getEnv('_APP_SMS_PROVIDER'))) { + throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured'); + } + if (empty($user->getAttribute('phone'))) { + throw new Exception(Exception::USER_PHONE_NOT_FOUND); + } + if (!$user->getAttribute('phoneVerification')) { + throw new Exception(Exception::USER_PHONE_NOT_VERIFIED); + } + + $message = Template::fromFile($templatesPath . '/sms-base.tpl'); + + $customTemplate = $project->getAttribute('templates', [])['sms.mfaChallenge-' . $locale->default] ?? []; + if (!empty($customTemplate)) { + $message = $customTemplate['message'] ?? $message; + } + + $messageContent = Template::fromString($locale->getText("sms.verification.body")); + $messageContent + ->setParam('{{project}}', $project->getAttribute('name')) + ->setParam('{{secret}}', $code); + $messageContent = \strip_tags($messageContent->render()); + $message = $message->setParam('{{token}}', $messageContent); + + $message = $message->render(); + + $phone = $user->getAttribute('phone'); + $queueForMessaging + ->setType(MESSAGE_SEND_TYPE_INTERNAL) + ->setMessage(new Document([ + '$id' => $challenge->getId(), + 'data' => [ + 'content' => $code, + ], + ])) + ->setRecipients([$phone]) + ->setProviderType(MESSAGE_TYPE_SMS); + + if (isset($plan['authPhone'])) { + $timelimit = $timelimit('organization:{organizationId}', $plan['authPhone'], 30 * 24 * 60 * 60); // 30 days + $timelimit + ->setParam('{organizationId}', $project->getAttribute('teamId')); + + $abuse = new Abuse($timelimit); + if ($abuse->check() && System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') { + $helper = PhoneNumberUtil::getInstance(); + $countryCode = $helper->parse($phone)->getCountryCode(); + + if (!empty($countryCode)) { + $queueForStatsUsage + ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1); + } + } + $queueForStatsUsage + ->addMetric(METRIC_AUTH_METHOD_PHONE, 1) + ->setProject($project) + ->trigger(); + } + break; + case Type::EMAIL: + if (empty(System::getEnv('_APP_SMTP_HOST'))) { + throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled'); + } + if (empty($user->getAttribute('email'))) { + throw new Exception(Exception::USER_EMAIL_NOT_FOUND); + } + if (!$user->getAttribute('emailVerification')) { + throw new Exception(Exception::USER_EMAIL_NOT_VERIFIED); + } + + $subject = $locale->getText("emails.mfaChallenge.subject"); + $preview = $locale->getText("emails.mfaChallenge.preview"); + $heading = $locale->getText("emails.mfaChallenge.heading"); + + $customTemplate = $project->getAttribute('templates', [])['email.mfaChallenge-' . $locale->default] ?? []; + $smtpBaseTemplate = $project->getAttribute('smtpBaseTemplate', 'email-base'); + + $validator = new FileName(); + if (!$validator->isValid($smtpBaseTemplate)) { + throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Invalid template path'); + } + + $bodyTemplate = $templatesPath . '/' . $smtpBaseTemplate . '.tpl'; + + $detector = new Detector($request->getUserAgent('UNKNOWN')); + $agentOs = $detector->getOS(); + $agentClient = $detector->getClient(); + $agentDevice = $detector->getDevice(); + + $message = Template::fromFile($templatesPath . '/email-mfa-challenge.tpl'); + $message + ->setParam('{{hello}}', $locale->getText("emails.mfaChallenge.hello")) + ->setParam('{{description}}', $locale->getText("emails.mfaChallenge.description")) + ->setParam('{{clientInfo}}', $locale->getText("emails.mfaChallenge.clientInfo")) + ->setParam('{{thanks}}', $locale->getText("emails.mfaChallenge.thanks")) + ->setParam('{{signature}}', $locale->getText("emails.mfaChallenge.signature")); + + $body = $message->render(); + + $smtp = $project->getAttribute('smtp', []); + $smtpEnabled = $smtp['enabled'] ?? false; + + $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM); + $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'); + $replyTo = ""; + + if ($smtpEnabled) { + if (!empty($smtp['senderEmail'])) { + $senderEmail = $smtp['senderEmail']; + } + if (!empty($smtp['senderName'])) { + $senderName = $smtp['senderName']; + } + if (!empty($smtp['replyTo'])) { + $replyTo = $smtp['replyTo']; + } + + $queueForMails + ->setSmtpHost($smtp['host'] ?? '') + ->setSmtpPort($smtp['port'] ?? '') + ->setSmtpUsername($smtp['username'] ?? '') + ->setSmtpPassword($smtp['password'] ?? '') + ->setSmtpSecure($smtp['secure'] ?? ''); + + if (!empty($customTemplate)) { + if (!empty($customTemplate['senderEmail'])) { + $senderEmail = $customTemplate['senderEmail']; + } + if (!empty($customTemplate['senderName'])) { + $senderName = $customTemplate['senderName']; + } + if (!empty($customTemplate['replyTo'])) { + $replyTo = $customTemplate['replyTo']; + } + + $body = $customTemplate['message'] ?? ''; + $subject = $customTemplate['subject'] ?? $subject; + } + + $queueForMails + ->setSmtpReplyTo($replyTo) + ->setSmtpSenderEmail($senderEmail) + ->setSmtpSenderName($senderName); + } + + $emailVariables = [ + 'heading' => $heading, + 'direction' => $locale->getText('settings.direction'), + 'user' => $user->getAttribute('name'), + 'project' => $project->getAttribute('name'), + 'otp' => $code, + 'agentDevice' => $agentDevice['deviceBrand'] ?? 'UNKNOWN', + 'agentClient' => $agentClient['clientName'] ?? 'UNKNOWN', + 'agentOs' => $agentOs['osName'] ?? 'UNKNOWN', + ]; + + if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) { + $emailVariables = array_merge($emailVariables, [ + 'accentColor' => APP_EMAIL_ACCENT_COLOR, + 'logoUrl' => APP_EMAIL_LOGO_URL, + 'twitterUrl' => APP_SOCIAL_TWITTER, + 'discordUrl' => APP_SOCIAL_DISCORD, + 'githubUrl' => APP_SOCIAL_GITHUB_APPWRITE, + 'termsUrl' => APP_EMAIL_TERMS_URL, + 'privacyUrl' => APP_EMAIL_PRIVACY_URL, + ]); + } + + $queueForMails + ->setSubject($subject) + ->setPreview($preview) + ->setBody($body) + ->setBodyTemplate($bodyTemplate) + ->setVariables($emailVariables) + ->setRecipient($user->getAttribute('email')) + ->trigger(); + break; + } + + $queueForEvents + ->setParam('userId', $user->getId()) + ->setParam('challengeId', $challenge->getId()); + + $response->dynamic($challenge, Response::MODEL_MFA_CHALLENGE); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Update.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Update.php new file mode 100644 index 0000000000..40d17afa18 --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Update.php @@ -0,0 +1,161 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Challenges; + +use Appwrite\Auth\MFA\Challenge; +use Appwrite\Auth\MFA\Type; +use Appwrite\Event\Event; +use Appwrite\Extend\Exception; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Database; +use Utopia\Database\DateTime; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; +use Utopia\Validator\Text; + +class Update extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'updateMFAChallenge'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_PUT) + ->setHttpPath('/v1/account/mfa/challenges') + ->httpAlias('/v1/account/mfa/challenge') + ->desc('Update MFA challenge (confirmation)') + ->groups(['api', 'account', 'mfa']) + ->label('scope', 'account') + ->label('event', 'users.[userId].sessions.[sessionId].create') + ->label('audits.event', 'challenges.update') + ->label('audits.resource', 'user/{response.userId}') + ->label('audits.userId', '{response.userId}') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'updateMfaChallenge', + description: '/docs/references/account/update-mfa-challenge.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_SESSION, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.updateMFAChallenge', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'updateMFAChallenge', + description: '/docs/references/account/update-mfa-challenge.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_SESSION, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->label('abuse-limit', 10) + ->label('abuse-key', 'url:{url},challengeId:{param-challengeId}') + ->param('challengeId', '', new Text(256), 'ID of the challenge.') + ->param('otp', '', new Text(256), 'Valid verification token.') + ->inject('project') + ->inject('response') + ->inject('user') + ->inject('session') + ->inject('dbForProject') + ->inject('queueForEvents') + ->callback($this->action(...)); + } + + public function action( + string $challengeId, + string $otp, + Document $project, + Response $response, + Document $user, + Document $session, + Database $dbForProject, + Event $queueForEvents + ): void { + $challenge = $dbForProject->getDocument('challenges', $challengeId); + + if ($challenge->isEmpty()) { + throw new Exception(Exception::USER_INVALID_TOKEN); + } + + $type = $challenge->getAttribute('type'); + + $recoveryCodeChallenge = function (Document $challenge, Document $user, string $otp) use ($dbForProject) { + if ( + $challenge->isSet('type') && + $challenge->getAttribute('type') === \strtolower(Type::RECOVERY_CODE) + ) { + $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); + if (\in_array($otp, $mfaRecoveryCodes)) { + $mfaRecoveryCodes = \array_diff($mfaRecoveryCodes, [$otp]); + $mfaRecoveryCodes = \array_values($mfaRecoveryCodes); + $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes); + $dbForProject->updateDocument('users', $user->getId(), $user); + + return true; + } + + return false; + } + + return false; + }; + + $success = (match ($type) { + Type::TOTP => Challenge\TOTP::challenge($challenge, $user, $otp), + Type::PHONE => Challenge\Phone::challenge($challenge, $user, $otp), + Type::EMAIL => Challenge\Email::challenge($challenge, $user, $otp), + \strtolower(Type::RECOVERY_CODE) => $recoveryCodeChallenge($challenge, $user, $otp), + default => false + }); + + if (!$success) { + throw new Exception(Exception::USER_INVALID_TOKEN); + } + + $dbForProject->deleteDocument('challenges', $challengeId); + $dbForProject->purgeCachedDocument('users', $user->getId()); + + $factors = $session->getAttribute('factors', []); + $factors[] = $type; + $factors = \array_values(\array_unique($factors)); + + $session + ->setAttribute('factors', $factors) + ->setAttribute('mfaUpdatedAt', DateTime::now()); + + $dbForProject->updateDocument('sessions', $session->getId(), $session); + + $queueForEvents + ->setParam('userId', $user->getId()) + ->setParam('sessionId', $session->getId()); + + $response->dynamic($session, Response::MODEL_SESSION); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Factors/XList.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Factors/XList.php new file mode 100644 index 0000000000..c60f599cfc --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Factors/XList.php @@ -0,0 +1,89 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Factors; + +use Appwrite\Auth\MFA\Type; +use Appwrite\Auth\MFA\Type\TOTP; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; + +class XList extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'listMFAFactors'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET) + ->setHttpPath('/v1/account/mfa/factors') + ->desc('List factors') + ->groups(['api', 'account', 'mfa']) + ->label('scope', 'account') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'listMfaFactors', + description: '/docs/references/account/list-mfa-factors.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_FACTORS, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.listMFAFactors', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'listMFAFactors', + description: '/docs/references/account/list-mfa-factors.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_FACTORS, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->inject('response') + ->inject('user') + ->callback($this->action(...)); + } + + public function action(Response $response, Document $user): void + { + $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); + $recoveryCodeEnabled = \is_array($mfaRecoveryCodes) && \count($mfaRecoveryCodes) > 0; + + $totp = TOTP::getAuthenticatorFromUser($user); + + $factors = new Document([ + Type::TOTP => $totp !== null && $totp->getAttribute('verified', false), + Type::EMAIL => $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false), + Type::PHONE => $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false), + Type::RECOVERY_CODE => $recoveryCodeEnabled + ]); + + $response->dynamic($factors, Response::MODEL_MFA_FACTORS); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Create.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Create.php new file mode 100644 index 0000000000..fc26142991 --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Create.php @@ -0,0 +1,105 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\RecoveryCodes; + +use Appwrite\Auth\MFA\Type; +use Appwrite\Event\Event; +use Appwrite\Extend\Exception; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Database; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; + +class Create extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'createMFARecoveryCodes'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST) + ->setHttpPath('/v1/account/mfa/recovery-codes') + ->desc('Create MFA recovery codes') + ->groups(['api', 'account']) + ->label('event', 'users.[userId].update.mfa') + ->label('scope', 'account') + ->label('audits.event', 'user.update') + ->label('audits.resource', 'user/{response.$id}') + ->label('audits.userId', '{response.$id}') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'createMfaRecoveryCodes', + description: '/docs/references/account/create-mfa-recovery-codes.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_CREATED, + model: Response::MODEL_MFA_RECOVERY_CODES, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.createMFARecoveryCodes', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'createMFARecoveryCodes', + description: '/docs/references/account/create-mfa-recovery-codes.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_CREATED, + model: Response::MODEL_MFA_RECOVERY_CODES, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->inject('response') + ->inject('user') + ->inject('dbForProject') + ->inject('queueForEvents') + ->callback($this->action(...)); + } + + public function action( + Response $response, + Document $user, + Database $dbForProject, + Event $queueForEvents + ): void { + $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); + + if (!empty($mfaRecoveryCodes)) { + throw new Exception(Exception::USER_RECOVERY_CODES_ALREADY_EXISTS); + } + + $mfaRecoveryCodes = Type::generateBackupCodes(); + $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes); + $dbForProject->updateDocument('users', $user->getId(), $user); + + $queueForEvents->setParam('userId', $user->getId()); + + $document = new Document([ + 'recoveryCodes' => $mfaRecoveryCodes + ]); + + $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Get.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Get.php new file mode 100644 index 0000000000..8a85c361ca --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Get.php @@ -0,0 +1,86 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\RecoveryCodes; + +use Appwrite\Extend\Exception; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; + +class Get extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'getMFARecoveryCodes'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET) + ->setHttpPath('/v1/account/mfa/recovery-codes') + ->desc('List MFA recovery codes') + ->groups(['api', 'account', 'mfaProtected']) + ->label('scope', 'account') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'getMfaRecoveryCodes', + description: '/docs/references/account/get-mfa-recovery-codes.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_RECOVERY_CODES, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.getMFARecoveryCodes', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'getMFARecoveryCodes', + description: '/docs/references/account/get-mfa-recovery-codes.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_RECOVERY_CODES, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->inject('response') + ->inject('user') + ->callback($this->action(...)); + } + + public function action(Response $response, Document $user): void + { + $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); + + if (empty($mfaRecoveryCodes)) { + throw new Exception(Exception::USER_RECOVERY_CODES_NOT_FOUND); + } + + $document = new Document([ + 'recoveryCodes' => $mfaRecoveryCodes + ]); + + $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Update.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Update.php new file mode 100644 index 0000000000..5cc2783e75 --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/RecoveryCodes/Update.php @@ -0,0 +1,104 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\RecoveryCodes; + +use Appwrite\Auth\MFA\Type; +use Appwrite\Event\Event; +use Appwrite\Extend\Exception; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Deprecated; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Database; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; + +class Update extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'updateMFARecoveryCodes'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_PATCH) + ->setHttpPath('/v1/account/mfa/recovery-codes') + ->desc('Update MFA recovery codes (regenerate)') + ->groups(['api', 'account', 'mfaProtected']) + ->label('event', 'users.[userId].update.mfa') + ->label('scope', 'account') + ->label('audits.event', 'user.update') + ->label('audits.resource', 'user/{response.$id}') + ->label('audits.userId', '{response.$id}') + ->label('sdk', [ + new Method( + namespace: 'account', + group: 'mfa', + name: 'updateMfaRecoveryCodes', + description: '/docs/references/account/update-mfa-recovery-codes.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_RECOVERY_CODES, + ) + ], + contentType: ContentType::JSON, + deprecated: new Deprecated( + since: '1.8.0', + replaceWith: 'account.updateMFARecoveryCodes', + ), + ), + new Method( + namespace: 'account', + group: 'mfa', + name: 'updateMFARecoveryCodes', + description: '/docs/references/account/update-mfa-recovery-codes.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_MFA_RECOVERY_CODES, + ) + ], + contentType: ContentType::JSON + ) + ]) + ->inject('dbForProject') + ->inject('response') + ->inject('user') + ->inject('queueForEvents') + ->callback($this->action(...)); + } + + public function action( + Database $dbForProject, + Response $response, + Document $user, + Event $queueForEvents + ): void { + $mfaRecoveryCodes = $user->getAttribute('mfaRecoveryCodes', []); + if (empty($mfaRecoveryCodes)) { + throw new Exception(Exception::USER_RECOVERY_CODES_NOT_FOUND); + } + + $mfaRecoveryCodes = Type::generateBackupCodes(); + $user->setAttribute('mfaRecoveryCodes', $mfaRecoveryCodes); + $dbForProject->updateDocument('users', $user->getId(), $user); + + $queueForEvents->setParam('userId', $user->getId()); + + $document = new Document([ + 'recoveryCodes' => $mfaRecoveryCodes + ]); + + $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Update.php b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Update.php new file mode 100644 index 0000000000..00068c7441 --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Update.php @@ -0,0 +1,99 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Http\Account\MFA; + +use Appwrite\Auth\MFA\Type; +use Appwrite\Auth\MFA\Type\TOTP; +use Appwrite\Event\Event; +use Appwrite\SDK\AuthType; +use Appwrite\SDK\ContentType; +use Appwrite\SDK\Method; +use Appwrite\SDK\Response as SDKResponse; +use Appwrite\Utopia\Response; +use Utopia\Database\Database; +use Utopia\Database\Document; +use Utopia\Platform\Action; +use Utopia\Platform\Scope\HTTP; +use Utopia\Validator\Boolean; + +class Update extends Action +{ + use HTTP; + + public static function getName(): string + { + return 'updateMFA'; + } + + public function __construct() + { + $this + ->setHttpMethod(Action::HTTP_REQUEST_METHOD_PATCH) + ->setHttpPath('/v1/account/mfa') + ->desc('Update MFA') + ->groups(['api', 'account']) + ->label('event', 'users.[userId].update.mfa') + ->label('scope', 'account') + ->label('audits.event', 'user.update') + ->label('audits.resource', 'user/{response.$id}') + ->label('audits.userId', '{response.$id}') + ->label('sdk', new Method( + namespace: 'account', + group: 'mfa', + name: 'updateMFA', + description: '/docs/references/account/update-mfa.md', + auth: [AuthType::SESSION, AuthType::JWT], + responses: [ + new SDKResponse( + code: Response::STATUS_CODE_OK, + model: Response::MODEL_USER, + ) + ], + contentType: ContentType::JSON + )) + ->param('mfa', null, new Boolean(), 'Enable or disable MFA.') + ->inject('requestTimestamp') + ->inject('response') + ->inject('user') + ->inject('session') + ->inject('dbForProject') + ->inject('queueForEvents') + ->callback($this->action(...)); + } + + public function action( + bool $mfa, + ?\DateTime $requestTimestamp, + Response $response, + Document $user, + Document $session, + Database $dbForProject, + Event $queueForEvents + ): void { + $user->setAttribute('mfa', $mfa); + + $user = $dbForProject->updateDocument('users', $user->getId(), $user); + + if ($mfa) { + $factors = $session->getAttribute('factors', []); + $totp = TOTP::getAuthenticatorFromUser($user); + if ($totp !== null && $totp->getAttribute('verified', false)) { + $factors[] = Type::TOTP; + } + if ($user->getAttribute('email', false) && $user->getAttribute('emailVerification', false)) { + $factors[] = Type::EMAIL; + } + if ($user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false)) { + $factors[] = Type::PHONE; + } + $factors = \array_values(\array_unique($factors)); + + $session->setAttribute('factors', $factors); + $dbForProject->updateDocument('sessions', $session->getId(), $session); + } + + $queueForEvents->setParam('userId', $user->getId()); + + $response->dynamic($user, Response::MODEL_ACCOUNT); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Module.php b/src/Appwrite/Platform/Modules/Account/Module.php new file mode 100644 index 0000000000..3ad50d388a --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Module.php @@ -0,0 +1,14 @@ +<?php + +namespace Appwrite\Platform\Modules\Account; + +use Appwrite\Platform\Modules\Account\Services\Http; +use Utopia\Platform; + +class Module extends Platform\Module +{ + public function __construct() + { + $this->addService('http', new Http()); + } +} diff --git a/src/Appwrite/Platform/Modules/Account/Services/Http.php b/src/Appwrite/Platform/Modules/Account/Services/Http.php new file mode 100644 index 0000000000..ae2e841636 --- /dev/null +++ b/src/Appwrite/Platform/Modules/Account/Services/Http.php @@ -0,0 +1,34 @@ +<?php + +namespace Appwrite\Platform\Modules\Account\Services; + +use Appwrite\Platform\Modules\Account\Http\Account\MFA\Authenticators\Create as CreateAuthenticator; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\Authenticators\Delete as DeleteAuthenticator; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\Authenticators\Update as UpdateAuthenticator; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\Challenges\Create as CreateChallenge; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\Challenges\Update as UpdateChallenge; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\Factors\XList as ListFactors; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\RecoveryCodes\Create as CreateRecoveryCodes; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\RecoveryCodes\Get as GetRecoveryCodes; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\RecoveryCodes\Update as UpdateRecoveryCodes; +use Appwrite\Platform\Modules\Account\Http\Account\MFA\Update as UpdateMfa; +use Utopia\Platform\Service; + +class Http extends Service +{ + public function __construct() + { + $this->type = Service::TYPE_HTTP; + $this + ->addAction(UpdateMfa::getName(), new UpdateMfa()) + ->addAction(ListFactors::getName(), new ListFactors()) + ->addAction(CreateAuthenticator::getName(), new CreateAuthenticator()) + ->addAction(UpdateAuthenticator::getName(), new UpdateAuthenticator()) + ->addAction(DeleteAuthenticator::getName(), new DeleteAuthenticator()) + ->addAction(CreateRecoveryCodes::getName(), new CreateRecoveryCodes()) + ->addAction(UpdateRecoveryCodes::getName(), new UpdateRecoveryCodes()) + ->addAction(GetRecoveryCodes::getName(), new GetRecoveryCodes()) + ->addAction(CreateChallenge::getName(), new CreateChallenge()) + ->addAction(UpdateChallenge::getName(), new UpdateChallenge()); + } +} diff --git a/src/Appwrite/Platform/Modules/Compute/Base.php b/src/Appwrite/Platform/Modules/Compute/Base.php index a538eb1497..cc9b403925 100644 --- a/src/Appwrite/Platform/Modules/Compute/Base.php +++ b/src/Appwrite/Platform/Modules/Compute/Base.php @@ -13,6 +13,7 @@ use Utopia\Database\Exception\Duplicate; use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\Permission; use Utopia\Database\Helpers\Role; +use Utopia\Database\Query; use Utopia\Database\Validator\Authorization; use Utopia\Swoole\Request; use Utopia\System\System; @@ -52,7 +53,7 @@ class Base extends Action return $allowedSpecifications[0] ?? APP_COMPUTE_SPECIFICATION_DEFAULT; } - public function redeployVcsFunction(Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, string $referenceType = 'branch', string $reference = ''): Document + public function redeployVcsFunction(Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, string $referenceType = 'branch', string $reference = ''): Document { $deploymentId = ID::unique(); $entrypoint = $function->getAttribute('entrypoint', ''); @@ -133,6 +134,8 @@ class Base extends Action ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', '')); $dbForProject->updateDocument('functions', $function->getId(), $function); + $this->updateEmptyManualRule($project, $function, $deployment, $dbForPlatform); + $queueForBuilds ->setType(BUILD_TYPE_DEPLOYMENT) ->setResource($function) @@ -327,6 +330,8 @@ class Base extends Action } } + $this->updateEmptyManualRule($project, $site, $deployment, $dbForPlatform); + $queueForBuilds ->setType(BUILD_TYPE_DEPLOYMENT) ->setResource($site) @@ -335,4 +340,34 @@ class Base extends Action return $deployment; } + + /** + * Update empty manual rule for deployment. + * In case of first deployment, deployment ID will be empty in the rules, so we need to update it here. + * + * @param \Utopia\Database\Document $project + * @param \Utopia\Database\Document $resource + * @param \Utopia\Database\Document $deployment + * @param \Utopia\Database\Database $dbForPlatform + * @return void + */ + public static function updateEmptyManualRule(Document $project, Document $resource, Document $deployment, Database $dbForPlatform) + { + $resourceType = $resource->getCollection() === 'sites' ? 'site' : 'function'; + + $queries = [ + Query::equal('projectInternalId', [$project->getSequence()]), + Query::equal('deploymentResourceInternalId', [$resource->getSequence()]), + Query::equal('deploymentResourceType', [$resourceType]), + Query::equal('deploymentId', ['']), + Query::equal('type', ['deployment']), + Query::equal('trigger', ['manual']), + ]; + $dbForPlatform->forEach('rules', function (Document $rule) use ($deployment, $dbForPlatform) { + Authorization::skip(fn () => $dbForPlatform->updateDocument('rules', $rule->getId(), new Document([ + 'deploymentId' => $deployment->getId(), + 'deploymentInternalId' => $deployment->getSequence(), + ]))); + }, $queries); + } } diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php index bfd7a5b814..bcb85d0889 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php @@ -5,6 +5,7 @@ namespace Appwrite\Platform\Modules\Functions\Http\Deployments; use Appwrite\Event\Build; use Appwrite\Event\Event; use Appwrite\Extend\Exception; +use Appwrite\Platform\Modules\Compute\Base; use Appwrite\SDK\AuthType; use Appwrite\SDK\ContentType; use Appwrite\SDK\Method; @@ -31,7 +32,7 @@ use Utopia\Validator\Boolean; use Utopia\Validator\Nullable; use Utopia\Validator\Text; -class Create extends Action +class Create extends Base { use HTTP; @@ -82,6 +83,7 @@ class Create extends Action ->inject('request') ->inject('response') ->inject('dbForProject') + ->inject('dbForPlatform') ->inject('queueForEvents') ->inject('project') ->inject('deviceForFunctions') @@ -100,6 +102,7 @@ class Create extends Action Request $request, Response $response, Database $dbForProject, + Database $dbForPlatform, Event $queueForEvents, Document $project, Device $deviceForFunctions, @@ -301,6 +304,8 @@ class Create extends Action } } + $this->updateEmptyManualRule($project, $function, $deployment, $dbForPlatform); + $metadata = null; $queueForEvents diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php index f7264fee08..760022e699 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php @@ -124,6 +124,7 @@ class Create extends Base project: $project, installation: $installation, dbForProject: $dbForProject, + dbForPlatform: $dbForPlatform, queueForBuilds: $queueForBuilds, template: $template, github: $github, @@ -170,6 +171,9 @@ class Create extends Base ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', '')); $dbForProject->updateDocument('functions', $function->getId(), $function); + + $this->updateEmptyManualRule($project, $function, $deployment, $dbForPlatform); + $queueForBuilds ->setType(BUILD_TYPE_DEPLOYMENT) ->setResource($function) diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php index 72fac3568e..0c771130c5 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php @@ -105,6 +105,7 @@ class Create extends Base project: $project, installation: $installation, dbForProject: $dbForProject, + dbForPlatform: $dbForPlatform, queueForBuilds: $queueForBuilds, template: $template, github: $github, diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php index e2e523e8dd..741eb6ad9b 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php @@ -305,12 +305,14 @@ class Create extends Base $template = new Document(); $installation = $dbForPlatform->getDocument('installations', $function->getAttribute('installationId')); + // TODO: Is this still needed? Can this be removed? $deployment = $this->redeployVcsFunction( request: $request, function: $function, project: $project, installation: $installation, dbForProject: $dbForProject, + dbForPlatform: $dbForPlatform, queueForBuilds: $queueForBuilds, template: $template, github: $github, diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php index 6e764c640b..22c54b03a1 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php @@ -273,7 +273,7 @@ class Update extends Base // Redeploy logic if (!$isConnected && !empty($providerRepositoryId)) { - $this->redeployVcsFunction($request, $function, $project, $installation, $dbForProject, $queueForBuilds, new Document(), $github, true); + $this->redeployVcsFunction($request, $function, $project, $installation, $dbForProject, $dbForPlatform, $queueForBuilds, new Document(), $github, true); } // Inform scheduler if function is still active diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php index 7ad53ce1fc..80c3d70855 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php @@ -5,6 +5,7 @@ namespace Appwrite\Platform\Modules\Sites\Http\Deployments; use Appwrite\Event\Build; use Appwrite\Event\Event; use Appwrite\Extend\Exception; +use Appwrite\Platform\Modules\Compute\Base; use Appwrite\SDK\AuthType; use Appwrite\SDK\ContentType; use Appwrite\SDK\Method; @@ -32,7 +33,7 @@ use Utopia\Validator\Boolean; use Utopia\Validator\Nullable; use Utopia\Validator\Text; -class Create extends Action +class Create extends Base { use HTTP; @@ -365,6 +366,8 @@ class Create extends Action } } + $this->updateEmptyManualRule($project, $site, $deployment, $dbForPlatform); + $metadata = null; $queueForEvents diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php index 66e37ae061..c60ae8e364 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php @@ -208,6 +208,8 @@ class Create extends Base ])) ); + $this->updateEmptyManualRule($project, $site, $deployment, $dbForPlatform); + $queueForBuilds ->setType(BUILD_TYPE_DEPLOYMENT) ->setResource($site) diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php index 550f931d22..d954102ebc 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php @@ -272,7 +272,7 @@ class Update extends Base // Redeploy logic if (!$isConnected && !empty($providerRepositoryId)) { - $this->redeployVcsFunction($request, $site, $project, $installation, $dbForProject, $queueForBuilds, new Document(), $github, true); + $this->redeployVcsFunction($request, $site, $project, $installation, $dbForProject, $dbForPlatform, $queueForBuilds, new Document(), $github, true); } $queueForEvents->setParam('siteId', $site->getId()); diff --git a/tests/e2e/Services/Avatars/AvatarsBase.php b/tests/e2e/Services/Avatars/AvatarsBase.php index cc626be99a..aca3af6dfa 100644 --- a/tests/e2e/Services/Avatars/AvatarsBase.php +++ b/tests/e2e/Services/Avatars/AvatarsBase.php @@ -1293,4 +1293,32 @@ trait AvatarsBase return []; } + + public function testGetScreenshotComparison(): array + { + /** + * Test screenshot comparison with stable domain (example.com) + * This test captures a screenshot of example.com and compares it + * against a reference image to ensure consistent rendering. + */ + $response = $this->client->call(Client::METHOD_GET, '/avatars/screenshots', [ + 'x-appwrite-project' => $this->getProject()['$id'], + ], [ + 'url' => 'https://example.com', + 'width' => 800, + 'height' => 600, + ]); + + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals('image/png', $response['headers']['content-type']); + $this->assertNotEmpty($response['body']); + + // Compare with reference screenshot + $referencePath = \realpath(__DIR__ . '/../../../resources/avatars'); + $referenceScreenshot = $referencePath . '/screenshot-example-com.png'; + $this->assertFileExists($referenceScreenshot, 'Reference example.com screenshot not found'); + $this->assertSamePixels($referenceScreenshot, $response['body']); + + return []; + } } diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php index 7403b23a73..492226b01a 100644 --- a/tests/e2e/Services/Functions/FunctionsBase.php +++ b/tests/e2e/Services/Functions/FunctionsBase.php @@ -432,4 +432,27 @@ trait FunctionsBase return $specifications; } + + protected function createFunctionRule(string $functionId, string $domain): mixed + { + $rule = $this->client->call(Client::METHOD_POST, '/proxy/rules/function', array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders()), [ + 'functionId' => $functionId, + 'domain' => $domain, + ]); + + return $rule; + } + + protected function getFunctionRule(string $ruleId): mixed + { + $rule = $this->client->call(Client::METHOD_GET, '/proxy/rules/' . $ruleId, array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders())); + + return $rule; + } } diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 8cc986b072..74b6ed3e8d 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -14,6 +14,7 @@ use Utopia\Database\Helpers\ID; use Utopia\Database\Helpers\Role; use Utopia\Database\Query; use Utopia\Database\Validator\Datetime as DatetimeValidator; +use Utopia\System\System; class FunctionsCustomServerTest extends Scope { @@ -392,6 +393,10 @@ class FunctionsCustomServerTest extends Scope $functionId = $function['body']['$id'] ?? ''; + $domain = ID::unique() . '.' . System::getEnv('_APP_DOMAIN_FUNCTIONS', ''); + $rule = $this->createFunctionRule($functionId, $domain); + $this->assertEquals(201, $rule['headers']['status-code']); + $deployment = $this->createTemplateDeployment( $functionId, [ @@ -408,6 +413,20 @@ class FunctionsCustomServerTest extends Scope $this->assertEquals(202, $deployment['headers']['status-code']); $this->assertNotEmpty($deployment['body']['$id']); + $rule = $this->getFunctionRule($rule['body']['$id']); + $this->assertEquals(200, $rule['headers']['status-code']); + $this->assertEquals($deployment['body']['$id'], $rule['body']['deploymentId']); + + $proxyClient = new Client(); + $proxyClient->setEndpoint('http://' . $domain); + + $response = $proxyClient->call(Client::METHOD_GET, '/'); + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertStringContainsString("Deployment is still building", $response['body']); + $this->assertStringContainsString("The page will update after the build completes.", $response['body']); + + $deployment = $this->getDeployment($functionId, $deployment['body']['$id']); + $this->assertEquals(200, $deployment['headers']['status-code']); // Wait for deployment to be ready $deploymentId = $deployment['body']['$id']; $this->assertEventually(function () use ($functionId, $deploymentId) { @@ -417,7 +436,6 @@ class FunctionsCustomServerTest extends Scope // Verify deployment sizes $deployment = $this->getDeployment($functionId, $deploymentId); - $this->assertEquals(200, $deployment['headers']['status-code']); $this->assertGreaterThan(0, $deployment['body']['sourceSize']); $this->assertGreaterThan(0, $deployment['body']['buildSize']); $totalSize = $deployment['body']['sourceSize'] + $deployment['body']['buildSize']; @@ -662,6 +680,10 @@ class FunctionsCustomServerTest extends Scope */ $functionId = $data['functionId']; + $domain = ID::unique() . '.' . System::getEnv('_APP_DOMAIN_FUNCTIONS', ''); + $rule = $this->createFunctionRule($functionId, $domain); + $this->assertEquals(201, $rule['headers']['status-code']); + $deployment = $this->createDeployment($functionId, [ 'code' => $this->packageFunction('basic'), 'activate' => true @@ -673,6 +695,18 @@ class FunctionsCustomServerTest extends Scope $this->assertEquals(true, (new DatetimeValidator())->isValid($deployment['body']['$createdAt'])); $this->assertEquals('index.js', $deployment['body']['entrypoint']); + $rule = $this->getFunctionRule($rule['body']['$id']); + $this->assertEquals(200, $rule['headers']['status-code']); + $this->assertEquals($deployment['body']['$id'], $rule['body']['deploymentId']); + + $proxyClient = new Client(); + $proxyClient->setEndpoint('http://' . $domain); + + $response = $proxyClient->call(Client::METHOD_GET, '/'); + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertStringContainsString("Deployment is still building", $response['body']); + $this->assertStringContainsString('The page will update after the build completes.', $response['body']); + $deploymentIdActive = $deployment['body']['$id'] ?? ''; $this->assertEventually(function () use ($functionId, $deploymentIdActive) { @@ -2392,6 +2426,12 @@ class FunctionsCustomServerTest extends Scope $domain = $this->setupFunctionDomain($functionId); $proxyClient->setEndpoint('http://' . $domain); + $response = $proxyClient->call(Client::METHOD_GET, '/'); + + $this->assertEquals(404, $response['headers']['status-code']); + $this->assertStringContainsString('No active deployments', $response['body']); + $this->assertStringContainsString('View deployments', $response['body']); + $deployment = $this->createDeployment($functionId, [ 'code' => $this->packageFunction('basic'), 'activate' => true @@ -2404,11 +2444,22 @@ class FunctionsCustomServerTest extends Scope 'x-appwrite-project' => $this->getProject()['$id'] ])); - $this->assertEquals(404, $response['headers']['status-code']); - $this->assertStringContainsString('No active deployments', $response['body']); - $this->assertStringContainsString('View deployments', $response['body']); + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertStringContainsString('Deployment is still building', $response['body']); + $this->assertStringContainsString('The page will update after the build completes.', $response['body']); // canceled deployment + $functionId = $this->setupFunction([ + 'functionId' => ID::unique(), + 'name' => 'Test Error Pages', + 'runtime' => 'node-22', + 'entrypoint' => 'index.js', + 'timeout' => 15, + 'commands' => 'cd non-existing-directory', + 'execute' => ['any'] + ]); + $domain = $this->setupFunctionDomain($functionId); + $proxyClient->setEndpoint('http://' . $domain); $deployment = $this->createDeployment($functionId, [ 'code' => $this->packageFunction('basic'), 'activate' => true @@ -2426,9 +2477,9 @@ class FunctionsCustomServerTest extends Scope 'x-appwrite-project' => $this->getProject()['$id'] ])); - $this->assertEquals(404, $response['headers']['status-code']); - $this->assertStringContainsString('No active deployments', $response['body']); - $this->assertStringContainsString('View deployments', $response['body']); + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertStringContainsString('Deployment build canceled', $response['body']); + $this->assertStringContainsString('This build was canceled and won\'t be deployed.', $response['body']); $this->cleanupFunction($functionId); } diff --git a/tests/e2e/Services/Sites/SitesBase.php b/tests/e2e/Services/Sites/SitesBase.php index 7eb5d9699c..6abe1b38d9 100644 --- a/tests/e2e/Services/Sites/SitesBase.php +++ b/tests/e2e/Services/Sites/SitesBase.php @@ -474,4 +474,27 @@ trait SitesBase return $specifications; } + + protected function createSiteRule(string $siteId, string $domain): mixed + { + $rule = $this->client->call(Client::METHOD_POST, '/proxy/rules/site', array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders()), [ + 'siteId' => $siteId, + 'domain' => $domain, + ]); + + return $rule; + } + + protected function getSiteRule(string $ruleId): mixed + { + $rule = $this->client->call(Client::METHOD_GET, '/proxy/rules/' . $ruleId, array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders())); + + return $rule; + } } diff --git a/tests/e2e/Services/Sites/SitesConsoleClientTest.php b/tests/e2e/Services/Sites/SitesConsoleClientTest.php index 227e36a50e..2b75402b25 100644 --- a/tests/e2e/Services/Sites/SitesConsoleClientTest.php +++ b/tests/e2e/Services/Sites/SitesConsoleClientTest.php @@ -74,8 +74,11 @@ class SitesConsoleClientTest extends Scope $this->assertGreaterThan(1, $file['headers']['content-length']); $this->assertEquals('image/png', $file['headers']['content-type']); - $screenshotHash = \md5($file['body']); - $this->assertNotEmpty($screenshotHash); + // Compare with reference screenshots + $referencePath = \realpath(__DIR__ . '/../../../resources/sites/static-themed'); + $referenceScreenshotLight = $referencePath . '/screenshot-light.png'; + $this->assertFileExists($referenceScreenshotLight, 'Reference light screenshot not found'); + $this->assertSamePixels($referenceScreenshotLight, $file['body']); $screenshotId = $deployment['body']['screenshotDark']; $file = $this->client->call(Client::METHOD_GET, "/storage/buckets/screenshots/files/$screenshotId/view?project=console", array_merge($this->getHeaders(), [ @@ -87,10 +90,9 @@ class SitesConsoleClientTest extends Scope $this->assertGreaterThan(1, $file['headers']['content-length']); $this->assertEquals('image/png', $file['headers']['content-type']); - $screenshotDarkHash = \md5($file['body']); - $this->assertNotEmpty($screenshotDarkHash); - - $this->assertNotEquals($screenshotDarkHash, $screenshotHash); + $referenceScreenshotDark = $referencePath . '/screenshot-dark.png'; + $this->assertFileExists($referenceScreenshotDark, 'Reference dark screenshot not found'); + $this->assertSamePixels($referenceScreenshotDark, $file['body']); $screenshotId = $deployment['body']['screenshotLight']; $file = $this->client->call(Client::METHOD_GET, "/storage/buckets/screenshots/files/$screenshotId/view?project=console"); diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index b7dc9e7334..413fea289f 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -861,6 +861,10 @@ class SitesCustomServerTest extends Scope $this->assertNotNull($siteId); + $domain = ID::unique() . '.' . System::getEnv('_APP_DOMAIN_SITES', ''); + $rule = $this->createSiteRule($siteId, $domain); + $this->assertEquals(201, $rule['headers']['status-code']); + $deployment = $this->createDeployment($siteId, [ 'siteId' => $siteId, 'code' => $this->packageSite('static-single-file'), @@ -872,6 +876,18 @@ class SitesCustomServerTest extends Scope $this->assertEquals('waiting', $deployment['body']['status']); $this->assertEquals(true, (new DatetimeValidator())->isValid($deployment['body']['$createdAt'])); + $rule = $this->getSiteRule($rule['body']['$id']); + $this->assertEquals(200, $rule['headers']['status-code']); + $this->assertEquals($deployment['body']['$id'], $rule['body']['deploymentId']); + + $proxyClient = new Client(); + $proxyClient->setEndpoint('http://' . $domain); + + $response = $proxyClient->call(Client::METHOD_GET, '/'); + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertStringContainsString("Deployment is still building", $response['body']); + $this->assertStringContainsString('The page will update after the build completes.', $response['body']); + $deploymentIdActive = $deployment['body']['$id'] ?? ''; $this->assertEventually(function () use ($siteId, $deploymentIdActive) { @@ -1563,6 +1579,10 @@ class SitesCustomServerTest extends Scope $this->assertNotEmpty($siteId); + $domain = ID::unique() . '.' . System::getEnv('_APP_DOMAIN_SITES', ''); + $rule = $this->createSiteRule($siteId, $domain); + $this->assertEquals(201, $rule['headers']['status-code']); + $deployment = $this->createTemplateDeployment($siteId, [ 'repository' => $template['providerRepositoryId'], 'owner' => $template['providerOwner'], @@ -1575,6 +1595,18 @@ class SitesCustomServerTest extends Scope $this->assertEquals(202, $deployment['headers']['status-code']); $this->assertNotEmpty($deployment['body']['$id']); + $rule = $this->getSiteRule($rule['body']['$id']); + $this->assertEquals(200, $rule['headers']['status-code']); + $this->assertEquals($deployment['body']['$id'], $rule['body']['deploymentId']); + + $proxyClient = new Client(); + $proxyClient->setEndpoint('http://' . $domain); + + $response = $proxyClient->call(Client::METHOD_GET, '/'); + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertStringContainsString("Deployment is still building", $response['body']); + $this->assertStringContainsString('The page will update after the build completes.', $response['body']); + $deployment = $this->getDeployment($siteId, $deployment['body']['$id']); $this->assertEquals(200, $deployment['headers']['status-code']); $this->assertEquals(0, $deployment['body']['sourceSize']); @@ -1586,10 +1618,6 @@ class SitesCustomServerTest extends Scope $this->assertNotEmpty($site['body']['deploymentId']); }, 50000, 500); - $domain = $this->setupSiteDomain($siteId); - $proxyClient = new Client(); - $proxyClient->setEndpoint('http://' . $domain); - $response = $proxyClient->call(Client::METHOD_GET, '/'); $this->assertEquals(200, $response['headers']['status-code']); @@ -2584,7 +2612,8 @@ class SitesCustomServerTest extends Scope }, 100000, 500); $response = $proxyClient->call(Client::METHOD_GET, '/'); - $this->assertStringContainsString('This page is empty, activate a deployment to make it live.', $response['body']); + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertStringContainsString('Deployment build failed', $response['body']); $this->cleanupSite($siteId); } @@ -2679,6 +2708,12 @@ class SitesCustomServerTest extends Scope $this->assertNotEmpty($siteId); $domain = $this->setupSiteDomain($siteId); + $proxyClient->setEndpoint('http://' . $domain); + $response = $proxyClient->call(Client::METHOD_GET, '/'); + + $this->assertEquals(404, $response['headers']['status-code']); + $this->assertStringContainsString('No active deployments', $response['body']); + $this->assertStringContainsString('View deployments', $response['body']); // test canceled deployment error page $deployment = $this->createDeployment($siteId, [ @@ -2714,13 +2749,6 @@ class SitesCustomServerTest extends Scope $this->assertStringContainsString("Deployment build canceled", $response['body']); $this->assertStringContainsString("View deployments", $response['body']); - // check site domain for no active deployments - $proxyClient->setEndpoint('http://' . $domain); - $response = $proxyClient->call(Client::METHOD_GET, '/'); - $this->assertEquals(404, $response['headers']['status-code']); - $this->assertStringContainsString('No active deployments', $response['body']); - $this->assertStringContainsString('View deployments', $response['body']); - $deployment = $this->createDeployment($siteId, [ 'code' => $this->packageSite('static-single-file'), 'activate' => 'true' diff --git a/tests/resources/avatars/screenshot-example-com.png b/tests/resources/avatars/screenshot-example-com.png new file mode 100644 index 0000000000..2f8af920e0 Binary files /dev/null and b/tests/resources/avatars/screenshot-example-com.png differ diff --git a/tests/resources/sites/static-themed/index.html b/tests/resources/sites/static-themed/index.html index 955696b473..f1a446612f 100644 --- a/tests/resources/sites/static-themed/index.html +++ b/tests/resources/sites/static-themed/index.html @@ -5,19 +5,70 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Themed website - + +
+

Themed website

+

Adaptive light and dark mode showcase

+
Appwrite Sites
+
+ diff --git a/tests/resources/sites/static-themed/screenshot-dark.png b/tests/resources/sites/static-themed/screenshot-dark.png new file mode 100644 index 0000000000..199a09b902 Binary files /dev/null and b/tests/resources/sites/static-themed/screenshot-dark.png differ diff --git a/tests/resources/sites/static-themed/screenshot-light.png b/tests/resources/sites/static-themed/screenshot-light.png new file mode 100644 index 0000000000..4eae73c5b7 Binary files /dev/null and b/tests/resources/sites/static-themed/screenshot-light.png differ