fix(final-screen) CurrentPageMatches use current path

login/chrome/chrome.go

@@ -8,6 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/chromedp/chromedp"
 	"golang.org/x/oauth2"
 
 	"github.com/holyhope/digiposte-go-sdk/login"
@@ -27,7 +28,7 @@ func (c *chromeLogin) login( //nolint:nonamedreturns
 	ctx, cancel := WithCancelOnClose(independentChromeCtx, parentCtx.Done())
 	defer cancel()
 
-	defer c.ScreenshotIfNeeded(independentChromeCtx, &finalErr)
+	defer c.WrapError(independentChromeCtx, &finalErr)
 
 	if err := resolve(ctx, &firstScreen{
 		URL: c.url,
@@ -40,6 +41,36 @@ func (c *chromeLogin) login( //nolint:nonamedreturns
 	return c.resolveLogin(ctx, creds)
 }
 
+type WithLocationError struct {
+	Err      error
+	Location string
+}
+
+func (e *WithLocationError) Error() string {
+	return fmt.Sprintf("%v at %q", e.Err, e.Location)
+}
+
+func (c *chromeLogin) WrapError(ctx context.Context, errPtr *error) {
+	if *errPtr == nil {
+		return
+	}
+
+	var currentLocation string
+
+	if err := chromedp.Run(ctx,
+		chromedp.Location(&currentLocation),
+	); err != nil {
+		errorLogger(ctx).Printf("Failed to get current location: %v\n", err)
+	} else {
+		*errPtr = &WithLocationError{
+			Err:      *errPtr,
+			Location: currentLocation,
+		}
+	}
+
+	*errPtr = c.ScreenshotIfNeeded(ctx, *errPtr)
+}
+
 func WithCancelOnClose(ctx context.Context, done <-chan struct{}) (context.Context, context.CancelFunc) {
 	attachedChromeCtx, cancel := context.WithCancel(ctx)
 

login/chrome/options.go

@@ -27,6 +27,7 @@ var chromeOpts = []cu.Option{ //nolint:gochecknoglobals
 
 var errNegativeFreq = errors.New("frequency must be positive")
 
+// WithRefreshFrequency sets the frequency at which the login process will be refreshed.
 func WithRefreshFrequency(frequency time.Duration) login.Option { //nolint:ireturn
 	return &withRefreshFrequency{Frequency: frequency}
 }
@@ -58,6 +59,7 @@ func (o *withRefreshFrequency) Validate() error {
 
 var errNegativeTimeout = errors.New("timeout must be positive")
 
+// WithTimeout sets the timeout for the login process.
 func WithTimeout(timeout time.Duration) login.Option { //nolint:ireturn
 	return &withTimeout{Timeout: timeout}
 }
@@ -89,6 +91,7 @@ func (o *withTimeout) Validate() error {
 
 var errEmptyURL = errors.New("url is empty")
 
+// WithURL sets the URL to which the login process will be directed.
 func WithURL(url string) login.Option { //nolint:ireturn
 	return &withURL{URL: url}
 }
@@ -118,6 +121,7 @@ func (o *withURL) Apply(instance interface{}) error {
 	return &InvalidTypeOptionError{instance: instance}
 }
 
+// WithCookies sets the cookies to be used for the login process.
 func WithCookies(cookies []*http.Cookie) login.Option { //nolint:ireturn
 	return &withCookies{Cookies: cookies}
 }
@@ -136,6 +140,7 @@ func (o *withCookies) Apply(instance interface{}) error {
 	return &InvalidTypeOptionError{instance: instance}
 }
 
+// WithScreenShortOnError sets the option to take a screenshot when an error occurs.
 func WithScreenShortOnError() login.Option { //nolint:ireturn
 	return &withScreenShortOnError{}
 }
@@ -194,6 +199,7 @@ func (e *WithScreenshotError) Unwrap() error {
 	return e.Err
 }
 
+// WithLoggers sets the loggers to be used for the login process.
 func WithLoggers(infoLgr, errorLgr *log.Logger) login.Option { //nolint:ireturn
 	return &withLoggers{
 		Info:  infoLgr,
@@ -222,6 +228,7 @@ func (o *withLoggers) Apply(instance interface{}) error {
 	return &InvalidTypeOptionError{instance: instance}
 }
 
+// WithChromeVersion sets the version of chrome to be used for the login process.
 func WithChromeVersion(ctx context.Context, revision int, client *http.Client) login.Option { //nolint:ireturn
 	browser := launcher.NewBrowser()
 	if ctx != nil {
@@ -264,6 +271,7 @@ func (o *withChromeVersion) Apply(instance interface{}) error {
 	return &InvalidTypeOptionError{instance: instance}
 }
 
+// WithBinary sets the path to the chrome binary to be used for the login process.
 func WithBinary(path string) login.Option { //nolint:ireturn
 	return &withBinary{Path: path}
 }

login/chrome/screen_final.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"net/url"
 
-	"github.com/chromedp/cdproto/cdp"
 	"github.com/chromedp/cdproto/network"
 	"github.com/chromedp/chromedp"
 	"golang.org/x/oauth2"
@@ -25,17 +25,24 @@ func (s *finalScreen) String() string {
 }
 
 func (s *finalScreen) CurrentPageMatches(ctx context.Context) bool {
-	var nodeIDs []cdp.NodeID
+	var currentLocation string
 
 	if err := chromedp.Run(ctx,
-		chromedp.NodeIDs(`#popin_tc_privacy_button`, &nodeIDs, chromedp.ByID, chromedp.AtLeast(0)),
+		chromedp.Location(&currentLocation),
 	); err != nil {
 		errorLogger(ctx).Printf("run: %v\n", err)
 
 		return false
 	}
 
-	return len(nodeIDs) > 0
+	currentURL, err := url.Parse(currentLocation)
+	if err != nil {
+		errorLogger(ctx).Printf("parse current location: %v\n", err)
+
+		return false
+	}
+
+	return currentURL.Path == "/home"
 }
 
 type InvalidTokenError struct {

login/chrome/screenshot.go

@@ -8,10 +8,12 @@ import (
 	"github.com/chromedp/chromedp"
 )
 
-func (c *chromeLogin) ScreenshotIfNeeded(ctx context.Context, errPtr *error) {
-	if c.screenShortOnError && *errPtr != nil {
-		*errPtr = c.wrapWithScreenshot(ctx, *errPtr)
+func (c *chromeLogin) ScreenshotIfNeeded(ctx context.Context, err error) error {
+	if !c.screenShortOnError {
+		return err
 	}
+
+	return c.wrapWithScreenshot(ctx, err)
 }
 
 func (c *chromeLogin) wrapWithScreenshot(ctx context.Context, rootErr error) error {