Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

providerAccessTokenExpiry

Browse Source
This commit is contained in:
fogelito
2022-07-05 16:06:55 +03:00
parent a9a91603d1
commit 203b3058a2
19 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/collections.php
+1 -1
View File
@@ -1452,7 +1452,7 @@ $collections = [
],
[
'$id' => 'providerAccessTokenExpiry',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_DATETIME,
'format' => '',
'size' => 0,
'signed' => true,
app/controllers/api/account.php
+2 -13
View File
@@ -517,7 +517,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
'providerUid' => $oauth2ID,
'providerAccessToken' => $accessToken,
'providerRefreshToken' => $refreshToken,
'providerAccessTokenExpiry' => \time() + (int) $accessTokenExpiry,
'providerAccessTokenExpiry' => Database::dateAddSeconds(new DateTime(), (int)$accessTokenExpiry),
'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
'expire' => $expire,
'userAgent' => $request->getUserAgent('UNKNOWN'),
@@ -661,8 +661,6 @@ App::post('/v1/account/sessions/magic-url')
}
$loginSecret = Auth::tokenGenerator();
//$expire = \time() + Auth::TOKEN_EXPIRATION_CONFIRM;
$expire = Database::dateAddSeconds(new DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
$token = new Document([
@@ -906,8 +904,6 @@ App::post('/v1/account/sessions/phone')
}
$secret = $phone->generateSecretDigits();
//$expire = \time() + Auth::TOKEN_EXPIRATION_PHONE;
$expire = Database::dateAddSeconds(new DateTime(), Auth::TOKEN_EXPIRATION_PHONE);
$token = new Document([
@@ -1824,7 +1820,7 @@ App::patch('/v1/account/sessions/:sessionId')
$session
->setAttribute('providerAccessToken', $oauth2->getAccessToken(''))
->setAttribute('providerRefreshToken', $oauth2->getRefreshToken(''))
->setAttribute('providerAccessTokenExpiry', \time() + (int) $oauth2->getAccessTokenExpiry(''));
->setAttribute('providerAccessTokenExpiry', Database::dateAddSeconds(new DateTime(), (int)$oauth2->getAccessTokenExpiry('')));
$dbForProject->updateDocument('sessions', $sessionId, $session);
@@ -1967,7 +1963,6 @@ App::post('/v1/account/recovery')
throw new Exception('Invalid credentials. User is blocked', 401, Exception::USER_BLOCKED);
}
//$expire = \time() + Auth::TOKEN_EXPIRATION_RECOVERY;
$expire = Database::dateAddSeconds(new DateTime(), Auth::TOKEN_EXPIRATION_RECOVERY);
$secret = Auth::tokenGenerator();
@@ -2127,10 +2122,7 @@ App::post('/v1/account/verification')
$roles = Authorization::getRoles();
$isPrivilegedUser = Auth::isPrivilegedUser($roles);
$isAppUser = Auth::isAppUser($roles);
$verificationSecret = Auth::tokenGenerator();
//$expire = \time() + Auth::TOKEN_EXPIRATION_CONFIRM;
$expire = Database::dateAddSeconds(new DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
$verification = new Document([
@@ -2282,11 +2274,8 @@ App::post('/v1/account/verification/phone')
$roles = Authorization::getRoles();
$isPrivilegedUser = Auth::isPrivilegedUser($roles);
$isAppUser = Auth::isAppUser($roles);
$verificationSecret = Auth::tokenGenerator();
$secret = $phone->generateSecretDigits();
//$expire = \time() + Auth::TOKEN_EXPIRATION_CONFIRM;
$expire = Database::dateAddSeconds(new DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
$verification = new Document([
src/Appwrite/Utopia/Response/Model/Bucket.php
+2 -2
View File
@@ -20,13 +20,13 @@ class Bucket extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$read', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Collection.php
+2 -2
View File
@@ -20,13 +20,13 @@ class Collection extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$read', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Deployment.php
+2 -2
View File
@@ -20,13 +20,13 @@ class Deployment extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('resourceId', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Document.php
+2 -2
View File
@@ -46,13 +46,13 @@ class Document extends Any
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$read', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Domain.php
+2 -2
View File
@@ -25,13 +25,13 @@ class Domain extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('domain', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Execution.php
+2 -2
View File
@@ -20,13 +20,13 @@ class Execution extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' upate date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$read', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/File.php
+2 -2
View File
@@ -26,13 +26,13 @@ class File extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$read', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Func.php
+2 -2
View File
@@ -22,13 +22,13 @@ class Func extends Model
'type' => self::TYPE_DATETIME,
'description' => 'Function creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => 'Function update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('execute', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Key.php
+2 -2
View File
@@ -25,13 +25,13 @@ class Key extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('name', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Membership.php
+2 -2
View File
@@ -20,13 +20,13 @@ class Membership extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('userId', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Platform.php
+2 -2
View File
@@ -25,13 +25,13 @@ class Platform extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('name', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Project.php
+2 -2
View File
@@ -27,13 +27,13 @@ class Project extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('name', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Session.php
+5 -5
View File
@@ -20,7 +20,7 @@ class Session extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('userId', [
'type' => self::TYPE_STRING,
@@ -32,7 +32,7 @@ class Session extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' expiration date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('provider', [
'type' => self::TYPE_STRING,
@@ -53,10 +53,10 @@ class Session extends Model
'example' => 'MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3',
])
->addRule('providerAccessTokenExpiry', [
'type' => self::TYPE_INTEGER,
'type' => self::TYPE_DATETIME,
'description' => 'Date, the Unix timestamp of when the access token expires.',
'default' => 0,
'example' => 1592981250,
'default' => '',
'example' => '1975-12-06 13:30:59',
])
->addRule('providerRefreshToken', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Team.php
+2 -2
View File
@@ -20,13 +20,13 @@ class Team extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('name', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Token.php
+1 -1
View File
@@ -20,7 +20,7 @@ class Token extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('userId', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/User.php
+4 -4
View File
@@ -21,13 +21,13 @@ class User extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime.',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('name', [
'type' => self::TYPE_STRING,
@@ -39,7 +39,7 @@ class User extends Model
'type' => self::TYPE_DATETIME,
'description' => 'User registration date in Datetime.',
'default' => null,
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('status', [
'type' => self::TYPE_BOOLEAN,
@@ -51,7 +51,7 @@ class User extends Model
'type' => self::TYPE_DATETIME,
'description' => 'Datetime of the most recent password update',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('email', [
'type' => self::TYPE_STRING,
src/Appwrite/Utopia/Response/Model/Webhook.php
+2 -2
View File
@@ -25,13 +25,13 @@ class Webhook extends Model
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' creation date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('$updatedAt', [
'type' => self::TYPE_DATETIME,
'description' => get_class() . ' update date in Datetime',
'default' => '',
'example' => '1975-06-12 13:30:59',
'example' => '1975-12-06 13:30:59',
])
->addRule('name', [
'type' => self::TYPE_STRING,