chore: modernize code

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>

.golangci.yaml

@@ -69,7 +69,7 @@ linters-settings:
   revive:
     rules:
       - name: argument-limit
-        arguments: [ 6 ]
+        arguments: [ 7 ]
       - name: atomic
       - name: bare-return
       - name: blank-imports

cmd/daemon/root.go

@@ -28,7 +28,7 @@
 )
 
 // Execute runs the main program logic of openvpn-auth-oauth2.
 func Execute(args []string, logWriter io.Writer, version, commit, date string) int {
 	conf, err := configure(args, logWriter, version, commit, date)
 	if err != nil {
 		if errors.Is(err, flag.ErrHelp) {
@@ -64,8 +64,6 @@
 		provider, err = google.NewProvider(ctx, conf, httpClient)
 	default:
 		err = errors.New("unknown oauth2 provider: " + conf.OAuth2.Provider)
-
-		return 1
 	}
 
 	if err != nil {

internal/oauth2/handler.go

@@ -81,7 +81,7 @@
 				id = session.Client.SessionID
 			}
 
 			c.authorizeParams = append(c.authorizeParams, rp.WithURLParam("nonce", c.getNonce(id)))
 		}
 
 		rp.AuthURLHandler(func() string {
@@ -192,7 +192,7 @@
 
 	if !c.conf.OAuth2.Refresh.ValidateUser {
 		if err := c.storage.Set(clientID, types.EmptyToken); err != nil {
-			logger.Warn(err.Error())
+			logger.LogAttrs(ctx, slog.LevelWarn, err.Error())
 		}
 
 		return

internal/oauth2/provider_test.go

@@ -152,6 +152,8 @@ func TestNewProvider(t *testing.T) {
 				t.Fatal("unknown oauth2 provider: " + tt.conf.OAuth2.Provider)
 			}
 
+			require.Error(t, err)
+
 			oAuth2Client, err := oauth2.New(ctx, logger.Logger, tt.conf, http.DefaultClient, testutils.NewFakeStorage(), provider, testutils.NewFakeOpenVPNClient())
 			if tt.err != "" {
 				require.Error(t, err)