enhanced auth

adranwit · adranwit · commit 569f25ea24aa · 2025-01-02T12:04:47.000-08:00
diff --git a/internal/translator/oauth.go b/internal/translator/oauth.go
@@ -20,6 +20,10 @@ func (c *Config) updateAuth(ctx context.Context) error {
 	if res := c.repository.RSA; res != "" {
 		c.ensureJWTValidator(cfg)
 		cfg.JWTValidator.RSA = getScyResource(res)
+		if cfg.JwtSigner == nil {
+			cfg.JwtSigner = &signer.Config{}
+		}
+		cfg.JwtSigner.RSA = getScyResource(res)
 	}
 
 	if res := c.repository.HMAC; res != "" {
@@ -28,7 +32,9 @@ func (c *Config) updateAuth(ctx context.Context) error {
 		if cfg.JwtSigner == nil {
 			cfg.JwtSigner = &signer.Config{}
 		}
-		cfg.JwtSigner.HMAC = getScyResource(res)
+		if cfg.JwtSigner.RSA == nil { //prioritize RSA over HMAC
+			cfg.JwtSigner.HMAC = getScyResource(res)
+		}
 	}
 
 	if res := c.repository.Firebase; res != "" {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ func (c *Config) updateAuth(ctx context.Context) error {`
`20`	`20`	`if res := c.repository.RSA; res != "" {`
`21`	`21`	`c.ensureJWTValidator(cfg)`
`22`	`22`	`cfg.JWTValidator.RSA = getScyResource(res)`
	`23`	`+ if cfg.JwtSigner == nil {`
	`24`	`+ cfg.JwtSigner = &signer.Config{}`
	`25`	`+ }`
	`26`	`+ cfg.JwtSigner.RSA = getScyResource(res)`
`23`	`27`	`}`
`24`	`28`
`25`	`29`	`if res := c.repository.HMAC; res != "" {`
`@@ -28,7 +32,9 @@ func (c *Config) updateAuth(ctx context.Context) error {`
`28`	`32`	`if cfg.JwtSigner == nil {`
`29`	`33`	`cfg.JwtSigner = &signer.Config{}`
`30`	`34`	`}`
`31`		`- cfg.JwtSigner.HMAC = getScyResource(res)`
	`35`	`+ if cfg.JwtSigner.RSA == nil { //prioritize RSA over HMAC`
	`36`	`+ cfg.JwtSigner.HMAC = getScyResource(res)`
	`37`	`+ }`
`32`	`38`	`}`
`33`	`39`
`34`	`40`	`if res := c.repository.Firebase; res != "" {`