From f88d4fd6d3a9efcb1d049c004e4022bd4b04853e Mon Sep 17 00:00:00 2001 From: brufdev Date: Thu, 23 Jan 2025 00:38:13 +0000 Subject: [PATCH] Update the OAuth redirect variable name to ensure consistency --- README.md | 10 +++++----- config/services.php | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 479a9bd..b360560 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ For example, to enable GitHub OAuth, add: environment: - GITHUB_CLIENT_ID=CLIENT_ID # change id - GITHUB_CLIENT_SECRET=CLIENT_SECRET # change secret - - GITHUB_REDIRECT=http://localhost/oauth/github/callback # change url + - GITHUB_REDIRECT_URI=http://localhost/oauth/github/callback # change uri ``` **Authentik and Keycloak providers require additional configuration.** @@ -140,20 +140,20 @@ To enable GitHub OAuth, add: ```yaml environment: + - AUTHENTIK_BASE_URL=http://your-authentik-domain # change url - AUTHENTIK_CLIENT_ID=CLIENT_ID # change id - AUTHENTIK_CLIENT_SECRET=CLIENT_SECRET # change secret - - AUTHENTIK_REDIRECT=http://localhost/oauth/authentik/callback # change url - - AUTHENTIK_BASE_URL=http://your-authentik-domain # change url + - AUTHENTIK_REDIRECT_URI=http://localhost/oauth/authentik/callback # change uri ``` To enable Keycloak OAuth, add: ```yaml environment: + - KEYCLOAK_BASE_URL=http://your-keycloak-domain # change url - KEYCLOAK_CLIENT_ID=CLIENT_ID # change id - KEYCLOAK_CLIENT_SECRET=CLIENT_SECRET # change secret - - KEYCLOAK_REDIRECT=http://localhost/oauth/keycloak/callback # change url - - KEYCLOAK_BASE_URL=http://your-keycloak-domain # change url + - KEYCLOAK_REDIRECT_URI=http://localhost/oauth/keycloak/callback # change uri - KEYCLOAK_REALM=YOUR_REALM # change realm ``` diff --git a/config/services.php b/config/services.php index a76b03f..0a2681c 100644 --- a/config/services.php +++ b/config/services.php @@ -32,57 +32,57 @@ return [ 'base_url' => env('AUTHENTIK_BASE_URL'), 'client_id' => env('AUTHENTIK_CLIENT_ID'), 'client_secret' => env('AUTHENTIK_CLIENT_SECRET'), - 'redirect' => env('AUTHENTIK_REDIRECT'), + 'redirect' => env('AUTHENTIK_REDIRECT_URI'), ], 'bitbucket' => [ 'client_id' => env('BITBUCKET_CLIENT_ID'), 'client_secret' => env('BITBUCKET_CLIENT_SECRET'), - 'redirect' => env('BITBUCKET_REDIRECT'), + 'redirect' => env('BITBUCKET_REDIRECT_URI'), ], 'facebook' => [ 'client_id' => env('FACEBOOK_CLIENT_ID'), 'client_secret' => env('FACEBOOK_CLIENT_SECRET'), - 'redirect' => env('FACEBOOK_REDIRECT'), + 'redirect' => env('FACEBOOK_REDIRECT_URI'), ], 'github' => [ 'client_id' => env('GITHUB_CLIENT_ID'), 'client_secret' => env('GITHUB_CLIENT_SECRET'), - 'redirect' => env('GITHUB_REDIRECT'), + 'redirect' => env('GITHUB_REDIRECT_URI'), ], 'gitlab' => [ 'client_id' => env('GITLAB_CLIENT_ID'), 'client_secret' => env('GITLAB_CLIENT_SECRET'), - 'redirect' => env('GITLAB_REDIRECT'), + 'redirect' => env('GITLAB_REDIRECT_URI'), ], 'google' => [ 'client_id' => env('GOOGLE_CLIENT_ID'), 'client_secret' => env('GOOGLE_CLIENT_SECRET'), - 'redirect' => env('GOOGLE_REDIRECT'), + 'redirect' => env('GOOGLE_REDIRECT_URI'), ], 'keycloak' => [ + 'base_url' => env('KEYCLOAK_BASE_URL'), 'client_id' => env('KEYCLOAK_CLIENT_ID'), 'client_secret' => env('KEYCLOAK_CLIENT_SECRET'), - 'redirect' => env('KEYCLOAK_REDIRECT'), - 'base_url' => env('KEYCLOAK_BASE_URL'), + 'redirect' => env('KEYCLOAK_REDIRECT_URI'), 'realms' => env('KEYCLOAK_REALM'), ], 'linkedin' => [ 'client_id' => env('LINKEDIN_CLIENT_ID'), 'client_secret' => env('LINKEDIN_CLIENT_SECRET'), - 'redirect' => env('LINKEDIN_REDIRECT'), + 'redirect' => env('LINKEDIN_REDIRECT_URI'), ], 'slack' => [ 'client_id' => env('SLACK_CLIENT_ID'), 'client_secret' => env('SLACK_CLIENT_SECRET'), - 'redirect' => env('SLACK_REDIRECT'), + 'redirect' => env('SLACK_REDIRECT_URI'), 'notifications' => [ 'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'), 'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'), @@ -92,7 +92,7 @@ return [ 'twitter' => [ 'client_id' => env('TWITTER_CLIENT_ID'), 'client_secret' => env('TWITTER_CLIENT_SECRET'), - 'redirect' => env('TWITTER_REDIRECT'), + 'redirect' => env('TWITTER_REDIRECT_URI'), ], ];