Skip to content

Commit 5a0e3a8

Browse files
committed
refactor: remove unncessary oidc test handler
1 parent d95a5f4 commit 5a0e3a8

File tree

3 files changed

+10
-15
lines changed

3 files changed

+10
-15
lines changed

cmd/handlers.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ func initHandlers(g *fastglue.Fastglue, hub *ws.Hub) {
3737
g.GET("/api/v1/oidc/enabled", handleGetAllEnabledOIDC)
3838
g.GET("/api/v1/oidc", perm(handleGetAllOIDC, "oidc:manage"))
3939
g.POST("/api/v1/oidc", perm(handleCreateOIDC, "oidc:manage"))
40-
g.POST("/api/v1/oidc/test", perm(handleTestOIDC, "oidc:manage"))
4140
g.GET("/api/v1/oidc/{id}", perm(handleGetOIDC, "oidc:manage"))
4241
g.PUT("/api/v1/oidc/{id}", perm(handleUpdateOIDC, "oidc:manage"))
4342
g.DELETE("/api/v1/oidc/{id}", perm(handleDeleteOIDC, "oidc:manage"))

cmd/oidc.go

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,6 @@ func handleGetOIDC(r *fastglue.Request) error {
5050
return r.SendEnvelope(o)
5151
}
5252

53-
// handleTestOIDC tests an OIDC provider URL by doing a discovery on the provider URL.
54-
func handleTestOIDC(r *fastglue.Request) error {
55-
var (
56-
app = r.Context.(*App)
57-
providerURL = string(r.RequestCtx.PostArgs().Peek("provider_url"))
58-
)
59-
if err := app.auth.TestProvider(providerURL); err != nil {
60-
return sendErrorEnvelope(r, err)
61-
}
62-
return r.SendEnvelope(true)
63-
}
64-
6553
// handleCreateOIDC creates a new OIDC record.
6654
func handleCreateOIDC(r *fastglue.Request) error {
6755
var (
@@ -72,6 +60,11 @@ func handleCreateOIDC(r *fastglue.Request) error {
7260
return r.SendErrorEnvelope(fasthttp.StatusBadRequest, app.i18n.Ts("globals.messages.errorParsing", "name", "{globals.terms.request}"), nil, envelope.GeneralError)
7361
}
7462

63+
// Test OIDC provider URL by performing a discovery.
64+
if err := app.auth.TestProvider(req.ProviderURL); err != nil {
65+
return sendErrorEnvelope(r, err)
66+
}
67+
7568
if err := app.oidc.Create(req); err != nil {
7669
return sendErrorEnvelope(r, err)
7770
}
@@ -98,6 +91,11 @@ func handleUpdateOIDC(r *fastglue.Request) error {
9891
return r.SendErrorEnvelope(fasthttp.StatusBadRequest, app.i18n.Ts("globals.messages.errorParsing", "name", "{globals.terms.request}"), nil, envelope.GeneralError)
9992
}
10093

94+
// Test OIDC provider URL by performing a discovery.
95+
if err := app.auth.TestProvider(req.ProviderURL); err != nil {
96+
return sendErrorEnvelope(r, err)
97+
}
98+
10199
if err = app.oidc.Update(id, req); err != nil {
102100
return sendErrorEnvelope(r, err)
103101
}

frontend/src/api/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ const createOIDC = (data) =>
113113
'Content-Type': 'application/json'
114114
}
115115
})
116-
const testOIDC = (data) => http.post('/api/v1/oidc/test', data)
117116
const getAllEnabledOIDC = () => http.get('/api/v1/oidc/enabled')
118117
const getAllOIDC = () => http.get('/api/v1/oidc')
119118
const getOIDC = (id) => http.get(`/api/v1/oidc/${id}`)
@@ -408,7 +407,6 @@ export default {
408407
getAllEnabledOIDC,
409408
getOIDC,
410409
updateOIDC,
411-
testOIDC,
412410
deleteOIDC,
413411
getTemplate,
414412
getTemplates,

0 commit comments

Comments
 (0)