Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃Ч chore: remove client secret from msft oauth token request #1045

Merged
merged 1 commit into from
Jun 17, 2024
Merged

馃Ч chore: remove client secret from msft oauth token request #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 8 deletions backend/config/oauth_microsoft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ type MicrosoftOAuthSettings struct {
}

type intermediateMicrosoftOAuthSetting struct {
Key string `env:"KEY"`
Secret string `env:"SECRET"`
Key string `env:"KEY"`
}

func (i *intermediateMicrosoftOAuthSetting) into() (*MicrosoftOAuthSettings, error) {
Expand All @@ -23,14 +22,8 @@ func (i *intermediateMicrosoftOAuthSetting) into() (*MicrosoftOAuthSettings, err
return nil, err
}

secretSecret, err := m.NewSecret(i.Secret)
if err != nil {
return nil, err
}

return &MicrosoftOAuthSettings{
Key: secretKey,
Secret: secretSecret,
Tenant: tenantID,
}, nil
}
9 changes: 3 additions & 6 deletions backend/integrations/oauth/soth/msft/msft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ var defaultScopes = []string{"openid", "offline_access", "user.read", "calendars
// New creates a new microsoftonline Provider, and sets up important connection details.
// You should always call `msft.New` to get a new Provider. Never try to create
// one manually.
func New(clientKey *m.Secret[string], secret *m.Secret[string], callbackURL string, tenant string, scopes ...string) *Provider {
func New(clientKey *m.Secret[string], callbackURL string, tenant string, scopes ...string) *Provider {
p := &Provider{
ClientKey: clientKey,
Secret: secret,
CallbackURL: callbackURL,
ProviderName: "microsoftonline",
tenant: tenant,
Expand All @@ -47,7 +46,6 @@ func New(clientKey *m.Secret[string], secret *m.Secret[string], callbackURL stri
// Provider is the implementation of `soth.Provider` for accessing microsoftonline.
type Provider struct {
ClientKey *m.Secret[string]
Secret *m.Secret[string]
CallbackURL string
config *oauth2.Config
ProviderName string
Expand Down Expand Up @@ -138,9 +136,8 @@ func newConfig(provider *Provider, scopes []string) *oauth2.Config {
}

c := &oauth2.Config{
ClientID: provider.ClientKey.Expose(),
ClientSecret: provider.Secret.Expose(),
RedirectURL: provider.CallbackURL,
ClientID: provider.ClientKey.Expose(),
RedirectURL: provider.CallbackURL,
Endpoint: oauth2.Endpoint{
AuthURL: authURL,
TokenURL: tokenURL,
Expand Down
2 changes: 1 addition & 1 deletion backend/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func Init(db *gorm.DB, stores *store.Stores, integrations integrations.Integrati

applicationURL := settings.Application.ApplicationURL()

msftProvider := msft.New(settings.Microsft.Key, settings.Microsft.Secret, fmt.Sprintf("%s/api/v1/auth/microsoftonline/callback", applicationURL), settings.Microsft.Tenant)
msftProvider := msft.New(settings.Microsft.Key, fmt.Sprintf("%s/api/v1/auth/microsoftonline/callback", applicationURL), settings.Microsft.Tenant)
googProvider := goog.New(settings.Google.Key, settings.Google.Secret, fmt.Sprintf("%s/api/v1/auth/google/callback", applicationURL))

authMiddleware := authMiddleware.New(
Expand Down
1 change: 0 additions & 1 deletion config/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,5 @@ SAC_GOOGLE_OAUTH_SECRET=GOOGLE_OAUTH_CLIENT_SECRET
SAC_GOOGLE_API_KEY=GOOGLE_API_KEY

SAC_MICROSOFT_OAUTH_KEY=test
SAC_MICROSOFT_OAUTH_SECRET=test

SAC_SEARCH_URI="http://127.0.0.1:9200"
Loading