diff --git a/routers/api/v1/admin/auth_oauth.go b/routers/api/v1/admin/auth_oauth.go index 2613f54962..8d03e5e961 100644 --- a/routers/api/v1/admin/auth_oauth.go +++ b/routers/api/v1/admin/auth_oauth.go @@ -58,13 +58,18 @@ func CreateOauthAuth(ctx *context.APIContext) { GroupTeamMapRemoval: form.RemoveUsersFromSyncronizedTeams, } - auth_model.CreateSource(ctx, &auth_model.Source{ + createErr := auth_model.CreateSource(ctx, &auth_model.Source{ Type: auth_model.OAuth2, Name: form.AuthenticationName, IsActive: true, Cfg: config, }) + if createErr != nil { + ctx.APIErrorInternal(createErr) + return + } + ctx.Status(http.StatusCreated) } @@ -74,14 +79,13 @@ func EditOauthAuth(ctx *context.APIContext) { // DeleteOauthAuth api for deleting a authentication method func DeleteOauthAuth(ctx *context.APIContext) { - oauthIdString := ctx.PathParam("id") - oauthID, oauthIdErr := strconv.Atoi(oauthIdString) - if oauthIdErr != nil { - ctx.APIErrorInternal(oauthIdErr) + oauthIDString := ctx.PathParam("id") + oauthID, oauthIDErr := strconv.Atoi(oauthIDString) + if oauthIDErr != nil { + ctx.APIErrorInternal(oauthIDErr) } err := auth_model.DeleteSource(ctx, int64(oauthID)) - if err != nil { ctx.APIErrorInternal(err) return @@ -95,8 +99,6 @@ func SearchOauthAuth(ctx *context.APIContext) { listOptions := utils.GetListOptions(ctx) authSources, maxResults, err := db.FindAndCount[auth_model.Source](ctx, auth_model.FindSourcesOptions{}) - // fmt.Printf("Count: %d, models: %v, err: %v", count, models[0].Name, err) - if err != nil { ctx.APIErrorInternal(err) return diff --git a/services/convert/auth_oauth.go b/services/convert/auth_oauth.go index a86c0fc9a7..e76fbd1e31 100644 --- a/services/convert/auth_oauth.go +++ b/services/convert/auth_oauth.go @@ -17,7 +17,7 @@ func ToOauthProvider(ctx context.Context, provider *auth_model.Source) *api.Auth return nil } - return toOauthProvider(ctx, provider) + return toOauthProvider(provider) } // ToUsers convert list of user_model.User to list of api.User @@ -29,7 +29,7 @@ func ToOauthProviders(ctx context.Context, provider []*auth_model.Source) []*api return result } -func toOauthProvider(ctx context.Context, provider *auth_model.Source) *api.AuthOauth2Option { +func toOauthProvider(provider *auth_model.Source) *api.AuthOauth2Option { return &api.AuthOauth2Option{ ID: provider.ID, AuthenticationName: provider.Name,