Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/start/start.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,15 @@ EOF
}
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))

// OAuth server configuration
if utils.Config.Auth.OAuthServer.Enabled {
env = append(env,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ENABLED=%v", utils.Config.Auth.OAuthServer.Enabled),
"GOTRUE_OAUTH_SERVER_AUTHORIZATION_PATH="+utils.Config.Auth.OAuthServer.AuthorizationUrlPath,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ALLOW_DYNAMIC_REGISTRATION=%v", utils.Config.Auth.OAuthServer.AllowDynamicRegistration),
)
}

if _, err := utils.DockerStart(
ctx,
container.Config{
Expand Down
39 changes: 30 additions & 9 deletions pkg/config/auth.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,15 +162,16 @@ type (
SigningKeysPath string `toml:"signing_keys_path"`
SigningKeys []JWK `toml:"-"`

RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
OAuthServer OAuthServer `toml:"oauth_server"`

// Custom secrets can be injected from .env file
PublishableKey Secret `toml:"publishable_key"`
Expand DownExpand Up@@ -368,6 +369,12 @@ type (
Solana solana `toml:"solana"`
Ethereum ethereum `toml:"ethereum"`
}

OAuthServer struct {
Enabled bool `toml:"enabled"`
AllowDynamicRegistration bool `toml:"allow_dynamic_registration"`
AuthorizationUrlPath string `toml:"authorization_url_path"`
}
)

func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
Expand DownExpand Up@@ -399,6 +406,7 @@ func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
a.Sms.toAuthConfigBody(&body)
a.External.toAuthConfigBody(&body)
a.Web3.toAuthConfigBody(&body)
a.OAuthServer.toAuthConfigBody(&body)
return body
}

Expand DownExpand Up@@ -426,6 +434,7 @@ func (a *auth) FromRemoteAuthConfig(remoteConfig v1API.AuthConfigResponse) {
a.Sms.fromAuthConfig(remoteConfig)
a.External.fromAuthConfig(remoteConfig)
a.Web3.fromAuthConfig(remoteConfig)
a.OAuthServer.fromAuthConfig(remoteConfig)
}

func (r rateLimit) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
Expand DownExpand Up@@ -1338,6 +1347,18 @@ func (w *web3) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
}
}

func (o OAuthServer) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (o *OAuthServer) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (a *auth) DiffWithRemote(remoteConfig v1API.AuthConfigResponse, filter ...func(string) bool) ([]byte, error) {
copy := a.Clone()
copy.FromRemoteAuthConfig(remoteConfig)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/templates/Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ FROM darthsim/imgproxy:v3.8.0 AS imgproxy
FROM supabase/edge-runtime:v1.69.12 AS edgeruntime
FROM timberio/vector:0.28.1-alpine AS vector
FROM supabase/supavisor:2.7.0 AS supavisor
FROM supabase/gotrue:v2.179.0 AS gotrue
FROM supabase/gotrue:v2.180.0 AS gotrue
FROM supabase/realtime:v2.51.3 AS realtime
FROM supabase/storage-api:v1.27.4 AS storage
FROM supabase/logflare:1.22.3 AS logflare
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/templates/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,15 @@ enabled = false
# Obtain from https://clerk.com/setup/supabase
# domain = "example.clerk.accounts.dev"

# OAuth server configuration
[auth.oauth_server]
Comment thread
sweatybridge marked this conversation as resolved.
# Enable OAuth server functionality
enabled = false
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = false

[edge_runtime]
enabled = true
# Supported request policies: `oneshot`, `per_worker`.
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/testdata/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,15 @@ minimum_password_length = 6
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
password_requirements = ""

# OAuth server configuration
[auth.oauth_server]
# Enable OAuth server functionality
enabled = true
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = true

[auth.rate_limit]
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
email_sent = 2
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(auth): add OAuth server configuration support by cemalkilic · Pull Request #4207 · supabase/cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/start/start.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,15 @@ EOF
}
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))

// OAuth server configuration
if utils.Config.Auth.OAuthServer.Enabled {
env = append(env,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ENABLED=%v", utils.Config.Auth.OAuthServer.Enabled),
"GOTRUE_OAUTH_SERVER_AUTHORIZATION_PATH="+utils.Config.Auth.OAuthServer.AuthorizationUrlPath,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ALLOW_DYNAMIC_REGISTRATION=%v", utils.Config.Auth.OAuthServer.AllowDynamicRegistration),
)
}

if _, err := utils.DockerStart(
ctx,
container.Config{
Expand Down
39 changes: 30 additions & 9 deletions pkg/config/auth.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,15 +162,16 @@ type (
SigningKeysPath string `toml:"signing_keys_path"`
SigningKeys []JWK `toml:"-"`

RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
OAuthServer OAuthServer `toml:"oauth_server"`

// Custom secrets can be injected from .env file
PublishableKey Secret `toml:"publishable_key"`
Expand DownExpand Up@@ -368,6 +369,12 @@ type (
Solana solana `toml:"solana"`
Ethereum ethereum `toml:"ethereum"`
}

OAuthServer struct {
Enabled bool `toml:"enabled"`
AllowDynamicRegistration bool `toml:"allow_dynamic_registration"`
AuthorizationUrlPath string `toml:"authorization_url_path"`
}
)

func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
Expand DownExpand Up@@ -399,6 +406,7 @@ func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
a.Sms.toAuthConfigBody(&body)
a.External.toAuthConfigBody(&body)
a.Web3.toAuthConfigBody(&body)
a.OAuthServer.toAuthConfigBody(&body)
return body
}

Expand DownExpand Up@@ -426,6 +434,7 @@ func (a *auth) FromRemoteAuthConfig(remoteConfig v1API.AuthConfigResponse) {
a.Sms.fromAuthConfig(remoteConfig)
a.External.fromAuthConfig(remoteConfig)
a.Web3.fromAuthConfig(remoteConfig)
a.OAuthServer.fromAuthConfig(remoteConfig)
}

func (r rateLimit) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
Expand DownExpand Up@@ -1338,6 +1347,18 @@ func (w *web3) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
}
}

func (o OAuthServer) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (o *OAuthServer) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (a *auth) DiffWithRemote(remoteConfig v1API.AuthConfigResponse, filter ...func(string) bool) ([]byte, error) {
copy := a.Clone()
copy.FromRemoteAuthConfig(remoteConfig)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/templates/Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ FROM darthsim/imgproxy:v3.8.0 AS imgproxy
FROM supabase/edge-runtime:v1.69.12 AS edgeruntime
FROM timberio/vector:0.28.1-alpine AS vector
FROM supabase/supavisor:2.7.0 AS supavisor
FROM supabase/gotrue:v2.179.0 AS gotrue
FROM supabase/gotrue:v2.180.0 AS gotrue
FROM supabase/realtime:v2.51.3 AS realtime
FROM supabase/storage-api:v1.27.4 AS storage
FROM supabase/logflare:1.22.3 AS logflare
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/templates/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,15 @@ enabled = false
# Obtain from https://clerk.com/setup/supabase
# domain = "example.clerk.accounts.dev"

# OAuth server configuration
[auth.oauth_server]
Comment thread
sweatybridge marked this conversation as resolved.
# Enable OAuth server functionality
enabled = false
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = false

[edge_runtime]
enabled = true
# Supported request policies: `oneshot`, `per_worker`.
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/testdata/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,15 @@ minimum_password_length = 6
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
password_requirements = ""

# OAuth server configuration
[auth.oauth_server]
# Enable OAuth server functionality
enabled = true
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = true

[auth.rate_limit]
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
email_sent = 2
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(auth): add OAuth server configuration support by cemalkilic · Pull Request #4207 · supabase/cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/start/start.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,15 @@ EOF
}
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))

// OAuth server configuration
if utils.Config.Auth.OAuthServer.Enabled {
env = append(env,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ENABLED=%v", utils.Config.Auth.OAuthServer.Enabled),
"GOTRUE_OAUTH_SERVER_AUTHORIZATION_PATH="+utils.Config.Auth.OAuthServer.AuthorizationUrlPath,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ALLOW_DYNAMIC_REGISTRATION=%v", utils.Config.Auth.OAuthServer.AllowDynamicRegistration),
)
}

if _, err := utils.DockerStart(
ctx,
container.Config{
Expand Down
39 changes: 30 additions & 9 deletions pkg/config/auth.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,15 +162,16 @@ type (
SigningKeysPath string `toml:"signing_keys_path"`
SigningKeys []JWK `toml:"-"`

RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
OAuthServer OAuthServer `toml:"oauth_server"`

// Custom secrets can be injected from .env file
PublishableKey Secret `toml:"publishable_key"`
Expand DownExpand Up@@ -368,6 +369,12 @@ type (
Solana solana `toml:"solana"`
Ethereum ethereum `toml:"ethereum"`
}

OAuthServer struct {
Enabled bool `toml:"enabled"`
AllowDynamicRegistration bool `toml:"allow_dynamic_registration"`
AuthorizationUrlPath string `toml:"authorization_url_path"`
}
)

func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
Expand DownExpand Up@@ -399,6 +406,7 @@ func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
a.Sms.toAuthConfigBody(&body)
a.External.toAuthConfigBody(&body)
a.Web3.toAuthConfigBody(&body)
a.OAuthServer.toAuthConfigBody(&body)
return body
}

Expand DownExpand Up@@ -426,6 +434,7 @@ func (a *auth) FromRemoteAuthConfig(remoteConfig v1API.AuthConfigResponse) {
a.Sms.fromAuthConfig(remoteConfig)
a.External.fromAuthConfig(remoteConfig)
a.Web3.fromAuthConfig(remoteConfig)
a.OAuthServer.fromAuthConfig(remoteConfig)
}

func (r rateLimit) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
Expand DownExpand Up@@ -1338,6 +1347,18 @@ func (w *web3) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
}
}

func (o OAuthServer) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (o *OAuthServer) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (a *auth) DiffWithRemote(remoteConfig v1API.AuthConfigResponse, filter ...func(string) bool) ([]byte, error) {
copy := a.Clone()
copy.FromRemoteAuthConfig(remoteConfig)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/templates/Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ FROM darthsim/imgproxy:v3.8.0 AS imgproxy
FROM supabase/edge-runtime:v1.69.12 AS edgeruntime
FROM timberio/vector:0.28.1-alpine AS vector
FROM supabase/supavisor:2.7.0 AS supavisor
FROM supabase/gotrue:v2.179.0 AS gotrue
FROM supabase/gotrue:v2.180.0 AS gotrue
FROM supabase/realtime:v2.51.3 AS realtime
FROM supabase/storage-api:v1.27.4 AS storage
FROM supabase/logflare:1.22.3 AS logflare
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/templates/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,15 @@ enabled = false
# Obtain from https://clerk.com/setup/supabase
# domain = "example.clerk.accounts.dev"

# OAuth server configuration
[auth.oauth_server]
Comment thread
sweatybridge marked this conversation as resolved.
# Enable OAuth server functionality
enabled = false
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = false

[edge_runtime]
enabled = true
# Supported request policies: `oneshot`, `per_worker`.
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/testdata/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,15 @@ minimum_password_length = 6
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
password_requirements = ""

# OAuth server configuration
[auth.oauth_server]
# Enable OAuth server functionality
enabled = true
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = true

[auth.rate_limit]
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
email_sent = 2
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(auth): add OAuth server configuration support by cemalkilic · Pull Request #4207 · supabase/cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/start/start.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,15 @@ EOF
}
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))

// OAuth server configuration
if utils.Config.Auth.OAuthServer.Enabled {
env = append(env,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ENABLED=%v", utils.Config.Auth.OAuthServer.Enabled),
"GOTRUE_OAUTH_SERVER_AUTHORIZATION_PATH="+utils.Config.Auth.OAuthServer.AuthorizationUrlPath,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ALLOW_DYNAMIC_REGISTRATION=%v", utils.Config.Auth.OAuthServer.AllowDynamicRegistration),
)
}

if _, err := utils.DockerStart(
ctx,
container.Config{
Expand Down
39 changes: 30 additions & 9 deletions pkg/config/auth.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,15 +162,16 @@ type (
SigningKeysPath string `toml:"signing_keys_path"`
SigningKeys []JWK `toml:"-"`

RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
OAuthServer OAuthServer `toml:"oauth_server"`

// Custom secrets can be injected from .env file
PublishableKey Secret `toml:"publishable_key"`
Expand DownExpand Up@@ -368,6 +369,12 @@ type (
Solana solana `toml:"solana"`
Ethereum ethereum `toml:"ethereum"`
}

OAuthServer struct {
Enabled bool `toml:"enabled"`
AllowDynamicRegistration bool `toml:"allow_dynamic_registration"`
AuthorizationUrlPath string `toml:"authorization_url_path"`
}
)

func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
Expand DownExpand Up@@ -399,6 +406,7 @@ func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
a.Sms.toAuthConfigBody(&body)
a.External.toAuthConfigBody(&body)
a.Web3.toAuthConfigBody(&body)
a.OAuthServer.toAuthConfigBody(&body)
return body
}

Expand DownExpand Up@@ -426,6 +434,7 @@ func (a *auth) FromRemoteAuthConfig(remoteConfig v1API.AuthConfigResponse) {
a.Sms.fromAuthConfig(remoteConfig)
a.External.fromAuthConfig(remoteConfig)
a.Web3.fromAuthConfig(remoteConfig)
a.OAuthServer.fromAuthConfig(remoteConfig)
}

func (r rateLimit) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
Expand DownExpand Up@@ -1338,6 +1347,18 @@ func (w *web3) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
}
}

func (o OAuthServer) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (o *OAuthServer) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (a *auth) DiffWithRemote(remoteConfig v1API.AuthConfigResponse, filter ...func(string) bool) ([]byte, error) {
copy := a.Clone()
copy.FromRemoteAuthConfig(remoteConfig)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/templates/Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ FROM darthsim/imgproxy:v3.8.0 AS imgproxy
FROM supabase/edge-runtime:v1.69.12 AS edgeruntime
FROM timberio/vector:0.28.1-alpine AS vector
FROM supabase/supavisor:2.7.0 AS supavisor
FROM supabase/gotrue:v2.179.0 AS gotrue
FROM supabase/gotrue:v2.180.0 AS gotrue
FROM supabase/realtime:v2.51.3 AS realtime
FROM supabase/storage-api:v1.27.4 AS storage
FROM supabase/logflare:1.22.3 AS logflare
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/templates/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,15 @@ enabled = false
# Obtain from https://clerk.com/setup/supabase
# domain = "example.clerk.accounts.dev"

# OAuth server configuration
[auth.oauth_server]
Comment thread
sweatybridge marked this conversation as resolved.
# Enable OAuth server functionality
enabled = false
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = false

[edge_runtime]
enabled = true
# Supported request policies: `oneshot`, `per_worker`.
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/testdata/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,15 @@ minimum_password_length = 6
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
password_requirements = ""

# OAuth server configuration
[auth.oauth_server]
# Enable OAuth server functionality
enabled = true
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = true

[auth.rate_limit]
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
email_sent = 2
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(auth): add OAuth server configuration support by cemalkilic · Pull Request #4207 · supabase/cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/start/start.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,15 @@ EOF
}
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))

// OAuth server configuration
if utils.Config.Auth.OAuthServer.Enabled {
env = append(env,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ENABLED=%v", utils.Config.Auth.OAuthServer.Enabled),
"GOTRUE_OAUTH_SERVER_AUTHORIZATION_PATH="+utils.Config.Auth.OAuthServer.AuthorizationUrlPath,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ALLOW_DYNAMIC_REGISTRATION=%v", utils.Config.Auth.OAuthServer.AllowDynamicRegistration),
)
}

if _, err := utils.DockerStart(
ctx,
container.Config{
Expand Down
39 changes: 30 additions & 9 deletions pkg/config/auth.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,15 +162,16 @@ type (
SigningKeysPath string `toml:"signing_keys_path"`
SigningKeys []JWK `toml:"-"`

RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
OAuthServer OAuthServer `toml:"oauth_server"`

// Custom secrets can be injected from .env file
PublishableKey Secret `toml:"publishable_key"`
Expand DownExpand Up@@ -368,6 +369,12 @@ type (
Solana solana `toml:"solana"`
Ethereum ethereum `toml:"ethereum"`
}

OAuthServer struct {
Enabled bool `toml:"enabled"`
AllowDynamicRegistration bool `toml:"allow_dynamic_registration"`
AuthorizationUrlPath string `toml:"authorization_url_path"`
}
)

func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
Expand DownExpand Up@@ -399,6 +406,7 @@ func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
a.Sms.toAuthConfigBody(&body)
a.External.toAuthConfigBody(&body)
a.Web3.toAuthConfigBody(&body)
a.OAuthServer.toAuthConfigBody(&body)
return body
}

Expand DownExpand Up@@ -426,6 +434,7 @@ func (a *auth) FromRemoteAuthConfig(remoteConfig v1API.AuthConfigResponse) {
a.Sms.fromAuthConfig(remoteConfig)
a.External.fromAuthConfig(remoteConfig)
a.Web3.fromAuthConfig(remoteConfig)
a.OAuthServer.fromAuthConfig(remoteConfig)
}

func (r rateLimit) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
Expand DownExpand Up@@ -1338,6 +1347,18 @@ func (w *web3) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
}
}

func (o OAuthServer) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (o *OAuthServer) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (a *auth) DiffWithRemote(remoteConfig v1API.AuthConfigResponse, filter ...func(string) bool) ([]byte, error) {
copy := a.Clone()
copy.FromRemoteAuthConfig(remoteConfig)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/templates/Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ FROM darthsim/imgproxy:v3.8.0 AS imgproxy
FROM supabase/edge-runtime:v1.69.12 AS edgeruntime
FROM timberio/vector:0.28.1-alpine AS vector
FROM supabase/supavisor:2.7.0 AS supavisor
FROM supabase/gotrue:v2.179.0 AS gotrue
FROM supabase/gotrue:v2.180.0 AS gotrue
FROM supabase/realtime:v2.51.3 AS realtime
FROM supabase/storage-api:v1.27.4 AS storage
FROM supabase/logflare:1.22.3 AS logflare
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/templates/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,15 @@ enabled = false
# Obtain from https://clerk.com/setup/supabase
# domain = "example.clerk.accounts.dev"

# OAuth server configuration
[auth.oauth_server]
Comment thread
sweatybridge marked this conversation as resolved.
# Enable OAuth server functionality
enabled = false
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = false

[edge_runtime]
enabled = true
# Supported request policies: `oneshot`, `per_worker`.
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/testdata/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,15 @@ minimum_password_length = 6
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
password_requirements = ""

# OAuth server configuration
[auth.oauth_server]
# Enable OAuth server functionality
enabled = true
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = true

[auth.rate_limit]
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
email_sent = 2
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(auth): add OAuth server configuration support by cemalkilic · Pull Request #4207 · supabase/cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/start/start.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,15 @@ EOF
}
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))

// OAuth server configuration
if utils.Config.Auth.OAuthServer.Enabled {
env = append(env,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ENABLED=%v", utils.Config.Auth.OAuthServer.Enabled),
"GOTRUE_OAUTH_SERVER_AUTHORIZATION_PATH="+utils.Config.Auth.OAuthServer.AuthorizationUrlPath,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ALLOW_DYNAMIC_REGISTRATION=%v", utils.Config.Auth.OAuthServer.AllowDynamicRegistration),
)
}

if _, err := utils.DockerStart(
ctx,
container.Config{
Expand Down
39 changes: 30 additions & 9 deletions pkg/config/auth.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,15 +162,16 @@ type (
SigningKeysPath string `toml:"signing_keys_path"`
SigningKeys []JWK `toml:"-"`

RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
OAuthServer OAuthServer `toml:"oauth_server"`

// Custom secrets can be injected from .env file
PublishableKey Secret `toml:"publishable_key"`
Expand DownExpand Up@@ -368,6 +369,12 @@ type (
Solana solana `toml:"solana"`
Ethereum ethereum `toml:"ethereum"`
}

OAuthServer struct {
Enabled bool `toml:"enabled"`
AllowDynamicRegistration bool `toml:"allow_dynamic_registration"`
AuthorizationUrlPath string `toml:"authorization_url_path"`
}
)

func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
Expand DownExpand Up@@ -399,6 +406,7 @@ func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
a.Sms.toAuthConfigBody(&body)
a.External.toAuthConfigBody(&body)
a.Web3.toAuthConfigBody(&body)
a.OAuthServer.toAuthConfigBody(&body)
return body
}

Expand DownExpand Up@@ -426,6 +434,7 @@ func (a *auth) FromRemoteAuthConfig(remoteConfig v1API.AuthConfigResponse) {
a.Sms.fromAuthConfig(remoteConfig)
a.External.fromAuthConfig(remoteConfig)
a.Web3.fromAuthConfig(remoteConfig)
a.OAuthServer.fromAuthConfig(remoteConfig)
}

func (r rateLimit) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
Expand DownExpand Up@@ -1338,6 +1347,18 @@ func (w *web3) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
}
}

func (o OAuthServer) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (o *OAuthServer) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (a *auth) DiffWithRemote(remoteConfig v1API.AuthConfigResponse, filter ...func(string) bool) ([]byte, error) {
copy := a.Clone()
copy.FromRemoteAuthConfig(remoteConfig)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/templates/Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ FROM darthsim/imgproxy:v3.8.0 AS imgproxy
FROM supabase/edge-runtime:v1.69.12 AS edgeruntime
FROM timberio/vector:0.28.1-alpine AS vector
FROM supabase/supavisor:2.7.0 AS supavisor
FROM supabase/gotrue:v2.179.0 AS gotrue
FROM supabase/gotrue:v2.180.0 AS gotrue
FROM supabase/realtime:v2.51.3 AS realtime
FROM supabase/storage-api:v1.27.4 AS storage
FROM supabase/logflare:1.22.3 AS logflare
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/templates/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,15 @@ enabled = false
# Obtain from https://clerk.com/setup/supabase
# domain = "example.clerk.accounts.dev"

# OAuth server configuration
[auth.oauth_server]
Comment thread
sweatybridge marked this conversation as resolved.
# Enable OAuth server functionality
enabled = false
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = false

[edge_runtime]
enabled = true
# Supported request policies: `oneshot`, `per_worker`.
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/testdata/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,15 @@ minimum_password_length = 6
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
password_requirements = ""

# OAuth server configuration
[auth.oauth_server]
# Enable OAuth server functionality
enabled = true
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = true

[auth.rate_limit]
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
email_sent = 2
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); feat(auth): add OAuth server configuration support by cemalkilic · Pull Request #4207 · supabase/cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions internal/start/start.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -699,6 +699,15 @@ EOF
}
env = append(env, fmt.Sprintf("GOTRUE_EXTERNAL_WEB3_SOLANA_ENABLED=%v", utils.Config.Auth.Web3.Solana.Enabled))

// OAuth server configuration
if utils.Config.Auth.OAuthServer.Enabled {
env = append(env,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ENABLED=%v", utils.Config.Auth.OAuthServer.Enabled),
"GOTRUE_OAUTH_SERVER_AUTHORIZATION_PATH="+utils.Config.Auth.OAuthServer.AuthorizationUrlPath,
fmt.Sprintf("GOTRUE_OAUTH_SERVER_ALLOW_DYNAMIC_REGISTRATION=%v", utils.Config.Auth.OAuthServer.AllowDynamicRegistration),
)
}

if _, err := utils.DockerStart(
ctx,
container.Config{
Expand Down
39 changes: 30 additions & 9 deletions pkg/config/auth.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -162,15 +162,16 @@ type (
SigningKeysPath string `toml:"signing_keys_path"`
SigningKeys []JWK `toml:"-"`

RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
RateLimit rateLimit `toml:"rate_limit"`
Captcha *captcha `toml:"captcha"`
Hook hook `toml:"hook"`
MFA mfa `toml:"mfa"`
Sessions sessions `toml:"sessions"`
Email email `toml:"email"`
Sms sms `toml:"sms"`
External external `toml:"external"`
Web3 web3 `toml:"web3"`
OAuthServer OAuthServer `toml:"oauth_server"`

// Custom secrets can be injected from .env file
PublishableKey Secret `toml:"publishable_key"`
Expand DownExpand Up@@ -368,6 +369,12 @@ type (
Solana solana `toml:"solana"`
Ethereum ethereum `toml:"ethereum"`
}

OAuthServer struct {
Enabled bool `toml:"enabled"`
AllowDynamicRegistration bool `toml:"allow_dynamic_registration"`
AuthorizationUrlPath string `toml:"authorization_url_path"`
}
)

func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
Expand DownExpand Up@@ -399,6 +406,7 @@ func (a *auth) ToUpdateAuthConfigBody() v1API.UpdateAuthConfigBody {
a.Sms.toAuthConfigBody(&body)
a.External.toAuthConfigBody(&body)
a.Web3.toAuthConfigBody(&body)
a.OAuthServer.toAuthConfigBody(&body)
return body
}

Expand DownExpand Up@@ -426,6 +434,7 @@ func (a *auth) FromRemoteAuthConfig(remoteConfig v1API.AuthConfigResponse) {
a.Sms.fromAuthConfig(remoteConfig)
a.External.fromAuthConfig(remoteConfig)
a.Web3.fromAuthConfig(remoteConfig)
a.OAuthServer.fromAuthConfig(remoteConfig)
}

func (r rateLimit) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
Expand DownExpand Up@@ -1338,6 +1347,18 @@ func (w *web3) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
}
}

func (o OAuthServer) toAuthConfigBody(body *v1API.UpdateAuthConfigBody) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (o *OAuthServer) fromAuthConfig(remoteConfig v1API.AuthConfigResponse) {
// TODO(cemal) :: implement me
// OAuth server configuration is behind a feature flag in the remote API
// Will be implemented when the feature reaches GA
}

func (a *auth) DiffWithRemote(remoteConfig v1API.AuthConfigResponse, filter ...func(string) bool) ([]byte, error) {
copy := a.Clone()
copy.FromRemoteAuthConfig(remoteConfig)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/templates/Dockerfile
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ FROM darthsim/imgproxy:v3.8.0 AS imgproxy
FROM supabase/edge-runtime:v1.69.12 AS edgeruntime
FROM timberio/vector:0.28.1-alpine AS vector
FROM supabase/supavisor:2.7.0 AS supavisor
FROM supabase/gotrue:v2.179.0 AS gotrue
FROM supabase/gotrue:v2.180.0 AS gotrue
FROM supabase/realtime:v2.51.3 AS realtime
FROM supabase/storage-api:v1.27.4 AS storage
FROM supabase/logflare:1.22.3 AS logflare
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/templates/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -304,6 +304,15 @@ enabled = false
# Obtain from https://clerk.com/setup/supabase
# domain = "example.clerk.accounts.dev"

# OAuth server configuration
[auth.oauth_server]
Comment thread
sweatybridge marked this conversation as resolved.
# Enable OAuth server functionality
enabled = false
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = false

[edge_runtime]
enabled = true
# Supported request policies: `oneshot`, `per_worker`.
Expand Down
9 changes: 9 additions & 0 deletions pkg/config/testdata/config.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,6 +144,15 @@ minimum_password_length = 6
# are: `letters_digits`, `lower_upper_letters_digits`, `lower_upper_letters_digits_symbols`
password_requirements = ""

# OAuth server configuration
[auth.oauth_server]
# Enable OAuth server functionality
enabled = true
# Path for OAuth consent flow UI
authorization_url_path = "/oauth/consent"
# Allow dynamic client registration
allow_dynamic_registration = true

[auth.rate_limit]
# Number of emails that can be sent per hour. Requires auth.email.smtp to be enabled.
email_sent = 2
Expand Down