feat: add provider_type field to oauth_proxy_providers table (#1016)

walker-tx · web-flow · commit 85538738c73b · 2025-12-08T11:58:50.000-06:00
Additionally - generates diff/migration and then updates server code so
it can build now that some fields are nullable.
diff --git a/server/database/schema.sql b/server/database/schema.sql
@@ -570,10 +570,13 @@ CREATE TABLE IF NOT EXISTS oauth_proxy_providers (
   id uuid NOT NULL DEFAULT generate_uuidv7(),
   project_id uuid NOT NULL,
   oauth_proxy_server_id uuid NOT NULL,
-
   slug TEXT NOT NULL CHECK (slug <> '' AND CHAR_LENGTH(slug) <= 100),
-  authorization_endpoint TEXT NOT NULL,
-  token_endpoint TEXT NOT NULL,
+
+  -- provider type: 'custom', 'gram', etc.
+  provider_type TEXT NOT NULL DEFAULT 'custom',
+
+  authorization_endpoint TEXT,
+  token_endpoint TEXT,
   registration_endpoint TEXT,
 
   -- OAuth server capabilities
diff --git a/server/internal/database/models.go b/server/internal/database/models.go
diff --git a/server/internal/mv/toolset.go b/server/internal/mv/toolset.go
@@ -429,8 +429,8 @@ func DescribeToolset(
 				providers = append(providers, &types.OAuthProxyProvider{
 					ID:                                provider.ID.String(),
 					Slug:                              types.Slug(provider.Slug),
-					AuthorizationEndpoint:             provider.AuthorizationEndpoint,
-					TokenEndpoint:                     provider.TokenEndpoint,
+					AuthorizationEndpoint:             provider.AuthorizationEndpoint.String,
+					TokenEndpoint:                     provider.TokenEndpoint.String,
 					ScopesSupported:                   provider.ScopesSupported,
 					GrantTypesSupported:               provider.GrantTypesSupported,
 					TokenEndpointAuthMethodsSupported: provider.TokenEndpointAuthMethodsSupported,
diff --git a/server/internal/oauth/impl.go b/server/internal/oauth/impl.go
@@ -260,7 +260,7 @@ func (s *Service) handleAuthorize(w http.ResponseWriter, r *http.Request) error
 
 	callbackURL := fmt.Sprintf("%s/oauth/callback", s.serverURL.String())
 
-	authURL, err := url.Parse(provider.AuthorizationEndpoint)
+	authURL, err := url.Parse(provider.AuthorizationEndpoint.String)
 	if err != nil {
 		return oops.E(oops.CodeUnexpected, err, "failed to parse OAuth authorization URL").Log(ctx, s.logger)
 	}
@@ -472,7 +472,7 @@ func (s *Service) handleAuthorizationCallback(w http.ResponseWriter, r *http.Req
 
 	callbackURL := fmt.Sprintf("%s/oauth/callback", s.serverURL.String())
 
-	tokenURL := provider.TokenEndpoint
+	tokenURL := provider.TokenEndpoint.String
 	tokenData := url.Values{}
 	tokenData.Set("grant_type", "authorization_code")
 	tokenData.Set("redirect_uri", callbackURL)
diff --git a/server/internal/oauth/repo/models.go b/server/internal/oauth/repo/models.go
diff --git a/server/internal/oauth/repo/queries.sql.go b/server/internal/oauth/repo/queries.sql.go
diff --git a/server/internal/toolsets/impl.go b/server/internal/toolsets/impl.go
@@ -701,8 +701,8 @@ func (s *Service) AddOAuthProxyServer(ctx context.Context, payload *gen.AddOAuth
 		ProjectID:                         *authCtx.ProjectID,
 		OauthProxyServerID:                oauthProxyServer.ID,
 		Slug:                              conv.ToLower(payload.OauthProxyServer.Slug),
-		AuthorizationEndpoint:             payload.OauthProxyServer.AuthorizationEndpoint,
-		TokenEndpoint:                     payload.OauthProxyServer.TokenEndpoint,
+		AuthorizationEndpoint:             conv.ToPGTextEmpty(payload.OauthProxyServer.AuthorizationEndpoint),
+		TokenEndpoint:                     conv.ToPGTextEmpty(payload.OauthProxyServer.TokenEndpoint),
 		RegistrationEndpoint:              conv.PtrToPGText(nil),
 		ScopesSupported:                   payload.OauthProxyServer.ScopesSupported,
 		ResponseTypesSupported:            []string{"code"},
diff --git a/server/migrations/20251208165035_static-oauth-proxy-providers.sql b/server/migrations/20251208165035_static-oauth-proxy-providers.sql
@@ -0,0 +1,2 @@
+-- Modify "oauth_proxy_providers" table
+ALTER TABLE "oauth_proxy_providers" ALTER COLUMN "authorization_endpoint" DROP NOT NULL, ALTER COLUMN "token_endpoint" DROP NOT NULL, ADD COLUMN "provider_type" text NOT NULL DEFAULT 'custom';
diff --git a/server/migrations/atlas.sum b/server/migrations/atlas.sum
@@ -1,4 +1,4 @@
-h1:AJ7aQqZIcGgewUmN5QncCJkrlkyWmDjEeD0h8+Wli+E=
+h1:EjhB4E996pJlUKO6QO2lalqjbP03NxSL8w4htf4RwNo=
 20250502122425_initial-tables.sql h1:Hu3O60/bB4fjZpUay8FzyOjw6vngp087zU+U/wVKn7k=
 20250502130852_initial-indexes.sql h1:oYbnwi9y9PPTqu7uVbSPSALhCY8XF3rv03nDfG4b7mo=
 20250502154250_relax-http-security-fields.sql h1:0+OYIDq7IHmx7CP5BChVwfpF2rOSrRDxnqawXio2EVo=
@@ -77,3 +77,4 @@ h1:AJ7aQqZIcGgewUmN5QncCJkrlkyWmDjEeD0h8+Wli+E=
 20251126021621_add-auth-input-to-function-resource.sql h1:2vSYx5xIklau99YBK1h/Ipb0dAmR+KUqJlJlwEY5qRc=
 20251128143912_add-instructions-to-mcp-metadata.sql h1:WgeMPuB4wXz1c4mhf4+ZoTwtPfZ0NkTQBTXW3s4L8CE=
 20251202182959_agent-execution-table.sql h1:q2PyP6iOoBAkQC0pgAFPre5+Amk3Kal7Mc2Twbni0gg=
+20251208165035_static-oauth-proxy-providers.sql h1:zujMl7j65KUuVit7bS6766+uKR83F76NK9eHW8zBT1U=

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- Modify "oauth_proxy_providers" table`
	`2`	`+ALTER TABLE "oauth_proxy_providers" ALTER COLUMN "authorization_endpoint" DROP NOT NULL, ALTER COLUMN "token_endpoint" DROP NOT NULL, ADD COLUMN "provider_type" text NOT NULL DEFAULT 'custom';`