Skip to content

Commit 5e8b50a

Browse files
committed
Enable OAuth2 provider management
1 parent 4f27d79 commit 5e8b50a

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

enterprise/coderd/oauth2.go

-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"github.com/google/uuid"
1111

12-
"github.com/coder/coder/v2/buildinfo"
1312
"github.com/coder/coder/v2/coderd/database"
1413
"github.com/coder/coder/v2/coderd/database/db2sdk"
1514
"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -22,13 +21,6 @@ import (
2221

2322
func (api *API) oAuth2ProviderMiddleware(next http.Handler) http.Handler {
2423
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
25-
if !buildinfo.IsDev() {
26-
httpapi.Write(r.Context(), rw, http.StatusForbidden, codersdk.Response{
27-
Message: "OAuth2 provider is under development.",
28-
})
29-
return
30-
}
31-
3224
api.entitlementsMu.RLock()
3325
entitled := api.entitlements.Features[codersdk.FeatureOAuth2Provider].Entitlement != codersdk.EntitlementNotEntitled
3426
api.entitlementsMu.RUnlock()

site/src/pages/DeploySettingsPage/Sidebar.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Globe from "@mui/icons-material/PublicOutlined";
77
import HubOutlinedIcon from "@mui/icons-material/HubOutlined";
88
import VpnKeyOutlined from "@mui/icons-material/VpnKeyOutlined";
99
import MonitorHeartOutlined from "@mui/icons-material/MonitorHeartOutlined";
10-
// import Token from "@mui/icons-material/Token";
10+
import Token from "@mui/icons-material/Token";
1111
import { type FC } from "react";
1212
import { GitIcon } from "components/Icons/GitIcon";
1313
import {
@@ -33,10 +33,9 @@ export const Sidebar: FC = () => {
3333
<SidebarNavItem href="external-auth" icon={GitIcon}>
3434
External Authentication
3535
</SidebarNavItem>
36-
{/* Not exposing this yet since token exchange is not finished yet.
3736
<SidebarNavItem href="oauth2-provider/apps" icon={Token}>
3837
OAuth2 Applications
39-
</SidebarNavItem>*/}
38+
</SidebarNavItem>
4039
<SidebarNavItem href="network" icon={Globe}>
4140
Network
4241
</SidebarNavItem>

site/src/pages/UserSettingsPage/Sidebar.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import AccountIcon from "@mui/icons-material/Person";
55
import AppearanceIcon from "@mui/icons-material/Brush";
66
import ScheduleIcon from "@mui/icons-material/EditCalendarOutlined";
77
import SecurityIcon from "@mui/icons-material/LockOutlined";
8+
import Token from "@mui/icons-material/Token";
89
import type { User } from "api/typesGenerated";
910
import { UserAvatar } from "components/UserAvatar/UserAvatar";
1011
import {
@@ -23,6 +24,7 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
2324
const { entitlements } = useDashboard();
2425
const showSchedulePage =
2526
entitlements.features.advanced_template_scheduling.enabled;
27+
const showOAuth2Page = entitlements.features.oauth2_provider.enabled;
2628

2729
return (
2830
<BaseSidebar>
@@ -53,6 +55,11 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
5355
<SidebarNavItem href="external-auth" icon={GitIcon}>
5456
External Authentication
5557
</SidebarNavItem>
58+
{showOAuth2Page && (
59+
<SidebarNavItem href="oauth2-provider" icon={Token}>
60+
OAuth2 Applications
61+
</SidebarNavItem>
62+
)}
5663
<SidebarNavItem href="tokens" icon={VpnKeyOutlined}>
5764
Tokens
5865
</SidebarNavItem>

0 commit comments

Comments
 (0)