Merge branch '1.5.x' into fix-7892-add-defaults-to-migrations
This commit is contained in:
commit
441811e808
4 changed files with 8 additions and 8 deletions
|
@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
|
||||||
RUN npm ci
|
RUN npm ci
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM appwrite/base:0.9.0 as final
|
FROM appwrite/base:0.9.1 as final
|
||||||
|
|
||||||
LABEL maintainer="team@appwrite.io"
|
LABEL maintainer="team@appwrite.io"
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ return [
|
||||||
[
|
[
|
||||||
'key' => 'web',
|
'key' => 'web',
|
||||||
'name' => 'Web',
|
'name' => 'Web',
|
||||||
'version' => '14.0.2',
|
'version' => '15.0.0',
|
||||||
'url' => 'https://github.com/appwrite/sdk-for-web',
|
'url' => 'https://github.com/appwrite/sdk-for-web',
|
||||||
'package' => 'https://www.npmjs.com/package/appwrite',
|
'package' => 'https://www.npmjs.com/package/appwrite',
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
|
@ -138,7 +138,7 @@ return [
|
||||||
[
|
[
|
||||||
'key' => 'react-native',
|
'key' => 'react-native',
|
||||||
'name' => 'React Native',
|
'name' => 'React Native',
|
||||||
'version' => '0.3.2',
|
'version' => '0.4.0',
|
||||||
'url' => 'https://github.com/appwrite/sdk-for-react-native',
|
'url' => 'https://github.com/appwrite/sdk-for-react-native',
|
||||||
'package' => 'https://npmjs.com/package/react-native-appwrite',
|
'package' => 'https://npmjs.com/package/react-native-appwrite',
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
|
@ -267,7 +267,7 @@ return [
|
||||||
[
|
[
|
||||||
'key' => 'deno',
|
'key' => 'deno',
|
||||||
'name' => 'Deno',
|
'name' => 'Deno',
|
||||||
'version' => '10.0.2',
|
'version' => '11.0.0',
|
||||||
'url' => 'https://github.com/appwrite/sdk-for-deno',
|
'url' => 'https://github.com/appwrite/sdk-for-deno',
|
||||||
'package' => 'https://deno.land/x/appwrite',
|
'package' => 'https://deno.land/x/appwrite',
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
|
|
|
@ -86,8 +86,8 @@ $createSession = function (string $userId, string $secret, Request $request, Res
|
||||||
$factor = (match ($verifiedToken->getAttribute('type')) {
|
$factor = (match ($verifiedToken->getAttribute('type')) {
|
||||||
Auth::TOKEN_TYPE_MAGIC_URL,
|
Auth::TOKEN_TYPE_MAGIC_URL,
|
||||||
Auth::TOKEN_TYPE_OAUTH2,
|
Auth::TOKEN_TYPE_OAUTH2,
|
||||||
Auth::TOKEN_TYPE_EMAIL => 'email',
|
Auth::TOKEN_TYPE_EMAIL => Type::EMAIL,
|
||||||
Auth::TOKEN_TYPE_PHONE => 'phone',
|
Auth::TOKEN_TYPE_PHONE => Type::PHONE,
|
||||||
Auth::TOKEN_TYPE_GENERIC => 'token',
|
Auth::TOKEN_TYPE_GENERIC => 'token',
|
||||||
default => throw new Exception(Exception::USER_INVALID_TOKEN)
|
default => throw new Exception(Exception::USER_INVALID_TOKEN)
|
||||||
});
|
});
|
||||||
|
@ -1508,7 +1508,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
|
||||||
'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
|
'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
|
||||||
'userAgent' => $request->getUserAgent('UNKNOWN'),
|
'userAgent' => $request->getUserAgent('UNKNOWN'),
|
||||||
'ip' => $request->getIP(),
|
'ip' => $request->getIP(),
|
||||||
'factors' => ['email'],
|
'factors' => [TYPE::EMAIL, 'oauth2'], // include a special oauth2 factor to bypass MFA checks
|
||||||
'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
|
'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
|
||||||
'expire' => DateTime::addSeconds(new \DateTime(), $duration)
|
'expire' => DateTime::addSeconds(new \DateTime(), $duration)
|
||||||
], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
|
], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Verify an authenticator app after adding it using the [add authenticator](/docs/references/cloud/client-web/account#createMfaAuthenticator) method. add
|
Verify an authenticator app after adding it using the [add authenticator](/docs/references/cloud/client-web/account#createMfaAuthenticator) method.
|
Loading…
Reference in a new issue