Commitd296fe4

committed

Enable OAuth2 provider management

1 parent39ea464 commitd296fe4Copy full SHA for d296fe4

File tree

-11

lines changed

enterprise/coderd
- oauth2.go
site/src/pages
- DeploySettingsPage
  - Sidebar.tsx
- UserSettingsPage
  - Sidebar.tsx

-11

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/google/uuid"`
`8`	`8`
`9`		`-"github.com/coder/coder/v2/buildinfo"`
`10`	`9`	`"github.com/coder/coder/v2/coderd/database"`
`11`	`10`	`"github.com/coder/coder/v2/coderd/database/db2sdk"`
`12`	`11`	`"github.com/coder/coder/v2/coderd/database/dbtime"`
`@@ -19,13 +18,6 @@ import (`
`19`	`18`
`20`	`19`	`func (api*API)oAuth2ProviderMiddleware(next http.Handler) http.Handler {`
`21`	`20`	`returnhttp.HandlerFunc(func(rw http.ResponseWriter,r*http.Request) {`
`22`		`-if!buildinfo.IsDev() {`
`23`		`-httpapi.Write(r.Context(),rw,http.StatusForbidden, codersdk.Response{`
`24`		`-Message:"OAuth2 provider is under development.",`
`25`		`-})`
`26`		`-return`
`27`		`-}`
`28`		`-`
`29`	`21`	`api.entitlementsMu.RLock()`
`30`	`22`	`entitled:=api.entitlements.Features[codersdk.FeatureOAuth2Provider].Entitlement!=codersdk.EntitlementNotEntitled`
`31`	`23`	`api.entitlementsMu.RUnlock()`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import Globe from "@mui/icons-material/PublicOutlined";`
`7`	`7`	`importHubOutlinedIconfrom"@mui/icons-material/HubOutlined";`
`8`	`8`	`importVpnKeyOutlinedfrom"@mui/icons-material/VpnKeyOutlined";`
`9`	`9`	`importMonitorHeartOutlinedfrom"@mui/icons-material/MonitorHeartOutlined";`
`10`		`-//import Token from "@mui/icons-material/Token";`
	`10`	`+importTokenfrom"@mui/icons-material/Token";`
`11`	`11`	`import{typeFC}from"react";`
`12`	`12`	`import{GitIcon}from"components/Icons/GitIcon";`
`13`	`13`	`import{`
`@@ -33,10 +33,9 @@ export const Sidebar: FC = () => {`
`33`	`33`	`<SidebarNavItemhref="external-auth"icon={GitIcon}>`
`34`	`34`	`External Authentication`
`35`	`35`	`</SidebarNavItem>`
`36`		`-{/* Not exposing this yet since token exchange is not finished yet.`
`37`	`36`	`<SidebarNavItemhref="oauth2-provider/apps"icon={Token}>`
`38`	`37`	`OAuth2 Applications`
`39`		`- </SidebarNavItem>*/}`
	`38`	`+</SidebarNavItem>`
`40`	`39`	`<SidebarNavItemhref="network"icon={Globe}>`
`41`	`40`	`Network`
`42`	`41`	`</SidebarNavItem>`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import AccountIcon from "@mui/icons-material/Person";`
`5`	`5`	`importAppearanceIconfrom"@mui/icons-material/Brush";`
`6`	`6`	`importScheduleIconfrom"@mui/icons-material/EditCalendarOutlined";`
`7`	`7`	`importSecurityIconfrom"@mui/icons-material/LockOutlined";`
	`8`	`+importTokenfrom"@mui/icons-material/Token";`
`8`	`9`	`importtype{User}from"api/typesGenerated";`
`9`	`10`	`import{UserAvatar}from"components/UserAvatar/UserAvatar";`
`10`	`11`	`import{`
`@@ -23,6 +24,7 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {`
`23`	`24`	`const{ entitlements}=useDashboard();`
`24`	`25`	`constshowSchedulePage=`
`25`	`26`	`entitlements.features.advanced_template_scheduling.enabled;`
	`27`	`+constshowOAuth2Page=entitlements.features.oauth2_provider.enabled;`
`26`	`28`
`27`	`29`	`return(`
`28`	`30`	`<BaseSidebar>`
`@@ -42,6 +44,11 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {`
`42`	`44`	`<SidebarNavItemhref="external-auth"icon={GitIcon}>`
`43`	`45`	`External Authentication`
`44`	`46`	`</SidebarNavItem>`
	`47`	`+{showOAuth2Page&&(`
	`48`	`+<SidebarNavItemhref="oauth2-provider"icon={Token}>`
	`49`	`+ OAuth2 Applications`
	`50`	`+</SidebarNavItem>`
	`51`	`+)}`
`45`	`52`	`{showSchedulePage&&(`
`46`	`53`	`<SidebarNavItemhref="schedule"icon={ScheduleIcon}>`
`47`	`54`	`Schedule`

Comments

(0)