From 3a9202a46be3c9993e8785613fb553a17a63ea79 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Wed, 25 Oct 2023 13:20:29 +0100 Subject: [PATCH] chore: christy feedback --- app/controllers/api/account.php | 2 +- app/controllers/api/users.php | 6 +++--- app/controllers/shared/api.php | 12 ++++++++++++ app/controllers/shared/api/auth.php | 12 ++++++++++++ ...rsal-token-session.md => create-session-token.md} | 0 5 files changed, 28 insertions(+), 4 deletions(-) rename docs/references/users/{create-universal-token-session.md => create-session-token.md} (100%) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 7328a19c7d..8959280792 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -1128,7 +1128,7 @@ App::put('/v1/account/sessions/token') ->label('usage.metric', 'sessions.{scope}.requests.create') ->label('sdk.auth', []) ->label('sdk.namespace', 'account') - ->label('sdk.method', 'updateTokenSession') + ->label('sdk.method', 'updateSessionToken') ->label('sdk.description', '/docs/references/account/update-universal-token-session.md') ->label('sdk.response.code', Response::STATUS_CODE_CREATED) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 2294c82246..c5ce22024f 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -1081,7 +1081,7 @@ App::patch('/v1/users/:userId/prefs') }); App::post('/v1/users/:userId/tokens') - ->desc('Create universal token') + ->desc('Create session token') ->groups(['api', 'users']) ->label('event', 'users.[userId].tokens.create') ->label('scope', 'users.write') @@ -1090,8 +1090,8 @@ App::post('/v1/users/:userId/tokens') ->label('usage.metric', 'tokens.requests.create') ->label('sdk.auth', [APP_AUTH_TYPE_KEY]) ->label('sdk.namespace', 'users') - ->label('sdk.method', 'createToken') - ->label('sdk.description', '/docs/references/users/create-universal-token-session.md') + ->label('sdk.method', 'createSessionToken') + ->label('sdk.description', '/docs/references/users/create-session-token-session.md') ->label('sdk.response.code', Response::STATUS_CODE_CREATED) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.model', Response::MODEL_TOKEN) diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 388851faef..613d3a59d8 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -308,6 +308,18 @@ App::init() } break; + case 'token': + if (($auths['token'] ?? true) === false) { + throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Token authentication is disabled for this project'); + } + break; + + case 'phone': + if (($auths['phone'] ?? true) === false) { + throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Phone authentication is disabled for this project'); + } + break; + default: throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Unsupported authentication route'); break; diff --git a/app/controllers/shared/api/auth.php b/app/controllers/shared/api/auth.php index 5b1af0d36c..44d598ab32 100644 --- a/app/controllers/shared/api/auth.php +++ b/app/controllers/shared/api/auth.php @@ -55,6 +55,18 @@ App::init() } break; + case 'token': + if (($auths['token'] ?? true) === false) { + throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Token authentication is disabled for this project'); + } + break; + + case 'phone': + if (($auths['phone'] ?? true) === false) { + throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Phone authentication is disabled for this project'); + } + break; + default: throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Unsupported authentication route'); break; diff --git a/docs/references/users/create-universal-token-session.md b/docs/references/users/create-session-token.md similarity index 100% rename from docs/references/users/create-universal-token-session.md rename to docs/references/users/create-session-token.md