Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Authentik support #2714

Merged
merged 2 commits into from
Nov 20, 2024
Merged

Added Authentik support #2714

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8ae87
Added Authentik support
nanawel Nov 20, 2024
08db13d
formatting
ildyria Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
# MICROSOFT_CLIENT_SECRET=
# MICROSOFT_REDIRECT_URI=/auth/microsoft/redirect

# NEXTCLOUD_CLIENT_ID=
# NEXTCLOUD_CLIENT_SECRET=
# NEXTCLOUD_CLIENT_ID=
# NEXTCLOUD_CLIENT_SECRET=
# NEXTCLOUD_REDIRECT_URI=/auth/nextcloud/redirect
# NEXTCLOUD_BASE_URI=

Expand All @@ -175,6 +175,11 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
# KEYCLOAK_BASE_URL=
# KEYCLOAK_REALM=

# AUTHENTIK_BASE_URL=
# AUTHENTIK_CLIENT_ID=
# AUTHENTIK_CLIENT_SECRET=
# AUTHENTIK_REDIRECT_URI=/auth/authentik/redirect

# AWS support data

# AWS_ACCESS_KEY_ID=
Expand Down
1 change: 1 addition & 0 deletions app/Enum/OauthProvidersType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ enum OauthProvidersType: string

case AMAZON = 'amazon';
case APPLE = 'apple';
case AUTHENTIK = 'authentik';
case FACEBOOK = 'facebook';
case GITHUB = 'github';
case GOOGLE = 'google';
Expand Down
2 changes: 2 additions & 0 deletions app/Providers/EventServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use SocialiteProviders\Amazon\AmazonExtendSocialite;
use SocialiteProviders\Apple\AppleExtendSocialite;
use SocialiteProviders\Authentik\AuthentikExtendSocialite;
use SocialiteProviders\Facebook\FacebookExtendSocialite;
use SocialiteProviders\GitHub\GitHubExtendSocialite;
use SocialiteProviders\Google\GoogleExtendSocialite;
Expand All @@ -28,6 +29,7 @@ class EventServiceProvider extends ServiceProvider
SocialiteWasCalled::class => [
AmazonExtendSocialite::class . '@handle',
AppleExtendSocialite::class . '@handle',
AuthentikExtendSocialite::class . '@handle',
FacebookExtendSocialite::class . '@handle',
GitHubExtendSocialite::class . '@handle',
GoogleExtendSocialite::class . '@handle',
Expand Down
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"revolution/socialite-mastodon": "^1.4",
"socialiteproviders/amazon": "^4.1",
"socialiteproviders/apple": "^5.6",
"socialiteproviders/authentik": "^5.2",
"socialiteproviders/facebook": "^4.1",
"socialiteproviders/github": "^4.1",
"socialiteproviders/google": "^4.1",
Expand Down
52 changes: 51 additions & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions config/services.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@
'redirect' => env('APPLE_REDIRECT_URI', '/auth/apple/redirect'),
],

'authentik' => [
'client_id' => env('AUTHENTIK_CLIENT_ID'),
'client_secret' => env('AUTHENTIK_CLIENT_SECRET'),
'redirect' => env('AUTHENTIK_REDIRECT_URI'),
'base_url' => env('AUTHENTIK_BASE_URL'),
],

'facebook' => [
'client_id' => env('FACEBOOK_CLIENT_ID'),
'client_secret' => env('FACEBOOK_CLIENT_SECRET'),
Expand Down
2 changes: 1 addition & 1 deletion resources/js/lychee.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ declare namespace App.Enum {
| "CC-BY-NC-SA-3.0"
| "CC-BY-NC-SA-4.0";
export type MapProviders = "Wikimedia" | "OpenStreetMap.org" | "OpenStreetMap.de" | "OpenStreetMap.fr" | "RRZE";
export type OauthProvidersType = "amazon" | "apple" | "facebook" | "github" | "google" | "mastodon" | "microsoft" | "nextcloud" | "keycloak";
export type OauthProvidersType = "amazon" | "apple" | "authentik" | "facebook" | "github" | "google" | "mastodon" | "microsoft" | "nextcloud" | "keycloak";
export type OrderSortingType = "ASC" | "DESC";
export type PhotoLayoutType = "square" | "justified" | "unjustified" | "masonry" | "grid";
export type SeverityType = "emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug";
Expand Down
2 changes: 2 additions & 0 deletions resources/js/services/oauth-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ const OauthService = {
return "fa-brands fa-apple";
case "amazon":
return "fa-brands fa-amazon";
case "authentik":
return "fa-brands fa-key";
ildyria marked this conversation as resolved.
Show resolved Hide resolved
case "facebook":
return "fa-brands fa-facebook";
case "github":
Expand Down
Loading