Release v25.11.26

BTHLABS-66: Prepping for public release: Take five
AKA "Using Apple reviewers as QA for your project". Thanks, y'all! :)
2025-11-27 17:52:16 +01:00 · 2025-11-27 17:51:19 +01:00 · 2025-11-25 12:54:52 +01:00 · 2025-11-21 21:04:28 +01:00 · 2025-11-20 20:34:42 +01:00
50 changed files with 722 additions and 145 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,23 @@
 # HotPocket by BTHLabs

-This repository contains the _HotPocket_ project.
+Minimal self-hosted bookmarking app :).
+
+## The what, the why and the ugly
+
+HotPocket is a minimal self-hosted bookmarking app. It combines a Web
+application, companion apps, browser extensions to give you a way to quickly
+save links for later.
+
+HotPocket came to be to fill in the blank left by Pocket, after Mozilla shut it
+down. I looked at the existing alternatives and found them either too
+feature-rich, too involved to self-host or otherwise not to my liking. So I
+decided to sit down and build something for myself.
+
+With the what and why out of the way, let's talk about the ugly... At its core
+HotPocket is a personal project. I built it by myself and for myself. It may
+or may not fit your needs. If it does, happy saving!
+
+If you're feeling up for an adventure, continue reading below :).

 ## Development setup

@@ -66,7 +83,7 @@ $ docker run --rm -it \
    -e HOTPOCKET_BACKEND_INITIAL_ACCOUNT_USERNAME=hotpocket \
    -e HOTPOCKET_BACKEND_INITIAL_ACCOUNT_PASSWORD=hotpocketm4st3r \
    -p 8000:8000 \
-    hotpocket/backend:aio-v25.11.19-01
+    hotpocket/backend:aio-v25.11.26-01
 ```

 The command above will set up and start the application. The SQLite file will
@@ -128,6 +145,7 @@ that can be used to configure the services.
 | `HOTPOCKET_BACKEND_RUN_MIGRATIONS`           | `false` or `true`                                               | Set to `true` to run database muigrations when the container starts.                        |
 | `HOTPOCKET_BACKEND_INITIAL_ACCOUNT_USERNAME` | N/A                                                             | Username for the initial account.                                                           |
 | `HOTPOCKET_BACKEND_INITIAL_ACCOUNT_PASSWORD` | N/A                                                             | Password for the initial account.                                                           |
+| `HOTPOCKET_BACKEND_OPERATOR_EMAIL`           | N/A                                                             | Instance operator's e-mail. Used to display extra language on login page.                   |

 **Env and App settings**

@@ -158,6 +176,15 @@ method's name in the UI and defaults to `OIDC`.

 **NOTE:** Currently, only Keycloak has been tested with this login method.

+### Volumes
+
+Both images declare `/srv/run` to be a volume. It's intended to keep the
+service's runtime data, including but not limited to PID files, UNIX sockets
+etc. It's recommended to persist this volume.
+
+Additionally, the `deployment` image declares `/srv/uploads` to be a volume.
+It's recommeded to persist this volume.
+
 ## Author

 _HotPocket_ is developed by [BTHLabs](https://www.bthlabs.pl/).
--- a/deployment/aio/docker-compose.yaml
+++ b/deployment/aio/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
  backend:
-    image: "hotpocket/backend:aio-v25.11.19-01"
+    image: "bthlabs/hotpocket:aio-v25.11.26-01"
    environment:
      HOTPOCKET_BACKEND_SECRET_KEY: "thisisntright"
      HOTPOCKET_BACKEND_INITIAL_ACCOUNT_USERNAME: "hotpocket"
--- a/deployment/fullstack/docker-compose.yaml
+++ b/deployment/fullstack/docker-compose.yaml
@@ -8,7 +8,7 @@ x-backend-environment: &x-backend-environment

 services:
  webapp:
-    image: "hotpocket/backend:deployment-v25.11.19-01"
+    image: "bthlabs/hotpocket:deployment-v25.11.26-01"
    environment:
      <<: *x-backend-environment
      HOTPOCKET_BACKEND_ALLOWED_HOSTS: "app.staging.hotpocket.bthlab.bthlabs.net"
@@ -21,7 +21,7 @@ services:
    restart: "unless-stopped"

  admin:
-    image: "hotpocket/backend:deployment-v25.11.19-01"
+    image: "bthlabs/hotpocket:deployment-v25.11.26-01"
    environment:
      <<: *x-backend-environment
      HOTPOCKET_BACKEND_APP: "admin"
@@ -35,7 +35,7 @@ services:
    restart: "unless-stopped"

  celery-worker:
-    image: "hotpocket/backend:deployment-v25.11.19-01"
+    image: "bthlabs/hotpocket:deployment-v25.11.26-01"
    command:
      - "/srv/venv/bin/celery"
      - "-A"
@@ -57,7 +57,7 @@ services:
    restart: "unless-stopped"

  celery-beat:
-    image: "hotpocket/backend:deployment-v25.11.19-01"
+    image: "bthlabs/hotpocket:deployment-v25.11.26-01"
    command:
      - "/srv/venv/bin/celery"
      - "-A"
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hotpocket-workspace"
-version = "25.11.19"
+version = "25.11.26"
 description = "HotPocket Workspace"
 authors = ["Tomek Wójcik <contact@bthlabs.pl>"]
 license = "Apache-2.0"
--- a/services/apple/HotPocket.xcodeproj/project.pbxproj
+++ b/services/apple/HotPocket.xcodeproj/project.pbxproj
@@ -718,7 +718,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "iOS (Share Extension)/iOS (Share Extension).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Share Extension)/Info.plist";
@@ -731,7 +731,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.bthlabs.HotPocket.ShareExtension;
 				PRODUCT_NAME = "Save to HotPocket";
 				SDKROOT = iphoneos;
@@ -751,7 +751,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "iOS (Share Extension)/iOS (Share Extension).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Share Extension)/Info.plist";
@@ -764,7 +764,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.bthlabs.HotPocket.ShareExtension;
 				PRODUCT_NAME = "Save to HotPocket";
 				SDKROOT = iphoneos;
@@ -784,7 +784,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -797,7 +797,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -819,7 +819,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -832,7 +832,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -858,7 +858,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "iOS (App)/HotPocket (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -878,7 +878,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -904,7 +904,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "iOS (App)/HotPocket (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -924,7 +924,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -950,7 +950,7 @@
 				CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/HotPocket.entitlements";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -965,7 +965,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -985,7 +985,7 @@
 				CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/HotPocket.entitlements";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1000,7 +1000,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -1022,7 +1022,7 @@
 				CODE_SIGN_ENTITLEMENTS = "macOS (App)/HotPocket.entitlements";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1038,7 +1038,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -1061,7 +1061,7 @@
 				CODE_SIGN_ENTITLEMENTS = "macOS (App)/HotPocket.entitlements";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1077,7 +1077,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -1211,7 +1211,7 @@
 				CODE_SIGN_ENTITLEMENTS = "macOS (Share Extension)/macOS (Share Extension).entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1225,7 +1225,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.bthlabs.HotPocket.ShareExtension;
 				PRODUCT_NAME = "Save to HotPocket";
 				REGISTER_APP_GROUPS = YES;
@@ -1241,7 +1241,7 @@
 				CODE_SIGN_ENTITLEMENTS = "macOS (Share Extension)/macOS (Share Extension).entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2025111901;
+				CURRENT_PROJECT_VERSION = 2025112601;
 				DEVELOPMENT_TEAM = 648728X64K;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1255,7 +1255,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 25.11.19;
+				MARKETING_VERSION = 25.11.26;
 				PRODUCT_BUNDLE_IDENTIFIER = pl.bthlabs.HotPocket.ShareExtension;
 				PRODUCT_NAME = "Save to HotPocket";
 				REGISTER_APP_GROUPS = YES;
--- a/services/apple/Shared
+++ b/services/apple/Shared
@@ -10,6 +10,7 @@
 #import "HPAPI.h"
 #import "HPCredentialsHelper.h"
 #import "HPRPCClient.h"
+#import "NSBundle+HotPocketExtensions.h"
 #import "NSURL+HotPocketExtensions.h"

@implementation HPAuthParams
@@ -77,18 +78,19 @@
        return nil;
    }
    
-    NSDictionary *postAuthenticateURLParams = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"HPAuthFlowPostAuthenticateURLParts"];
-    if (postAuthenticateURLParams == nil) {
+    NSString *expectedScheme = [NSBundle postAuthenticateURLScheme];
+    NSString *expectedHost = [NSBundle postAuthenticateURLHost];
+    if (expectedScheme == nil || expectedHost == nil) {
        return nil;
    }
    
    NSURLComponents *urlComponents = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
    
-    if ([urlComponents.scheme isEqualToString:[postAuthenticateURLParams valueForKey:@"scheme"]] == NO) {
+    if ([urlComponents.scheme isEqualToString:expectedScheme] == NO) {
        return nil;
    }
    
-    if ([urlComponents.host isEqualToString:[postAuthenticateURLParams valueForKey:@"host"]] == NO) {
+    if ([urlComponents.host isEqualToString:expectedHost] == NO) {
        return nil;
    }
    
@@ -109,6 +111,8 @@
 }

 -(BOOL)handleAuthParams:(HPAuthParams *)authParams {
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"AuthFlowDidReceiveAuthParams" object:self];
+
    HPRPCClient *rpcClient = [[HPRPCClient alloc] initWithBaseURL:self.baseURL accessToken:nil];
    
    NSArray *callParams = @[
@@ -120,7 +124,7 @@
                               method:@"accounts.access_tokens.create"
                               params:callParams endopoint:@"/accounts/rpc/"
                    completionHandler:^(NSString *callId, HPRPCCallResult *result) {
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
            if (result.error != nil) {
                NSLog(@"-[HPAuthFlow handleAuthParams:] error=`%@`", result.error);
            } else {
--- a/(App)/NSBundle+HotPocketExtensions.h
+++ b/(App)/NSBundle+HotPocketExtensions.h
@@ -12,6 +12,9 @@ NS_ASSUME_NONNULL_BEGIN
@interface NSBundle (HotPocketExtensions)

 +(NSString *)uname;
+(NSDictionary *)postAuthenticateURLParams;
+(NSString *)postAuthenticateURLScheme;
+(NSString *)postAuthenticateURLHost;

@end

--- a/(App)/NSBundle+HotPocketExtensions.m
+++ b/(App)/NSBundle+HotPocketExtensions.m
@@ -14,4 +14,23 @@
    return [NSString  stringWithFormat:@"HotPocket v%@ (%@)", [mainBundle.infoDictionary valueForKey:@"CFBundleShortVersionString"], [mainBundle.infoDictionary valueForKey:@"CFBundleVersion"]];
 }

+(NSDictionary *)postAuthenticateURLParams {
+    NSDictionary *result = [[[NSBundle mainBundle] infoDictionary] valueForKey:@"HPAuthFlowPostAuthenticateURLParts"];
+    if (result == nil) {
+        return [NSDictionary dictionary];
+    }
+    
+    return result;
+}
+
+(NSString *)postAuthenticateURLScheme {
+    NSDictionary *params = [self postAuthenticateURLParams];
+    return [params valueForKey:@"scheme"];
+}
+
+(NSString *)postAuthenticateURLHost {
+    NSDictionary *params = [self postAuthenticateURLParams];
+    return [params valueForKey:@"host"];
+}
+
@end
--- a/(App)/AuthorizationProgressViewController.h
+++ b/(App)/AuthorizationProgressViewController.h
@@ -6,12 +6,19 @@
 //

 #import <UIKit/UIKit.h>
+#import <AuthenticationServices/AuthenticationServices.h>

 NS_ASSUME_NONNULL_BEGIN

-@interface AuthorizationProgressViewController : UIViewController
+@class MultilineLabel;
+
+@interface AuthorizationProgressViewController : UIViewController<ASWebAuthenticationPresentationContextProviding>

@property IBOutlet UIActivityIndicatorView *progressIndicator;
+@property IBOutlet MultilineLabel *progressLabel;
+@property (strong, nullable) NSURL *authorizationURL;
+@property (strong, nullable) ASWebAuthenticationSession *webAuthenticationSession;
+@property BOOL userCancelledSession;

@end

--- a/(App)/AuthorizationProgressViewController.m
+++ b/(App)/AuthorizationProgressViewController.m
@@ -8,20 +8,36 @@
 #import "AuthorizationProgressViewController.h"

 #import "AppDelegate.h"
+#import "HPAuthFlow.h"
 #import "HPCredentialsHelper.h"
+#import "MultilineLabel.h"
+#import "NSBundle+HotPocketExtensions.h"

@interface AuthorizationProgressViewController (AuthorizationProgressViewControllerPrivate)

 #pragma mark - Private interface

+-(void)presentAuthorizationError;
+
@end

@implementation AuthorizationProgressViewController

 #pragma mark - View lifecycle

+-(instancetype)initWithCoder:(NSCoder *)coder {
+    if (self = [super initWithCoder:coder]) {
+        self.authorizationURL = nil;
+        self.webAuthenticationSession = nil;
+        self.userCancelledSession = NO;
+    }
+    
+    return self;
+}
+
 -(void)viewDidLoad {
    [super viewDidLoad];
+    self.progressLabel.text = NSLocalizedString(@"Continue to sign in in your browser...", @"Continue to sign in in your browser...");
 }

 -(void)viewWillAppear:(BOOL)animated {
@@ -29,17 +45,90 @@
    [self.progressIndicator startAnimating];
    
    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onAuthFlowDidFinish:) name:@"AuthFlowDidFinish" object:appDelegate.authFlow];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onAuthFlowDidFinish:)
+                                                 name:@"AuthFlowDidFinish"
+                                               object:appDelegate.authFlow];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onAuthFlowDidReceiveAuthParams:)
+                                                 name:@"AuthFlowDidReceiveAuthParams"
+                                               object:appDelegate.authFlow];
 }

-(void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
+-(void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+    
+    ASWebAuthenticationSessionCompletionHandler completionHandler = ^(NSURL *url, NSError *error) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (error != nil) {
+#ifdef DEBUG
+                NSLog(@"[AuthorizationViewController.session completionHandler] error=`%@`", error);
+#endif
+                if (error.code == ASWebAuthenticationSessionErrorCodeCanceledLogin) {
+                    self.userCancelledSession = YES;
+                }
+                [self presentAuthorizationError];
+            } else {
+                HPAuthParams *receivedAuthParams = [appDelegate.authFlow handlePostAuthenticateURL:url];
+                if (receivedAuthParams != nil) {
+                    [appDelegate.authFlow handleAuthParams:receivedAuthParams];
+                } else {
+                    [self presentAuthorizationError];
+                }
+            }
+            
+            self.webAuthenticationSession = nil;
+        });
+    };
+    
+    ASWebAuthenticationSessionCallback *callback = [ASWebAuthenticationSessionCallback callbackWithCustomScheme:[NSBundle postAuthenticateURLScheme]];
+    self.webAuthenticationSession = [[ASWebAuthenticationSession alloc] initWithURL:self.authorizationURL
+                                                                           callback:callback
+                                                                  completionHandler:completionHandler];
+    self.webAuthenticationSession.presentationContextProvider = self;
+#ifdef DEBUG
+    self.webAuthenticationSession.prefersEphemeralWebBrowserSession = YES;
+#endif
+    
+    if (self.webAuthenticationSession.canStart == NO) {
+        [self presentAuthorizationError];
+        return;
+    }
+    
+    [self.webAuthenticationSession start];
 }

 -(void)viewDidDisappear:(BOOL)animated {
    [super viewDidDisappear:animated];
+    self.webAuthenticationSession = nil;
+    
    [self.progressIndicator stopAnimating];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+# pragma mark - Private interface
+
+-(void)presentAuthorizationError {
+    if (self.userCancelledSession == NO) {
+        UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Oops!", @"Oops!")
+                                                                       message:NSLocalizedString(@"HotPocket couldn't complete this operation.", @"HotPocket couldn't complete this operation.")
+                                                                preferredStyle:UIAlertControllerStyleAlert];
+        
+        [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Oh well", @"Oh well")
+                                                  style:UIAlertActionStyleDefault
+                                                handler:^(UIAlertAction *action) {
+            [alert dismissViewControllerAnimated:YES completion:^{
+                [self.navigationController popViewControllerAnimated:YES];
+            }];
+        }]];
+        
+        [self presentViewController:alert animated:YES completion:nil];
+    } else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
 }

 #pragma mark - Notification handlers
@@ -52,23 +141,21 @@
        HPCredentials *credentials = [[HPCredentialsHelper sharedHelper] getCredentials];
        
        if (credentials.usable == NO) {
-            UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Oops!", @"Oops!")
-                                                                           message:NSLocalizedString(@"HotPocket couldn't complete this operation.", @"HotPocket couldn't complete this operation.")
-                                                                    preferredStyle:UIAlertControllerStyleAlert];
-
-            [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Oh well", @"Oh well")
-                                                      style:UIAlertActionStyleDefault
-                                                    handler:^(UIAlertAction *action) {
-                [alert dismissViewControllerAnimated:YES completion:^{
-                    [self.navigationController popViewControllerAnimated:YES];
-                }];
-            }]];
-            
-            [self presentViewController:alert animated:YES completion:nil];
+            [self presentAuthorizationError];
        } else {
            [self.navigationController popToRootViewControllerAnimated:YES];
        }
    });
 }

+-(void)onAuthFlowDidReceiveAuthParams:(NSNotification *)notification {
+    self.progressLabel.text = NSLocalizedString(@"Processing authorization...", @"Processing authorization...");
+}
+
+# pragma mark - ASWebAuthenticationPresentationContextProviding implementation
+
+-(ASPresentationAnchor)presentationAnchorForWebAuthenticationSession:(ASWebAuthenticationSession *)session {
+    return self.view.window;
+}
+
@end
--- a/(App)/AuthorizationViewController.m
+++ b/(App)/AuthorizationViewController.m
@@ -73,14 +73,9 @@
        return;
    }
    
-    if ([application canOpenURL:authURL] == YES) {
-        [application openURL:authURL options:@{} completionHandler:^(BOOL result) {
-            if (result == YES) {
-                AuthorizationProgressViewController *authorizationProgressViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"AuthorizationProgressViewController"];
-                [self.navigationController pushViewController:authorizationProgressViewController animated:YES];
-            }
-        }];
-    }
+    AuthorizationProgressViewController *authorizationProgressViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"AuthorizationProgressViewController"];
+    authorizationProgressViewController.authorizationURL = authURL;
+    [self.navigationController pushViewController:authorizationProgressViewController animated:YES];
 }

 #pragma mark - Event handlers
--- a/(App)/Base.lproj/Main.storyboard
+++ b/(App)/Base.lproj/Main.storyboard
@@ -229,8 +229,8 @@
                                <rect key="frame" x="189" y="306" width="37" height="37"/>
                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                            </activityIndicatorView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Awaiting authentication response..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qiJ-yx-nMd">
-                                <rect key="frame" x="20" y="359" width="374" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Awaiting authentication response..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qiJ-yx-nMd" customClass="MultilineLabel">
+                                <rect key="frame" x="20" y="359" width="374" height="64"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -242,6 +242,7 @@
                    </view>
                    <connections>
                        <outlet property="progressIndicator" destination="DNy-gf-n60" id="hJF-jc-ZJ0"/>
+                        <outlet property="progressLabel" destination="qiJ-yx-nMd" id="1Wu-em-XsK"/>
                    </connections>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="N3D-cM-5Ro" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
--- a/services/apple/macOS
+++ b/services/apple/macOS
@@ -21,18 +21,6 @@
 }

 -(void)application:(NSApplication *)application openURLs:(NSArray<NSURL *> *)urls {
-    HPAuthParams *receivedAuthParams = nil;
-    for (NSURL *url in urls) {
-        receivedAuthParams = [self.authFlow handlePostAuthenticateURL:url];
-        
-        if (receivedAuthParams != nil) {
-            break;
-        }
-    }
-    
-    if (receivedAuthParams != nil) {
-        [self.authFlow handleAuthParams:receivedAuthParams];
-    }
 }

@end
--- a/(App)/AuthorizationProgressViewController.h
+++ b/(App)/AuthorizationProgressViewController.h
@@ -6,12 +6,19 @@
 //

 #import <Cocoa/Cocoa.h>
+#import <AuthenticationServices/AuthenticationServices.h>

 NS_ASSUME_NONNULL_BEGIN

-@interface AuthorizationProgressViewController : NSViewController
+@interface AuthorizationProgressViewController : NSViewController<ASWebAuthenticationPresentationContextProviding>

@property IBOutlet NSProgressIndicator *progressIndicator;
+@property NSString *progressLabelTitle;
+@property (nullable, strong) NSURL *authorizationURL;
+@property (nullable, strong) ASWebAuthenticationSession *webAuthenticationSession;
+@property BOOL userCancelledSession;
+
+-(IBAction)doCancel:(id)sender;

@end

--- a/(App)/AuthorizationProgressViewController.m
+++ b/(App)/AuthorizationProgressViewController.m
@@ -9,37 +9,133 @@

 #import "AppDelegate.h"
 #import "AuthorizationViewController.h"
+#import "HPAuthFlow.h"
 #import "HPCredentialsHelper.h"
 #import "MainViewController.h"
+#import "NSBundle+HotPocketExtensions.h"
 #import "ReplaceAnimator.h"

@interface AuthorizationProgressViewController (AuthorizationProgressViewControllerPrivate)

 #pragma mark - Private interface

+-(void)presentAuthorizationError;
+
@end

@implementation AuthorizationProgressViewController

 #pragma mark - View lifecycle

+-(instancetype)initWithCoder:(NSCoder *)coder {
+    if (self = [super initWithCoder:coder]) {
+        self.authorizationURL = nil;
+        self.webAuthenticationSession = nil;
+        self.userCancelledSession = NO;
+    }
+    
+    return self;
+}
+
 -(void)viewDidLoad {
    [super viewDidLoad];
+    self.progressLabelTitle = NSLocalizedString(@"Continue to sign in in your browser...", @"Continue to sign in in your browser...");
 }

 -(void)viewWillAppear {
    AppDelegate *appDelegate = [[NSApplication sharedApplication] delegate];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onAuthFlowDidFinish:) name:@"AuthFlowDidFinish" object:appDelegate.authFlow];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                            selector:@selector(onAuthFlowDidFinish:)
+                                                 name:@"AuthFlowDidFinish"
+                                               object:appDelegate.authFlow];
+
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onAuthFlowDidReceiveAuthParams:)
+                                                 name:@"AuthFlowDidReceiveAuthParams"
+                                               object:appDelegate.authFlow];
    
    [self.progressIndicator startAnimation:self];
 }

+-(void)viewDidAppear {
+    [super viewDidAppear];
+    AppDelegate *appDelegate = [[NSApplication sharedApplication] delegate];
+    
+    ASWebAuthenticationSessionCompletionHandler completionHandler = ^(NSURL *url, NSError *error) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (error != nil) {
+#ifdef DEBUG
+                NSLog(@"[AuthorizationViewController.session completionHandler] error=`%@`", error);
+#endif
+                if (error.code == ASWebAuthenticationSessionErrorCodeCanceledLogin) {
+                    self.userCancelledSession = YES;
+                }
+                [self presentAuthorizationError];
+            } else {
+                HPAuthParams *receivedAuthParams = [appDelegate.authFlow handlePostAuthenticateURL:url];
+                if (receivedAuthParams != nil) {
+                    [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
+                    [appDelegate.authFlow handleAuthParams:receivedAuthParams];
+                } else {
+                    [self presentAuthorizationError];
+                }
+            }
+            
+            self.webAuthenticationSession = nil;
+        });
+    };
+    
+    ASWebAuthenticationSessionCallback *callback = [ASWebAuthenticationSessionCallback callbackWithCustomScheme:[NSBundle postAuthenticateURLScheme]];
+    self.webAuthenticationSession = [[ASWebAuthenticationSession alloc] initWithURL:self.authorizationURL
+                                                                           callback:callback
+                                                                  completionHandler:completionHandler];
+    self.webAuthenticationSession.presentationContextProvider = self;
+#ifdef DEBUG
+    self.webAuthenticationSession.prefersEphemeralWebBrowserSession = YES;
+#endif
+    
+    if (self.webAuthenticationSession.canStart == NO) {
+        [self presentAuthorizationError];
+        return;
+    }
+    
+    [self.webAuthenticationSession start];
+}
+
 -(void)viewDidDisappear {
+    [super viewDidDisappear];
+    self.webAuthenticationSession = nil;
+
    [self.progressIndicator stopAnimation:self];
    
    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }

+#pragma mark - Actions
+
+-(IBAction)doCancel:(id)sender {
+    [self.webAuthenticationSession cancel];
+}
+
+#pragma mark - Private interface
+
+-(void)presentAuthorizationError {
+    if (self.userCancelledSession == NO) {
+        NSAlert *alert = [[NSAlert alloc] init];
+        alert.alertStyle = NSAlertStyleCritical;
+        alert.messageText = NSLocalizedString(@"Oops!", @"Oops!");
+        alert.informativeText = NSLocalizedString(@"HotPocket couldn't complete this operation.", @"HotPocket couldn't complete this operation.");
+        [alert beginSheetModalForWindow:self.view.window completionHandler:^(NSModalResponse response) {
+            AuthorizationViewController *authorizationViewController = [self.storyboard instantiateControllerWithIdentifier:@"AuthorizationViewController"];
+            [self presentViewController:authorizationViewController animator:[[ReplaceAnimator alloc] init]];
+        }];
+    } else {
+        AuthorizationViewController *authorizationViewController = [self.storyboard instantiateControllerWithIdentifier:@"AuthorizationViewController"];
+        [self presentViewController:authorizationViewController animator:[[ReplaceAnimator alloc] init]];
+    }
+}
+
 #pragma mark - Notification handlers

 -(void)onAuthFlowDidFinish:(NSNotification *)notification {
@@ -50,14 +146,7 @@
        [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
        
        if (credentials.usable == NO) {
-            NSAlert *alert = [[NSAlert alloc] init];
-            alert.alertStyle = NSAlertStyleCritical;
-            alert.messageText = NSLocalizedString(@"Oops!", @"Oops!");
-            alert.informativeText = NSLocalizedString(@"HotPocket couldn't complete this operation.", @"HotPocket couldn't complete this operation.");
-            [alert runModal];
-            
-            AuthorizationViewController *authorizationViewController = [self.storyboard instantiateControllerWithIdentifier:@"AuthorizationViewController"];
-            [self presentViewController:authorizationViewController animator:[[ReplaceAnimator alloc] init]];
+            [self presentAuthorizationError];
        } else {
            MainViewController *mainViewController = [self.storyboard instantiateControllerWithIdentifier:@"MainViewController"];
            [self presentViewController:mainViewController animator:[[ReplaceAnimator alloc] init]];
@@ -65,4 +154,14 @@
    });
 }

+-(void)onAuthFlowDidReceiveAuthParams:(NSNotification *)notification {
+    self.progressLabelTitle = NSLocalizedString(@"Processing authorization...", @"Processing authorization...");
+}
+
+# pragma mark - ASWebAuthenticationPresentationContextProviding implementation
+
+-(ASPresentationAnchor)presentationAnchorForWebAuthenticationSession:(ASWebAuthenticationSession *)session {
+    return self.view.window;
+}
+
@end
--- a/(App)/AuthorizationViewController.m
+++ b/(App)/AuthorizationViewController.m
@@ -31,19 +31,24 @@
 #pragma mark - Actions

 -(IBAction)doStartAuthorizationFlow:(id)sender {
-    AppDelegate *appDeleate = [[NSApplication sharedApplication] delegate];
-    appDeleate.authFlow.baseURL = [NSURL URLWithString:self.baseURL];
+    AppDelegate *appDelegate = [[NSApplication sharedApplication] delegate];
+    appDelegate.authFlow.baseURL = [NSURL URLWithString:self.baseURL];
    
-    NSURL *authURL = [appDeleate.authFlow start];
+    NSURL *authURL = [appDelegate.authFlow start];
    if (authURL == nil) {
        NSBeep();
        return;
    }
    
    AuthorizationProgressViewController *authProgressViewController = [self.storyboard instantiateControllerWithIdentifier:@"AuthorizationProgressViewController"];
+    authProgressViewController.authorizationURL = authURL;
    [self presentViewController:authProgressViewController animator:[[ReplaceAnimator alloc] init]];
+}

-    [[NSWorkspace sharedWorkspace] openURL:authURL];
+# pragma mark - ASWebAuthenticationPresentationContextProviding implementation
+
+-(ASPresentationAnchor)presentationAnchorForWebAuthenticationSession:(ASWebAuthenticationSession *)session {
+    return self.view.window;
 }

@end
--- a/(App)/Base.lproj/Main.storyboard
+++ b/(App)/Base.lproj/Main.storyboard
@@ -103,7 +103,7 @@
                        <rect key="frame" x="0.0" y="0.0" width="425" height="325"/>
                        <autoresizingMask key="autoresizingMask"/>
                        <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7sM-F3-Zzf">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7sM-F3-Zzf">
                                <rect key="frame" x="18" y="153" width="389" height="16"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" lineBreakMode="clipping" title="HotPocket Instance URL" id="XwM-DV-kei">
@@ -112,7 +112,7 @@
                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                </textFieldCell>
                            </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ygC-xe-m6y">
+                            <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ygC-xe-m6y">
                                <rect key="frame" x="20" y="124" width="385" height="21"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="rHK-hP-yWO">
@@ -128,7 +128,7 @@
                                    </binding>
                                </connections>
                            </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DIc-8O-uoQ">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DIc-8O-uoQ">
                                <rect key="frame" x="18" y="68" width="389" height="48"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" selectable="YES" title="Enter the URL to your HotPocket instance, e.g. https://hotpocket.yourcompany.com/" id="Y0q-a1-oBP">
@@ -154,7 +154,7 @@
                                    <action selector="doStartAuthorizationFlow:" target="XfG-lQ-9wD" id="AOi-Wt-gmL"/>
                                </connections>
                            </button>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mQc-Ea-NNN">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mQc-Ea-NNN">
                                <rect key="frame" x="18" y="185" width="389" height="28"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="HotPocket by BTHLabs" id="NTZ-zl-yhk">
@@ -177,7 +177,7 @@
                        <rect key="frame" x="0.0" y="0.0" width="425" height="325"/>
                        <autoresizingMask key="autoresizingMask"/>
                        <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yRj-hC-QYS">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yRj-hC-QYS">
                                <rect key="frame" x="18" y="185" width="389" height="28"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="HotPocket by BTHLabs" id="F4l-2Z-D79">
@@ -195,15 +195,32 @@
                                <rect key="frame" x="196" y="113" width="32" height="32"/>
                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                            </progressIndicator>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g9a-gR-c7o">
-                                <rect key="frame" x="18" y="81" width="389" height="16"/>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g9a-gR-c7o">
+                                <rect key="frame" x="18" y="49" width="389" height="48"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Awaiting authorization response..." id="3oi-LK-vKv">
                                    <font key="font" metaFont="system"/>
                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                </textFieldCell>
+                                <connections>
+                                    <binding destination="OX4-Oj-1cw" name="value" keyPath="self.progressLabelTitle" id="ydU-jy-p3F"/>
+                                </connections>
                            </textField>
+                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sip-bU-V5i">
+                                <rect key="frame" x="175" y="14" width="76" height="32"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="nYJ-LO-V7O">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                    <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="doCancel:" target="OX4-Oj-1cw" id="nAC-If-aib"/>
+                                </connections>
+                            </button>
                        </subviews>
                    </view>
                    <connections>
@@ -227,7 +244,7 @@
                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="icon-mac-384" id="fae-mz-0sj"/>
                            </imageView>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T7q-KB-3Ut">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T7q-KB-3Ut">
                                <rect key="frame" x="18" y="185" width="389" height="28"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="HotPocket by BTHLabs" id="r5O-Sk-IdK">
@@ -236,7 +253,7 @@
                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                </textFieldCell>
                            </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2h7-bN-dsa">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2h7-bN-dsa">
                                <rect key="frame" x="18" y="153" width="389" height="16"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" selectable="YES" title="HotPocket is configured and ready." id="5fh-mh-WR1">
@@ -245,7 +262,7 @@
                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                </textFieldCell>
                            </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uci-UC-wxo">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uci-UC-wxo">
                                <rect key="frame" x="18" y="89" width="389" height="16"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" lineBreakMode="clipping" title="Instance URL" id="azk-ea-KeN">
@@ -267,8 +284,8 @@
                                    <binding destination="r5D-xE-cNT" name="enabled" keyPath="self.logoutButtonEnabled" id="gTs-BO-USz"/>
                                </connections>
                            </button>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8H3-oU-acU" customClass="LinkLabel">
-                                <rect key="frame" x="18" y="65" width="389" height="16"/>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8H3-oU-acU" customClass="LinkLabel">
+                                <rect key="frame" x="18" y="69" width="389" height="16"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" lineBreakMode="clipping" allowsEditingTextAttributes="YES" id="EoA-mM-phM">
                                    <font key="font" metaFont="system"/>
@@ -276,7 +293,7 @@
                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                </textFieldCell>
                            </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9pl-Ap-yxc">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9pl-Ap-yxc">
                                <rect key="frame" x="18" y="113" width="389" height="32"/>
                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                <textFieldCell key="cell" selectable="YES" title="Safari and Share Extensions are installed." id="dy7-bw-DYh">
--- a/services/apple/pyproject.toml
+++ b/services/apple/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hotpocket-apple"
-version = "25.11.19"
+version = "25.11.26"
 description = "HotPocket Apple Integrations"
 authors = ["Tomek Wójcik <contact@bthlabs.pl>"]
 license = "Apache-2.0"
--- a/services/backend/Dockerfile
+++ b/services/backend/Dockerfile
@@ -27,7 +27,7 @@ COPY --chown=$APP_USER_UID:$APP_USER_GID packages/common/ /srv/packages/common/
 COPY --chown=$APP_USER_UID:$APP_USER_GID packages/soa/ /srv/packages/soa/

 RUN poetry install --only main,deployment && \
-    minify -i --css-precision 0 --js-precision 0 --js-version 2022 hotpocket_backend/apps/ui/static/ui/css/hotpocket-backend*.css hotpocket_backend/apps/ui/static/ui/js/hotpocket*.js && \
+    minify -i --css-precision 0 --js-precision 0 --js-version 2022 hotpocket_backend/apps/ui/static/ui/css/hotpocket-backend*.css hotpocket_backend/apps/ui/static/ui/js/hotpocket-backend*.js && \
    ./manage.py collectstatic --settings hotpocket_backend.settings.deployment.build --noinput && \
    find hotpocket_backend/static/ -name "*.map*" -delete && \
    rm -f hotpocket_backend/settings/deployment/build.py && \
--- a/services/backend/hotpocket_backend/_meta.py
+++ b/services/backend/hotpocket_backend/_meta.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import annotations

-version = '25.11.19'
+version = '25.11.26'
--- a/services/backend/hotpocket_backend/apps/accounts/admin/init.py
+++ b/services/backend/hotpocket_backend/apps/accounts/admin/init.py
@@ -1,2 +1,3 @@
 from .access_token import AccessToken  # noqa: F401
 from .account import AccountAdmin  # noqa: F401
+from .auth_key import AuthKey  # noqa: F401
--- a/services/backend/hotpocket_backend/apps/accounts/admin/access_token.py
+++ b/services/backend/hotpocket_backend/apps/accounts/admin/access_token.py
@@ -2,16 +2,41 @@
 from __future__ import annotations

 from django.contrib import admin
+from django.utils.translation import gettext_lazy as _

 from hotpocket_backend.apps.accounts.models import AccessToken


 class AccessTokenAdmin(admin.ModelAdmin):
-    list_display = ('pk', 'account_uuid', 'origin', 'created_at', 'is_active')
+    list_display = (
+        'pk', 'account_uuid', 'origin', 'created_at', 'render_is_active',
+    )
    search_fields = ('pk', 'account_uuid', 'key', 'origin')
+    readonly_fields = (
+        'pk',
+        'account_uuid',
+        'key',
+        'origin',
+        'meta',
+        'created_at',
+        'deleted_at',
+    )
+    ordering = ['-created_at']
+
+    def has_change_permission(self, request, obj=None):
+        return False

    def has_delete_permission(self, request, obj=None):
        return request.user.is_superuser

+    @admin.display(
+        description=_('Is Active?'), boolean=True, ordering='-deleted_at',
+    )
+    def render_is_active(self, obj: AccessToken | None = None) -> bool | None:
+        if obj is None:
+            return None
+
+        return obj.is_active
+

 admin.site.register(AccessToken, AccessTokenAdmin)
--- a/services/backend/hotpocket_backend/apps/accounts/admin/account.py
+++ b/services/backend/hotpocket_backend/apps/accounts/admin/account.py
@@ -3,15 +3,26 @@ from __future__ import annotations

 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
+from django.utils.translation import gettext_lazy as _

 from hotpocket_backend.apps.accounts.models import Account


 class AccountAdmin(UserAdmin):
-    list_display = (*UserAdmin.list_display, 'is_active')
+    list_display = (*UserAdmin.list_display, 'render_is_active')
+    ordering = ['username']

    def has_delete_permission(self, request, obj=None):
        return request.user.is_superuser

+    @admin.display(
+        description=_('Is Active?'), boolean=True, ordering='-is_active',
+    )
+    def render_is_active(self, obj: Account | None = None) -> bool | None:
+        if obj is None:
+            return None
+
+        return obj.is_active
+

 admin.site.register(Account, AccountAdmin)
--- a/services/backend/hotpocket_backend/apps/accounts/admin/auth_key.py
+++ b/services/backend/hotpocket_backend/apps/accounts/admin/auth_key.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+
+from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
+
+from hotpocket_backend.apps.accounts.models import AuthKey
+
+
+class AuthKeyAdmin(admin.ModelAdmin):
+    list_display = (
+        'pk', 'account_uuid', 'key', 'created_at', 'consumed_at', 'render_is_active',
+    )
+    search_fields = ('pk', 'account_uuid', 'key')
+    readonly_fields = (
+        'pk',
+        'account_uuid',
+        'key',
+        'consumed_at',
+        'created_at',
+        'deleted_at',
+    )
+    ordering = ['-created_at']
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return request.user.is_superuser
+
+    @admin.display(
+        description=_('Is Active?'), boolean=True, ordering='-deleted_at',
+    )
+    def render_is_active(self, obj: AuthKey | None = None) -> bool | None:
+        if obj is None:
+            return None
+
+        return obj.is_active
+
+
+admin.site.register(AuthKey, AuthKeyAdmin)
--- a/services/backend/hotpocket_backend/apps/core/types.py
+++ b/services/backend/hotpocket_backend/apps/core/types.py
@@ -38,3 +38,5 @@ class PSettings(typing.Protocol):

    UI_PAGE_HEAD_INCLUDES: list
    UI_PAGE_SCRIPT_INCLUDES: list
+
+    OPERATOR_EMAIL: str | None
--- a/services/backend/hotpocket_backend/apps/saves/admin/init.py
+++ b/services/backend/hotpocket_backend/apps/saves/admin/init.py
@@ -1 +1,2 @@
+from . import association  # noqa: F401
 from . import save  # noqa: F401
--- a/services/backend/hotpocket_backend/apps/saves/admin/association.py
+++ b/services/backend/hotpocket_backend/apps/saves/admin/association.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+
+from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
+
+from hotpocket_backend.apps.saves.models import Association
+
+
+class AssociationAdmin(admin.ModelAdmin):
+    list_display = (
+        'pk', 'account_uuid', 'target', 'created_at', 'render_is_active',
+    )
+    search_fields = ('pk', 'account_uuid')
+    fields = (
+        'pk',
+        'account_uuid',
+        'archived_at',
+        'starred_at',
+        'target_meta',
+        'target_title',
+        'target_description',
+        'created_at',
+        'deleted_at',
+    )
+    readonly_fields = (
+        'pk',
+        'account_uuid',
+        'target_meta',
+        'target',
+        'archived_at',
+        'starred_at',
+        'created_at',
+        'deleted_at',
+    )
+    ordering = ['-created_at']
+
+    def has_delete_permission(self, request, obj=None):
+        return request.user.is_superuser
+
+    @admin.display(
+        description=_('Is Active?'), boolean=True, ordering='-deleted_at',
+    )
+    def render_is_active(self, obj: Association | None = None) -> bool | None:
+        if obj is None:
+            return None
+
+        return obj.is_active
+
+
+admin.site.register(Association, AssociationAdmin)
--- a/services/backend/hotpocket_backend/apps/saves/admin/save.py
+++ b/services/backend/hotpocket_backend/apps/saves/admin/save.py
@@ -11,6 +11,26 @@ class SaveAdmin(admin.ModelAdmin):
    list_display = (
        'pk', 'key', 'account_uuid', 'created_at', 'render_is_active',
    )
+    search_fields = ('pk', 'account_uuid', 'url')
+    fields = (
+        'pk',
+        'account_uuid',
+        'key',
+        'url',
+        'title',
+        'description',
+        'last_processed_at',
+        'is_netloc_banned',
+        'created_at',
+        'deleted_at',
+    )
+    readonly_fields = (
+        'pk',
+        'account_uuid',
+        'key',
+        'created_at',
+        'deleted_at',
+    )
    ordering = ['-created_at']

    def has_delete_permission(self, request, obj=None):
--- a/services/backend/hotpocket_backend/apps/ui/context_processors.py
+++ b/services/backend/hotpocket_backend/apps/ui/context_processors.py
@@ -100,3 +100,9 @@ def page_includes(request: HttpRequest) -> dict:
            'script': settings.UI_PAGE_SCRIPT_INCLUDES,
        },
    }
+
+
+def operator_email(request: HttpRequest) -> dict:
+    return {
+        'OPERATOR_EMAIL': settings.OPERATOR_EMAIL,
+    }
--- a/services/backend/hotpocket_backend/apps/ui/dto/rpc.py
+++ b/services/backend/hotpocket_backend/apps/ui/dto/rpc.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+
+import uuid
+
+import pydantic
+
+
+class SavesCreateOut(pydantic.BaseModel):
+    id: uuid.UUID
+    target_uuid: uuid.UUID
+    url: pydantic.AnyHttpUrl
+
+    def to_rpc(self) -> dict:
+        return {
+            'id': self.id,
+            'target_uuid': self.target_uuid,
+            'url': str(self.url),
+        }
--- a/services/backend/hotpocket_backend/apps/ui/rpc_methods/saves.py
+++ b/services/backend/hotpocket_backend/apps/ui/rpc_methods/saves.py
@@ -3,19 +3,28 @@ from __future__ import annotations

 from bthlabs_jsonrpc_core import register_method
 from django.http import HttpRequest
+from django.urls import reverse

 from hotpocket_backend.apps.core.rpc import wrap_soa_errors
+from hotpocket_backend.apps.ui.dto.rpc import SavesCreateOut
 from hotpocket_backend.apps.ui.services.workflows import CreateSaveWorkflow
-from hotpocket_soa.dto.associations import AssociationOut


@register_method(method='saves.create')
@wrap_soa_errors
-def create(request: HttpRequest, url: str) -> AssociationOut:
+def create(request: HttpRequest, url: str) -> SavesCreateOut:
    association = CreateSaveWorkflow().run_rpc(
        request=request,
        account=request.user,
        url=url,
    )

-    return association
+    result = SavesCreateOut.model_validate({
+        'id': association.pk,
+        'target_uuid': association.target_uuid,
+        'url': request.build_absolute_uri(reverse(
+            'ui.associations.view', args=(association.pk,),
+        )),
+    })
+
+    return result
--- a/services/backend/hotpocket_backend/apps/ui/static/ui/js/hotpocket-backend.js
+++ b/services/backend/hotpocket_backend/apps/ui/static/ui/js/hotpocket-backend.js
@@ -45,7 +45,6 @@
      return null;
    }
    onLoad = (event) => {
-      console.log('HotPocketApp.onLoad()', event);
      for (let pluginSpec of this.plugins) {
        if (pluginSpec[1].onLoad) {
          pluginSpec[1].onLoad(event);
--- a/services/backend/hotpocket_backend/apps/ui/templates/ui/accounts/login.html
+++ b/services/backend/hotpocket_backend/apps/ui/templates/ui/accounts/login.html
@@ -36,6 +36,12 @@
                {% blocktranslate %}Log in with {{ HOTPOCKET_OIDC_DISPLAY_NAME }}{% endblocktranslate %}
              </a>
            {% endif %}
+
+            {% if OPERATOR_EMAIL %}
+              <p class="my-0 mt-2 text-center">
+                <small>{% blocktranslate %}For support with your account, contact the <a href="mailto:{{ OPERATOR_EMAIL }}">instance operator</a>.{% endblocktranslate %}</small>
+              </p>
+            {% endif %}
          </div>
        </div>
        {% include "ui/ui/partials/uname.html" %}
--- a/services/backend/hotpocket_backend/apps/ui/templates/ui/page.html
+++ b/services/backend/hotpocket_backend/apps/ui/templates/ui/page.html
@@ -130,6 +130,56 @@
            {% translate 'Log out' %}
          </a>
        </li>
+        <li class="nav-item px-3 d-flex justify-content-center">
+          {% spaceless %}
+            <a
+              class="btn btn-outline-info btn-sm"
+              href="https://apps.apple.com/pl/app/hotpocket-by-bthlabs/id6752321380"
+              rel="noopener noreferrer"
+              target="_blank"
+              title="{% translate 'Safari and Share extension for iOS and macOS' %}"
+            >
+              <i class="bi bi-apple"></i> 
+            </a>
+            <a
+              class="btn btn-outline-info btn-sm ms-1"
+              href="https://chromewebstore.google.com/detail/save-to-hotpocket/mkmoejhhgnadmijpgkkioicjmikkkjbd"
+              rel="noopener noreferrer"
+              target="_blank"
+              title="{% translate 'Chrome extension' %}"
+            >
+              <i class="bi bi-browser-chrome"></i> 
+            </a>
+            <a
+              class="btn btn-outline-info btn-sm ms-1"
+              href="https://addons.mozilla.org/en-GB/firefox/addon/save-to-hotpocket/"
+              rel="noopener noreferrer"
+              target="_blank"
+              title="{% translate 'Firefox extension' %}"
+            >
+              <i class="bi bi-browser-firefox"></i> 
+            </a>
+            <a
+              class="btn btn-outline-info btn-sm ms-1"
+              data-bs-toggle="modal"
+              data-bs-target="#modalPWA"
+              href="#"
+              title="{% translate 'Android PWA' %}"
+            >
+              <i class="bi bi-android2"></i> 
+            </a>
+            <div class="vr my-1 ms-1 opacity-75"></div>
+            <a
+              class="btn btn-outline-info btn-sm ms-1"
+              href="https://git.bthlabs.pl/tomekwojcik/hotpocket"
+              rel="noopener noreferrer"
+              target="_blank"
+              title="{% translate 'Source code repository' %}"
+            >
+              <i class="bi bi-git"></i> 
+            </a>
+          {% endspaceless %}
+        </li>
      {% else %}
        <li class="nav-item">
          <a class="nav-link" href="{% url 'ui.accounts.login' %}">
@@ -142,6 +192,38 @@
    {% include "ui/ui/partials/uname.html" %}
  </div>
 </div>
+
+{% if not request.user.is_anonymous %}
+  <div class="modal modal-fade" id="modalPWA" tabindex="-1">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h1 class="modal-title fs-5" id="modalPWALabel">
+            {% translate 'HotPocket on Android and others' %}
+          </h1>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+          <p class="mb-1">
+            {% blocktranslate %}
+              HotPocket doesn't natively support Android and other systems. However, it's a Progressive Web Application. You can install it from your browser and it'll register itself as share target.
+            {% endblocktranslate %}
+          </p>
+          <p class="mb-0">
+            {% blocktranslate %}
+              This is currently supported on Android and Windows 11 (when installed using Edge).
+            {% endblocktranslate %}
+          </p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-bs-dismiss="modal">
+            {% translate 'Cool' %}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endif %}
 {% endblock %}

 {% block scripts %}
--- a/services/backend/hotpocket_backend/apps/ui/views/errors.py
+++ b/services/backend/hotpocket_backend/apps/ui/views/errors.py
@@ -27,9 +27,6 @@ def page_not_found(request: HttpRequest,
                   exception: Exception,
                   template_name: str = ERROR_404_TEMPLATE_NAME,
                   ) -> HttpResponseNotFound:
-    if exception:
-        LOGGER.error('Exception: %s', exception, exc_info=exception)
-
    return HttpResponseNotFound(render_to_string(
        'ui/errors/page_not_found.html',
        context={},
--- a/services/backend/hotpocket_backend/settings/base.py
+++ b/services/backend/hotpocket_backend/settings/base.py
@@ -72,6 +72,7 @@ TEMPLATES = [
                'hotpocket_backend.apps.ui.context_processors.debug',
                'hotpocket_backend.apps.ui.context_processors.version',
                'hotpocket_backend.apps.ui.context_processors.appearance_settings',
+                'hotpocket_backend.apps.ui.context_processors.operator_email',
            ],
        },
    },
@@ -295,3 +296,5 @@ SAVES_ASSOCIATION_ADAPTER = os.environ.get(
 UPLOADS_PATH = None

 SITE_SHORT_TITLE = 'HotPocket'
+
+OPERATOR_EMAIL = os.environ.get('HOTPOCKET_BACKEND_OPERATOR_EMAIL', None)
--- a/services/backend/ops/bin/entrypoint-deployment.sh
+++ b/services/backend/ops/bin/entrypoint-deployment.sh
@@ -13,7 +13,7 @@ cat <<EOF
                                    |_|
                production

-HotPocket v25.11.19 [${HOTPOCKET_BACKEND_IMAGE_ID}] (https://hotpocket.app/)
+HotPocket v25.11.26 [${HOTPOCKET_BACKEND_IMAGE_ID}] (https://hotpocket.app/)
 Copyright 2025-present by BTHLabs. All rights reserved. (https://bthlabs.pl/)
 Licensed under Apache-2.0
 EOF
--- a/services/backend/package.json
+++ b/services/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hotpocket-backend",
-  "version": "25.11.19",
+  "version": "25.11.26",
  "description": "HotPocket Backend",
  "main": "hotpocket_backend/apps/frontend/src/index.js",
  "repository": "https://git.bthlabs.pl/tomekwojcik/hotpocket",
--- a/services/backend/pyproject.toml
+++ b/services/backend/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hotpocket-backend"
-version = "25.11.19"
+version = "25.11.26"
 description = "HotPocket Backend"
 authors = ["Tomek Wójcik <contact@bthlabs.pl>"]
 license = "Apache-2.0"
--- a/services/backend/tests/ui/views/rpc/saves/test_create.py
+++ b/services/backend/tests/ui/views/rpc/saves/test_create.py
@@ -54,8 +54,12 @@ def test_ok(authenticated_client: Client,
    call_result = result.json()
    assert 'error' not in call_result

-    save_pk = uuid.UUID(call_result['result']['target_uuid'])
    association_pk = uuid.UUID(call_result['result']['id'])
+    save_pk = uuid.UUID(call_result['result']['target_uuid'])
+
+    assert call_result['result']['url'].endswith(reverse(
+        'ui.associations.view', args=(association_pk,),
+    ))

    AssociationsTestingService().assert_created(
        pk=association_pk,
--- a/services/extension/assets/_locales/en/messages.json
+++ b/services/extension/assets/_locales/en/messages.json
@@ -30,5 +30,9 @@
  "content_popup_content_error_message": {
    "message": "HotPocket couldn't complete this operation.",
    "description": "Title of the error content popup."
+  },
+  "content_popup_content_view_button_message": {
+    "message": "View in HotPocket",
+    "description": "Title of the view link button"
  }
 }
--- a/services/extension/package.json
+++ b/services/extension/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hotpocket-extension",
-  "version": "25.11.19",
+  "version": "25.11.26",
  "description": "HotPocket Extension",
  "main": "src/index.js",
  "repository": "https://git.bthlabs.pl/tomekwojcik/hotpocket",
--- a/services/extension/pyproject.toml
+++ b/services/extension/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hotpocket-extension"
-version = "25.11.19"
+version = "25.11.26"
 description = "HotPocket Extension"
 authors = ["Tomek Wójcik <contact@bthlabs.pl>"]
 license = "Apache-2.0"
--- a/services/extension/src/background/main.js
+++ b/services/extension/src/background/main.js
@@ -117,10 +117,10 @@ const doSave = async (accessToken, tab) => {
  );

  if (error !== null) {
-    return false;
+    return null;
  }

-  return true;
+  return result;
 };

 const doCreateAndStoreAccessToken = async (authKey) => {
--- a/services/extension/src/content/main.js
+++ b/services/extension/src/content/main.js
@@ -26,7 +26,7 @@ class Popup {

    element.insertAdjacentHTML('beforeend', content);
  };
-  setContent = (content) => {
+  setContent = (content, saveUrl) => {
    const shadow = this.container.shadowRoot;

    const body = shadow.querySelector('.hotpocket-extension-popup-body');
@@ -38,6 +38,13 @@ class Popup {
        i18nElement.dataset.message,
      );
    }
+
+    if (saveUrl) {
+      const viewLink = shadow.querySelector('.hotpocket-extension-popup-view');
+      if (viewLink) {
+        viewLink.href = saveUrl;
+      }
+    }
  };
  close = () => {
    this.clearCloseTimeout();
@@ -47,7 +54,7 @@ class Popup {
      this.container = null;
    }
  };
-  show = (content) => {
+  show = (content, saveUrl) => {
    this.close();

    this.container = document.createElement('div');
@@ -57,7 +64,7 @@ class Popup {
    const shadow = this.container.attachShadow({mode: 'open'});
    shadow.setHTMLUnsafe(POPUP);

-    this.setContent(content);
+    this.setContent(content, saveUrl);

    const closeElements = shadow.querySelectorAll('.hotpocket-extension-popup-close');
    for (const closeElement of closeElements) {
@@ -66,8 +73,8 @@ class Popup {

    document.body.appendChild(this.container);
  };
-  update = (content) => {
-    this.setContent(content);
+  update = (content, saveUrl) => {
+    this.setContent(content, saveUrl);
  };
  onCloseClick = (event) => {
    this.close();
@@ -86,16 +93,16 @@ const doHandleBrowserActionClickedMessage = (message) => {
 };

 const doHandleSaveMessage = (message) => {
-  let content = POPUP_CONTENT_ERROR;
-  if (message.result === true) {
-    content = POPUP_CONTENT_SUCCESS;
+  let content = POPUP_CONTENT_SUCCESS;
+  if (message.result === null) {
+    content = POPUP_CONTENT_ERROR;
  }

  if (currentPopup === null) {
    currentPopup = new Popup();
    currentPopup.show(content);
  } else {
-    currentPopup.update(content);
+    currentPopup.update(content, (message.result || {}).url);
  }
 };

--- a/services/extension/src/content/preauth.html
+++ b/services/extension/src/content/preauth.html
--- a/services/extension/src/content/templates/popup.html
+++ b/services/extension/src/content/templates/popup.html
@@ -94,6 +94,26 @@
   opacity: 0.83;
   transform: rotate(60deg);
 }
+.hotpocket-extension-popup-view {
+  background-color: #1CBAED;
+  border: 1px solid #1CBAED;
+  border-radius: 0.25rem;
+  color: white;
+  display: inline-block;
+  font-size: 0.875rem;
+  line-height: 1.25;
+  margin-top: 0.25rem !important;
+  padding: 0.25rem 0.5rem;
+  text-decoration: none;
+}
+.hotpocket-extension-popup-view:hover {
+  background-color: #189ec9;
+  border-color: #1695be;
+}
+.hotpocket-extension-popup-view:active {
+  background-color: #1695be;
+  border-color: #158cb2;
+}
@keyframes hotpocket-extension-popup-loader-animation {
  100% {transform: rotate(1turn)}
 }
@@ -104,6 +124,6 @@
    <strong>HotPocket by BTHLabs</strong>
    <a class="hotpocket-extension-popup-close">&times;</a>
  </div>
-  <div class="hotpocket-extension-popup-body">
+  <div class="hotpocket-extension-popup-body hotpocket-extension-popup-message-success">
  </div>
 </div>
--- a/services/extension/src/content/templates/popup_content_success.html
+++ b/services/extension/src/content/templates/popup_content_success.html
@@ -2,4 +2,13 @@
  <strong data-message="content_popup_content_success_title"></strong>
  <br>
  <span data-message="content_popup_content_success_message"></span>
+  <br>
+  <a
+    class="hotpocket-extension-popup-view"
+    data-message="content_popup_content_view_button_message"
+    href="#"
+    rel="noopener noreferrer"
+    target="_blank"
+  >
+  </a>
 </p>
--- a/services/extension/src/manifest/common.json
+++ b/services/extension/src/manifest/common.json
@@ -3,7 +3,7 @@
  "default_locale": "en",
  "name": "__MSG_extension_name__",
  "description": "__MSG_extension_description__",
-  "version": "25.11.19",
+  "version": "25.11.26",
  "icons": {
    "16": "images/icon-16.png",
    "32": "images/icon-32.png",
--- a/services/extension/tasks.py
+++ b/services/extension/tasks.py
@@ -3,7 +3,6 @@

 from __future__ import annotations

-import json
 import os
 import typing

@@ -14,7 +13,10 @@ import werkzeug
 import werkzeug.routing

 from hotpocket_workspace_tools import get_workspace_mode
-from hotpocket_workspace_tools.tasks import bump_version, get_version  # noqa: F401
+from hotpocket_workspace_tools.tasks import (  # noqa: F401
+    bump_version,
+    get_version,
+)

 WORKSPACE_MODE = get_workspace_mode()
Author	SHA1	Message	Date
Tomek Wójcik	1e549d3fc2	Release v25.11.26 All checks were successful Production deployment / Build (release) Successful in 32s Details CI / Checks (push) Successful in 2m20s Details Staging deployment / Build (release) Successful in 1m9s Details Staging deployment / Deploy (release) Successful in 1m10s Details Production deployment / Deploy (release) Successful in 2m25s Details	2025-11-27 17:52:16 +01:00
Tomek Wójcik	55126f4af6	BTHLABS-66: Prepping for public release: Take five AKA "Using Apple reviewers as QA for your project". Thanks, y'all! :)	2025-11-27 17:51:19 +01:00
Tomek Wójcik	cca49f2292	BTHLABS-66: Prepping for public release: Take four Apple gonna Apple... ;)	2025-11-25 12:54:52 +01:00
Tomek Wójcik	23f8296659	BTHLABS-66: Prepping for public release: Take three I smell a drastic change to auth flow in the Mac app... Let's see if it gets approved this time :D.	2025-11-21 21:04:28 +01:00
Tomek Wójcik	9abed01e53	BTHLABS-0000: Code cleanup	2025-11-20 20:34:42 +01:00