diff --git a/enterprise/coderd/oauth2.go b/enterprise/coderd/oauth2.go index 6cc2faf54fada..807180a94f934 100644 --- a/enterprise/coderd/oauth2.go +++ b/enterprise/coderd/oauth2.go @@ -6,7 +6,6 @@ import ( "github.com/google/uuid" - "github.com/coder/coder/v2/buildinfo" "github.com/coder/coder/v2/coderd/database" "github.com/coder/coder/v2/coderd/database/db2sdk" "github.com/coder/coder/v2/coderd/database/dbtime" @@ -19,13 +18,6 @@ import ( func (api *API) oAuth2ProviderMiddleware(next http.Handler) http.Handler { return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { - if !buildinfo.IsDev() { - httpapi.Write(r.Context(), rw, http.StatusForbidden, codersdk.Response{ - Message: "OAuth2 provider is under development.", - }) - return - } - api.entitlementsMu.RLock() entitled := api.entitlements.Features[codersdk.FeatureOAuth2Provider].Entitlement != codersdk.EntitlementNotEntitled api.entitlementsMu.RUnlock() diff --git a/site/src/pages/DeploySettingsPage/Sidebar.tsx b/site/src/pages/DeploySettingsPage/Sidebar.tsx index c7f6961676dbb..a6e4dca4d7cfa 100644 --- a/site/src/pages/DeploySettingsPage/Sidebar.tsx +++ b/site/src/pages/DeploySettingsPage/Sidebar.tsx @@ -7,7 +7,7 @@ import Globe from "@mui/icons-material/PublicOutlined"; import HubOutlinedIcon from "@mui/icons-material/HubOutlined"; import VpnKeyOutlined from "@mui/icons-material/VpnKeyOutlined"; import MonitorHeartOutlined from "@mui/icons-material/MonitorHeartOutlined"; -// import Token from "@mui/icons-material/Token"; +import Token from "@mui/icons-material/Token"; import { type FC } from "react"; import { GitIcon } from "components/Icons/GitIcon"; import { @@ -33,10 +33,9 @@ export const Sidebar: FC = () => { External Authentication - {/* Not exposing this yet since token exchange is not finished yet. OAuth2 Applications - */} + Network diff --git a/site/src/pages/UserSettingsPage/Sidebar.tsx b/site/src/pages/UserSettingsPage/Sidebar.tsx index 827efbc7db501..164adf06304d9 100644 --- a/site/src/pages/UserSettingsPage/Sidebar.tsx +++ b/site/src/pages/UserSettingsPage/Sidebar.tsx @@ -5,6 +5,7 @@ import AccountIcon from "@mui/icons-material/Person"; import AppearanceIcon from "@mui/icons-material/Brush"; import ScheduleIcon from "@mui/icons-material/EditCalendarOutlined"; import SecurityIcon from "@mui/icons-material/LockOutlined"; +import Token from "@mui/icons-material/Token"; import type { User } from "api/typesGenerated"; import { UserAvatar } from "components/UserAvatar/UserAvatar"; import { @@ -23,6 +24,7 @@ export const Sidebar: FC = ({ user }) => { const { entitlements } = useDashboard(); const showSchedulePage = entitlements.features.advanced_template_scheduling.enabled; + const showOAuth2Page = entitlements.features.oauth2_provider.enabled; return ( @@ -42,6 +44,11 @@ export const Sidebar: FC = ({ user }) => { External Authentication + {showOAuth2Page && ( + + OAuth2 Applications + + )} {showSchedulePage && ( Schedule