Enable OAuth2 provider management

code-asher · code-asher · commit 4b796e57993c · 2024-01-19T20:21:47.000-09:00
diff --git a/enterprise/coderd/oauth2.go b/enterprise/coderd/oauth2.go
@@ -9,7 +9,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"
@@ -22,13 +21,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
@@ -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 = () => {
       <SidebarNavItem href="external-auth" icon={GitIcon}>
         External Authentication
       </SidebarNavItem>
-      {/* Not exposing this yet since token exchange is not finished yet.
       <SidebarNavItem href="oauth2-provider/apps" icon={Token}>
         OAuth2 Applications
-      </SidebarNavItem>*/}
+      </SidebarNavItem>
       <SidebarNavItem href="network" icon={Globe}>
         Network
       </SidebarNavItem>
diff --git 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<SidebarProps> = ({ user }) => {
   const { entitlements } = useDashboard();
   const showSchedulePage =
     entitlements.features.advanced_template_scheduling.enabled;
+  const showOAuth2Page = entitlements.features.oauth2_provider.enabled;
 
   return (
     <BaseSidebar>
@@ -53,6 +55,11 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
       <SidebarNavItem href="external-auth" icon={GitIcon}>
         External Authentication
       </SidebarNavItem>
+      {showOAuth2Page && (
+        <SidebarNavItem href="oauth2-provider" icon={Token}>
+          OAuth2 Applications
+        </SidebarNavItem>
+      )}
       <SidebarNavItem href="tokens" icon={VpnKeyOutlined}>
         Tokens
       </SidebarNavItem>
