moved OAuth2Authenticator to auth package

This commit is contained in:
Philipp Wolfer 2023-12-10 14:17:49 +01:00
parent dd501df5c5
commit a59a542967
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
6 changed files with 41 additions and 21 deletions

View file

@ -27,11 +27,11 @@ import (
"github.com/manifoldco/promptui"
"github.com/spf13/cobra"
"go.uploadedlobster.com/scotty/internal/auth"
"go.uploadedlobster.com/scotty/internal/backends"
"go.uploadedlobster.com/scotty/internal/cli"
"go.uploadedlobster.com/scotty/internal/config"
"go.uploadedlobster.com/scotty/internal/i18n"
"go.uploadedlobster.com/scotty/internal/models"
)
var serviceAddCmd = &cobra.Command{
@ -95,7 +95,7 @@ func init() {
}
func promptForAuth(service config.ServiceConfig) error {
backend, err := backends.ResolveBackend[models.OAuth2Authenticator](service)
backend, err := backends.ResolveBackend[auth.OAuth2Authenticator](service)
if err != nil {
// No authentication required, return
return nil

View file

@ -18,9 +18,9 @@ package cmd
import (
"github.com/spf13/cobra"
"go.uploadedlobster.com/scotty/internal/auth"
"go.uploadedlobster.com/scotty/internal/backends"
"go.uploadedlobster.com/scotty/internal/cli"
"go.uploadedlobster.com/scotty/internal/models"
)
var serviceAuthCmd = &cobra.Command{
@ -33,7 +33,7 @@ multiple services using the same backend but different authentication.`,
Run: func(cmd *cobra.Command, args []string) {
serviceConfig, err := cli.SelectService(cmd)
cobra.CheckErr(err)
backend, err := backends.ResolveBackend[models.OAuth2Authenticator](serviceConfig)
backend, err := backends.ResolveBackend[auth.OAuth2Authenticator](serviceConfig)
cobra.CheckErr(err)
cli.AuthenticationFlow(serviceConfig, backend)
},