Compare commits

...
10 Commits
Author SHA1 Message Date
Mikescher b36c2215c0 [AUTO] Adjust gitea workflow for private goext dependency
Build Docker and Deploy / Build Docker Container (push) Successful in 3m33s
Build Docker and Deploy / Run Unit-Tests (push) Successful in 6m43s
Build Docker and Deploy / Deploy to Server (push) Successful in 7s
2026-08-09 13:30:12 +02:00
Mikescher 61db95c94d [Web] Add app link
Build Docker and Deploy / Build Docker Container (push) Successful in 2m7s
Build Docker and Deploy / Run Unit-Tests (push) Successful in 7m41s
Build Docker and Deploy / Deploy to Server (push) Successful in 21s
2026-07-22 14:06:57 +02:00
Mikescher 1074749cd0 [WebApp] AccountSwitcher 2026-07-22 13:56:09 +02:00
Mikescher 3759d3f6c6 [WebApp] Show username 2026-07-22 13:43:42 +02:00
Mikescher 1ecc5d7ebd [Server] Fix FTS search
Build Docker and Deploy / Build Docker Container (push) Successful in 2m35s
Build Docker and Deploy / Run Unit-Tests (push) Successful in 4m54s
Build Docker and Deploy / Deploy to Server (push) Successful in 18s
2026-07-09 18:19:40 +02:00
Mikescher 0282bc0f0a show message timestamp in local tz
Build Docker and Deploy / Build Docker Container (push) Successful in 2m18s
Build Docker and Deploy / Run Unit-Tests (push) Successful in 7m46s
Build Docker and Deploy / Deploy to Server (push) Successful in 14s
2026-06-26 09:20:07 +02:00
Mikescher bff8257f34 More flutter upgrades
Build Docker and Deploy / Build Docker Container (push) Successful in 1m4s
Build Docker and Deploy / Run Unit-Tests (push) Successful in 7m40s
Build Docker and Deploy / Deploy to Server (push) Successful in 7s
2026-05-31 04:49:17 +02:00
Mikescher bb34f3b2b4 Flutter Fixes etc
Build Docker and Deploy / Build Docker Container (push) Successful in 1m7s
Build Docker and Deploy / Run Unit-Tests (push) Failing after 7m34s
Build Docker and Deploy / Deploy to Server (push) Has been skipped
2026-05-31 04:13:13 +02:00
Mikescher 0b7be0908d Upgrade flutter deps 2026-05-31 03:31:02 +02:00
Mikescher 55dc937385 Fix missing links in channel-list
Build Docker and Deploy / Build Docker Container (push) Successful in 2m2s
Build Docker and Deploy / Run Unit-Tests (push) Successful in 7m42s
Build Docker and Deploy / Deploy to Server (push) Successful in 21s
2026-04-08 13:31:23 +02:00
32 changed files with 14432 additions and 14047 deletions
+9 -5
View File
@@ -3,7 +3,9 @@ plugins {
// START: FlutterFire Configuration
id 'com.google.gms.google-services'
// END: FlutterFire Configuration
id "kotlin-android"
// Kotlin is provided by Flutter's built-in Kotlin support (the flutter-gradle-plugin
// auto-applies kotlin-android). KGP stays declared in settings.gradle so it remains
// on the classpath. See https://docs.flutter.dev/release/breaking-changes/migrate-to-built-in-kotlin/for-app-developers
id "dev.flutter.flutter-gradle-plugin"
}
@@ -42,10 +44,6 @@ android {
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
@@ -75,6 +73,12 @@ android {
}
}
kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}
flutter {
source '../..'
}
+4
View File
@@ -1,3 +1,7 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.enableJetifier=true
# This builtInKotlin flag was added automatically by Flutter migrator
android.builtInKotlin=false
# This newDsl flag was added automatically by Flutter migrator
android.newDsl=false
File diff suppressed because it is too large Load Diff
@@ -1,85 +1,12 @@
library font_awesome_flutter;
import 'package:flutter/widgets.dart';
/// [IconData] for a font awesome brand icon from a code point
///
/// Code points can be obtained from fontawesome.com
class IconDataBrands extends IconData {
const IconDataBrands(int codePoint)
: super(
codePoint,
fontFamily: 'FontAwesomeBrands',
fontPackage: 'font_awesome_flutter',
);
}
/// [IconData] for a font awesome solid icon from a code point
///
/// Code points can be obtained from fontawesome.com
class IconDataSolid extends IconData {
const IconDataSolid(int codePoint)
: super(
codePoint,
fontFamily: 'FontAwesomeSolid',
fontPackage: 'font_awesome_flutter',
);
}
/// [IconData] for a font awesome regular icon from a code point
///
/// Code points can be obtained from fontawesome.com
class IconDataRegular extends IconData {
const IconDataRegular(int codePoint)
: super(
codePoint,
fontFamily: 'FontAwesomeRegular',
fontPackage: 'font_awesome_flutter',
);
}
/// [IconData] for a font awesome light icon from a code point. Only works if
/// light icons (font awesome pro) have been installed.
///
/// Code points can be obtained from fontawesome.com
class IconDataLight extends IconData {
const IconDataLight(int codePoint)
: super(
codePoint,
fontFamily: 'FontAwesomeLight',
fontPackage: 'font_awesome_flutter',
);
}
/// [IconData] for a font awesome duotone icon from a code point. Only works if
/// duotone icons (font awesome pro) have been installed.
///
/// Code points can be obtained from fontawesome.com. Each duotone icon consists
/// of a primary [codePoint] and a [secondary].
class IconDataDuotone extends IconData {
/// Secondary glyph of the duotone icon
///
/// Due to tree-shaking restraints [secondary] cannot be the codepoint itself,
/// but has to be an [IconData] object.
final IconData? secondary;
const IconDataDuotone(int codePoint, {this.secondary})
: super(
codePoint,
fontFamily: 'FontAwesomeDuotone',
fontPackage: 'font_awesome_flutter',
);
}
/// [IconData] for a font awesome thin icon from a code point. Only works if
/// thin icons (font awesome pro, v6+) have been installed.
///
/// Code points can be obtained from fontawesome.com
class IconDataThin extends IconData {
const IconDataThin(int codePoint)
: super(
codePoint,
fontFamily: 'FontAwesomeThin',
fontPackage: 'font_awesome_flutter',
);
}
// NOTE:
// This file previously declared IconDataBrands / IconDataSolid / IconDataRegular
// / IconDataLight / IconDataThin / IconDataDuotone as subclasses of [IconData].
// Newer Flutter SDKs mark [IconData] as a `final class`, which can no longer be
// extended outside its own library, so those subclasses no longer compile.
//
// The generated icon constants in `font_awesome_flutter.dart` now construct
// plain `const IconData(..., fontFamily: '<FontAwesome...>', fontPackage:
// 'font_awesome_flutter')` directly, so these helper subclasses are no longer
// needed. Using const [IconData] literals also keeps icon tree-shaking working.
@@ -98,7 +98,7 @@ class _SCNNavLayoutState extends State<SCNNavLayout> {
selectedIndex: _selectedIndex,
onTabSelected: _onItemTapped,
color: Theme.of(context).disabledColor,
selectedColor: Theme.of(context).primaryColorDark,
selectedColor: Theme.of(context).colorScheme.primary,
notchedShape: const AutomaticNotchedShape(
RoundedRectangleBorder(
borderRadius: BorderRadius.only(
+1 -1
View File
@@ -31,7 +31,7 @@ class SCNScaffold extends StatelessWidget {
showShare: showShare,
onShare: onShare ?? () {},
),
body: child,
body: SafeArea(child: child),
floatingActionButton: floatingActionButton,
);
}
-1
View File
@@ -132,7 +132,6 @@ void main() async {
requestAlertPermission: true,
requestBadgePermission: true,
requestSoundPermission: true,
onDidReceiveLocalNotification: receiveLocalDarwinNotification,
notificationCategories: getDarwinNotificationCategories(),
);
final initializationSettingsLinux = LinuxInitializationSettings(defaultActionName: 'Open notification');
-5
View File
@@ -107,11 +107,6 @@ Future<void> _receiveMessage(RemoteMessage message, bool foreground) async {
}
}
void receiveLocalDarwinNotification(int id, String? title, String? body, String? payload) {
//TODO iOS?
ApplicationLog.info('Received local notification<darwin>: $id -> [$title]');
}
void receiveLocalNotification(NotificationResponse details) {
// User has tapped a flutter_local notification, while the app was running
ApplicationLog.info('Tapped local notification: [[${details.id} | ${details.actionId} | ${details.input} | ${details.notificationResponseType} | ${details.payload}]]');
@@ -69,65 +69,74 @@ class _ChannelListItemState extends State<ChannelListItem> {
margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
color: Theme.of(context).cardTheme.color,
child: InkWell(
onTap: () {
if (widget.mode == ChannelListItemMode.Messages) {
Navi.push(context, () => ChannelMessageViewPage(channel: widget.channel));
} else {
Navi.push(context, () => ChannelViewPage(channelID: widget.channel.channelID, preloadedData: (widget.channel, widget.subscription), needsReload: widget.onChannelListReloadTrigger));
}
},
child: Padding(
padding: const EdgeInsets.all(8),
child: Row(
children: [
_buildIcon(context),
SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
Expanded(
child: Text(
widget.channel.displayName,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
Text(
(widget.channel.timestampLastSent == null) ? '' : dateFormat.format(DateTime.parse(widget.channel.timestampLastSent!).toLocal()),
style: const TextStyle(fontSize: 14),
),
],
),
SizedBox(height: 4),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(child: (widget.mode == ChannelListItemMode.Messages) ? Text(_preformatTitle(lastMessage), style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160))) : _buildSubscriptionStateText(context)),
(widget.mode == ChannelListItemMode.Messages) ? Text(widget.channel.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)) : Text("", style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
],
),
],
),
),
SizedBox(width: 4),
GestureDetector(
child: IntrinsicHeight(
child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: InkWell(
onTap: () {
if (widget.mode == ChannelListItemMode.Messages) {
Navi.push(context, () => ChannelViewPage(channelID: widget.channel.channelID, preloadedData: (widget.channel, widget.subscription), needsReload: widget.onChannelListReloadTrigger));
} else {
Navi.push(context, () => ChannelMessageViewPage(channel: widget.channel));
} else {
Navi.push(context, () => ChannelViewPage(channelID: widget.channel.channelID, preloadedData: (widget.channel, widget.subscription), needsReload: widget.onChannelListReloadTrigger));
}
},
child: Padding(
padding: const EdgeInsets.all(8),
child: (widget.mode == ChannelListItemMode.Messages) ? Icon(FontAwesomeIcons.solidSquareInfo, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24) : Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24),
child: Row(
children: [
_buildIcon(context),
SizedBox(width: 8),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
Expanded(
child: Text(
widget.channel.displayName,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
Text(
(widget.channel.timestampLastSent == null) ? '' : dateFormat.format(DateTime.parse(widget.channel.timestampLastSent!).toLocal()),
style: const TextStyle(fontSize: 14),
),
],
),
SizedBox(height: 4),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(child: (widget.mode == ChannelListItemMode.Messages) ? Text(_preformatTitle(lastMessage), style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160))) : _buildSubscriptionStateText(context)),
(widget.mode == ChannelListItemMode.Messages) ? Text(widget.channel.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)) : Text("", style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
],
),
],
),
),
],
),
),
),
],
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
if (widget.mode == ChannelListItemMode.Messages) {
Navi.push(context, () => ChannelViewPage(channelID: widget.channel.channelID, preloadedData: (widget.channel, widget.subscription), needsReload: widget.onChannelListReloadTrigger));
} else {
Navi.push(context, () => ChannelMessageViewPage(channel: widget.channel));
}
},
child: Padding(
padding: const EdgeInsets.only(left: 12, right: 16),
child: Center(widthFactor: 1.0, child: (widget.mode == ChannelListItemMode.Messages) ? Icon(FontAwesomeIcons.solidSquareInfo, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24) : Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24)),
),
),
],
),
),
);
@@ -31,62 +31,71 @@ class KeyTokenListItem extends StatelessWidget {
margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
color: Theme.of(context).cardTheme.color,
child: InkWell(
onTap: () {
Navi.push(context, () => KeyTokenViewPage(keytokenID: item.keytokenID, preloadedData: item, needsReload: needsReload));
},
child: Padding(
padding: const EdgeInsets.all(8),
child: Row(
children: [
Icon(FontAwesomeIcons.solidGearCode, color: Theme.of(context).colorScheme.outline, size: 32),
SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
Expanded(
child: Text(
item.name,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
Text(
(item.timestampLastUsed == null) ? '' : dateFormat.format(DateTime.parse(item.timestampLastUsed!).toLocal()),
style: const TextStyle(fontSize: 14),
),
],
),
SizedBox(height: 4),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: Text(
"Permissions: " + _formatPermissions(item.permissions, item.allChannels, item.channels),
style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
),
),
Text(item.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
],
),
],
),
),
SizedBox(width: 4),
GestureDetector(
child: IntrinsicHeight(
child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: InkWell(
onTap: () {
Navi.push(context, () => FilteredMessageViewPage(title: item.name, alertText: 'All message sent with the key \'${item.name}\'', filter: MessageFilter(usedKeys: [item.keytokenID])));
Navi.push(context, () => KeyTokenViewPage(keytokenID: item.keytokenID, preloadedData: item, needsReload: needsReload));
},
child: Padding(
padding: const EdgeInsets.all(8),
child: Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24),
child: Row(
children: [
Icon(FontAwesomeIcons.solidGearCode, color: Theme.of(context).colorScheme.outline, size: 32),
SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
Expanded(
child: Text(
item.name,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
Text(
(item.timestampLastUsed == null) ? '' : dateFormat.format(DateTime.parse(item.timestampLastUsed!).toLocal()),
style: const TextStyle(fontSize: 14),
),
],
),
SizedBox(height: 4),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: Text(
"Permissions: " + _formatPermissions(item.permissions, item.allChannels, item.channels),
style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
),
),
Text(item.messagesSent.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
],
),
],
),
),
],
),
),
),
],
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Navi.push(context, () => FilteredMessageViewPage(title: item.name, alertText: 'All message sent with the key \'${item.name}\'', filter: MessageFilter(usedKeys: [item.keytokenID])));
},
child: Padding(
padding: const EdgeInsets.only(left: 12, right: 16),
child: Center(widthFactor: 1.0, child: Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24)),
),
),
],
),
),
);
@@ -140,6 +140,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
Widget _buildMessageView(BuildContext context, SCNMessage message, ChannelPreview? channel, KeyTokenPreview? token, UserPreview? user) {
final userAccUserID = context.select<AppAuth, String?>((v) => v.userID);
final dateFormat = context.select<AppSettings, AppSettingsDateFormat>((v) => v.dateFormat).dateFormat();
var cfg = AppSettings();
@@ -229,7 +230,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
}
: null,
),
UI.metaCard(context: context, icon: FontAwesomeIcons.solidTimer, title: 'Timestamp', values: [message.timestamp]),
UI.metaCard(context: context, icon: FontAwesomeIcons.solidTimer, title: 'Timestamp', values: [dateFormat.format(DateTime.parse(message.timestamp).toLocal())]),
if (cfg.showExtendedAttributes)
UI.metaCard(
context: context,
@@ -319,7 +320,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
children: [
UI.channelChip(context: context, text: _resolveChannelName(channel, message), margin: const EdgeInsets.fromLTRB(0, 0, 4, 0), fontSize: 16),
Expanded(child: SizedBox()),
Text(dateFormat.format(DateTime.parse(message.timestamp)), style: const TextStyle(fontSize: 14)),
Text(dateFormat.format(DateTime.parse(message.timestamp).toLocal()), style: const TextStyle(fontSize: 14)),
],
),
SizedBox(height: 8),
@@ -28,58 +28,67 @@ class SenderListItem extends StatelessWidget {
margin: EdgeInsets.fromLTRB(0, 4, 0, 4),
shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(0)),
color: Theme.of(context).cardTheme.color,
child: InkWell(
onTap: () {
Navi.push(context, () => FilteredMessageViewPage(title: item.name, alertText: 'All message sent from \'${item.name!}\'', filter: MessageFilter(senderNames: [item.name])));
},
child: Padding(
padding: const EdgeInsets.all(8),
child: Row(
children: [
Icon(FontAwesomeIcons.solidSignature, color: Theme.of(context).colorScheme.outline, size: 32),
SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
Expanded(
child: Text(
item.name,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
],
),
SizedBox(height: 4),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: Text(
dateFormat.format(DateTime.parse(item.lastTimestamp).toLocal()),
style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
),
),
Text(item.count.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
],
),
],
),
),
SizedBox(width: 4),
GestureDetector(
child: IntrinsicHeight(
child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: InkWell(
onTap: () {
Navi.push(context, () => FilteredMessageViewPage(title: item.name, alertText: 'All message sent from \'${item.name!}\'', filter: MessageFilter(senderNames: [item.name])));
Navi.push(context, () => FilteredMessageViewPage(title: item.name, alertText: 'All message sent from \'${item.name}\'', filter: MessageFilter(senderNames: [item.name])));
},
child: Padding(
padding: const EdgeInsets.all(8),
child: Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24),
child: Row(
children: [
Icon(FontAwesomeIcons.solidSignature, color: Theme.of(context).colorScheme.outline, size: 32),
SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Row(
children: [
Expanded(
child: Text(
item.name,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
],
),
SizedBox(height: 4),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: Text(
dateFormat.format(DateTime.parse(item.lastTimestamp).toLocal()),
style: TextStyle(color: Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(160)),
),
),
Text(item.count.toString(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
],
),
],
),
),
],
),
),
),
],
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Navi.push(context, () => FilteredMessageViewPage(title: item.name, alertText: 'All message sent from \'${item.name}\'', filter: MessageFilter(senderNames: [item.name])));
},
child: Padding(
padding: const EdgeInsets.only(left: 12, right: 16),
child: Center(widthFactor: 1.0, child: Icon(FontAwesomeIcons.solidEnvelopes, color: Theme.of(context).colorScheme.onPrimaryContainer.withAlpha(128), size: 24)),
),
),
],
),
),
);
+72 -72
View File
@@ -149,10 +149,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.4.1"
checked_yaml:
dependency: transitive
description:
@@ -205,10 +205,10 @@ packages:
dependency: transitive
description:
name: cross_file
sha256: "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239"
sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937"
url: "https://pub.dev"
source: hosted
version: "0.3.5"
version: "0.3.5+2"
crypto:
dependency: transitive
description:
@@ -221,10 +221,10 @@ packages:
dependency: "direct main"
description:
name: cupertino_icons
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
url: "https://pub.dev"
source: hosted
version: "1.0.8"
version: "1.0.9"
dart_style:
dependency: transitive
description:
@@ -245,18 +245,18 @@ packages:
dependency: "direct main"
description:
name: device_info_plus
sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
sha256: "6a642e1daa10190af89ba6cb6386c0df7d071a3592080bfe1e44faa63ae1df65"
url: "https://pub.dev"
source: hosted
version: "11.5.0"
version: "13.1.0"
device_info_plus_platform_interface:
dependency: transitive
description:
name: device_info_plus_platform_interface
sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f
sha256: "04b173a92e2d9161dfead145667037c8d834db725ce2e7b942bfe18fd2f45a46"
url: "https://pub.dev"
source: hosted
version: "7.0.3"
version: "8.1.0"
encrypt:
dependency: transitive
description:
@@ -285,10 +285,18 @@ packages:
dependency: transitive
description:
name: ffi
sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.2.0"
ffi_leak_tracker:
dependency: transitive
description:
name: ffi_leak_tracker
sha256: "4093d4ef9ca06ffe2786e73bfb25e22aa92112b9bb4ec941f11e3e6b61489a97"
url: "https://pub.dev"
source: hosted
version: "0.1.2"
file:
dependency: transitive
description:
@@ -378,42 +386,42 @@ packages:
dependency: "direct main"
description:
name: flutter_lazy_indexed_stack
sha256: "3e905c0f130538f686e4e07bb8d0bc0dee6890366c65da199fb356aab52e0bff"
sha256: e5a6c061a336dcb6f6758d63c7d3d40698a4581e766da6de00ed2b8822b15199
url: "https://pub.dev"
source: hosted
version: "0.0.7"
version: "0.1.0"
flutter_lints:
dependency: "direct dev"
description:
name: flutter_lints
sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
url: "https://pub.dev"
source: hosted
version: "5.0.0"
version: "6.0.0"
flutter_local_notifications:
dependency: "direct main"
description:
name: flutter_local_notifications
sha256: "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35"
sha256: ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610
url: "https://pub.dev"
source: hosted
version: "17.2.4"
version: "18.0.1"
flutter_local_notifications_linux:
dependency: transitive
description:
name: flutter_local_notifications_linux
sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af
sha256: "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01"
url: "https://pub.dev"
source: hosted
version: "4.0.1"
version: "5.0.0"
flutter_local_notifications_platform_interface:
dependency: transitive
description:
name: flutter_local_notifications_platform_interface
sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66"
sha256: "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52"
url: "https://pub.dev"
source: hosted
version: "7.2.0"
version: "8.0.0"
flutter_staggered_grid_view:
dependency: transitive
description:
@@ -499,10 +507,10 @@ packages:
dependency: "direct main"
description:
name: http
sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
url: "https://pub.dev"
source: hosted
version: "1.5.0"
version: "1.6.0"
http_multi_server:
dependency: transitive
description:
@@ -519,14 +527,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.1.2"
iconsax_flutter:
dependency: transitive
description:
name: iconsax_flutter
sha256: d14b4cec8586025ac15276bdd40f6eea308cb85748135965bb6255f14beb2564
url: "https://pub.dev"
source: hosted
version: "1.0.1"
image:
dependency: transitive
description:
@@ -635,10 +635,10 @@ packages:
dependency: transitive
description:
name: lints
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df"
url: "https://pub.dev"
source: hosted
version: "5.1.1"
version: "6.1.0"
logging:
dependency: transitive
description:
@@ -651,26 +651,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
url: "https://pub.dev"
source: hosted
version: "0.12.17"
version: "0.12.19"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.dev"
source: hosted
version: "0.11.1"
version: "0.13.0"
meta:
dependency: transitive
description:
name: meta
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.18.0"
mime:
dependency: transitive
description:
@@ -683,10 +683,10 @@ packages:
dependency: "direct main"
description:
name: mobile_scanner
sha256: "0b466a0a8a211b366c2e87f3345715faef9b6011c7147556ad22f37de6ba3173"
sha256: c92c26bf2231695b6d3477c8dcf435f51e28f87b1745966b1fe4c47a286171ce
url: "https://pub.dev"
source: hosted
version: "6.0.11"
version: "7.2.0"
mutex:
dependency: "direct main"
description:
@@ -715,18 +715,18 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
sha256: "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968"
sha256: "4bf625947f6c7713ee242296a682e23e44823c09cf9d79e4f1238923c92db852"
url: "https://pub.dev"
source: hosted
version: "8.3.1"
version: "10.1.0"
package_info_plus_platform_interface:
dependency: transitive
description:
name: package_info_plus_platform_interface
sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
sha256: db762cb2f4f25ee60fb6359773861b0f199e00b90d237bd85a76a1e806b46ef4
url: "https://pub.dev"
source: hosted
version: "3.2.1"
version: "4.1.0"
path:
dependency: "direct main"
description:
@@ -883,34 +883,34 @@ packages:
dependency: "direct main"
description:
name: settings_ui
sha256: d9838037cb554b24b4218b2d07666fbada3478882edefae375ee892b6c820ef3
sha256: "7437c9c867f331ff6c90e951f2333441eab5cf5e654c3a7f3e4aad0c01db51ef"
url: "https://pub.dev"
source: hosted
version: "2.0.2"
version: "3.0.1"
share_plus:
dependency: "direct main"
description:
name: share_plus
sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
sha256: a857d8b1479250aff6b57a51b2c02d31ca05848d441817c43f1640c885c286c0
url: "https://pub.dev"
source: hosted
version: "10.1.4"
version: "13.1.0"
share_plus_platform_interface:
dependency: transitive
description:
name: share_plus_platform_interface
sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
sha256: "7f7ae28cf400d13f811e297ff37742dba83b79e0a6f5dce14eec0248274e6ce9"
url: "https://pub.dev"
source: hosted
version: "5.0.2"
version: "7.1.0"
shared_preferences:
dependency: "direct main"
description:
name: shared_preferences
sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf
url: "https://pub.dev"
source: hosted
version: "2.5.3"
version: "2.5.5"
shared_preferences_android:
dependency: transitive
description:
@@ -1056,10 +1056,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
url: "https://pub.dev"
source: hosted
version: "0.7.6"
version: "0.7.11"
timezone:
dependency: transitive
description:
@@ -1080,10 +1080,10 @@ packages:
dependency: "direct main"
description:
name: toastification
sha256: "69db2bff425b484007409650d8bcd5ed1ce2e9666293ece74dcd917dacf23112"
sha256: "66c96678e3dece8ba24de3ea31634bd65a80aaecb8105f9bafe946e5f0d7590a"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
version: "3.2.0"
typed_data:
dependency: transitive
description:
@@ -1120,10 +1120,10 @@ packages:
dependency: transitive
description:
name: url_launcher_linux
sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
url: "https://pub.dev"
source: hosted
version: "3.2.1"
version: "3.2.2"
url_launcher_macos:
dependency: transitive
description:
@@ -1144,26 +1144,26 @@ packages:
dependency: transitive
description:
name: url_launcher_web
sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
sha256: "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34"
url: "https://pub.dev"
source: hosted
version: "2.4.1"
version: "2.4.3"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
url: "https://pub.dev"
source: hosted
version: "3.1.4"
version: "3.1.5"
uuid:
dependency: "direct main"
description:
name: uuid
sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
url: "https://pub.dev"
source: hosted
version: "4.5.2"
version: "4.5.3"
vector_math:
dependency: transitive
description:
@@ -1216,18 +1216,18 @@ packages:
dependency: transitive
description:
name: win32
sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
sha256: ba6f4bba816c8d7e3c1580e170f3786d216951cc6b94babc3b814c08d2cb2738
url: "https://pub.dev"
source: hosted
version: "5.15.0"
version: "6.3.0"
win32_registry:
dependency: transitive
description:
name: win32_registry
sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
sha256: "73b1d78920a9d6e03f8b4e43e612b87bf3152a0e5c5e5150267762b7c4116904"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "3.0.3"
xdg_directories:
dependency: transitive
description:
@@ -1261,5 +1261,5 @@ packages:
source: hosted
version: "3.1.3"
sdks:
dart: ">=3.9.0 <4.0.0"
flutter: ">=3.35.0"
dart: ">=3.10.0 <4.0.0"
flutter: ">=3.38.1"
+14 -14
View File
@@ -2,7 +2,7 @@ name: simplecloudnotifier
description: "Receive push messages"
publish_to: 'none'
version: 2.2.2+544
version: 2.2.8+553
environment:
sdk: '>=3.9.0 <4.0.0'
@@ -14,31 +14,31 @@ dependencies:
flutter_launcher_icons: ^0.14.3
font_awesome_flutter: '>= 4.7.0'
cupertino_icons: ^1.0.2
http: ^1.2.0
cupertino_icons: ^1.0.9
http: ^1.6.0
provider: ^6.1.1
shared_preferences: ^2.2.2
shared_preferences: ^2.5.5
qr_flutter: ^4.1.0
url_launcher: ^6.2.4
infinite_scroll_pagination: ^4.0.0
intl: ^0.20.2
path_provider: ^2.1.3
hive_flutter: ^1.1.0
package_info_plus: ^8.0.0
package_info_plus: ^10.1.0
xid: ^1.2.1
flutter_lazy_indexed_stack: ^0.0.6
flutter_lazy_indexed_stack: ^0.1.0
firebase_core: ^3.13.0
firebase_messaging: ^15.2.5
device_info_plus: ^11.3.0
toastification: ^3.0.1
uuid: ^4.4.0
share_plus: ^10.1.4
flutter_local_notifications: ^17.2.3
device_info_plus: ^13.1.0
toastification: ^3.2.0
uuid: ^4.5.3
share_plus: ^13.1.0
flutter_local_notifications: ^18.0.0
path: any
mobile_scanner: ^6.0.1
settings_ui: ^2.0.2
mobile_scanner: ^7.2.0
settings_ui: ^3.0.1
git_stamp: ^5.10.0
action_slider: ^0.7.0
mutex: ^3.1.0
@@ -52,7 +52,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter_lints: ^6.0.0
hive_generator: ^2.0.1
build_runner: ^2.1.4
+7
View File
@@ -0,0 +1,7 @@
-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
QyNTUxOQAAACCidGFcYZJGOE5rMRDoNC1Onx5viMJ2gSyrPKG/YK7lJwAAAJiWNW/cljVv
3AAAAAtzc2gtZWQyNTUxOQAAACCidGFcYZJGOE5rMRDoNC1Onx5viMJ2gSyrPKG/YK7lJw
AAAECzRf/pqBmG4e0SkaIYTyBkXz/zKNxP4got/q3oKkraV6J0YVxhkkY4TmsxEOg0LU6f
Hm+IwnaBLKs8ob9gruUnAAAAEnJvYmlud0BiZmIyMDIzMDAwMwECAw==
-----END OPENSSH PRIVATE KEY-----
+1
View File
@@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJ0YVxhkkY4TmsxEOg0LU6fHm+IwnaBLKs8ob9gruUn gnecht@bfb
+2
View File
@@ -0,0 +1,2 @@
[url "ssh://git@git.blackforestbytes.com/BlackForestBytes/goext"]
insteadOf = https://git.blackforestbytes.com/BlackForestBytes/goext
+1
View File
@@ -0,0 +1 @@
git.blackforestbytes.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQ5uGWtRDqXF8A2FP69pPKayYYSazT+Ls/EjpNxczIpHyhpGUOvTH7GC4BMl8rBW6EVEsjPGGVIFJz3x3M1LmIwllj1+XgKQOSGdY/cRNYJDcLWMdG2eCC7gL2nIQwngMnwSs0WkIaG804X0Suq3iPftU8QRiPZTC2yTMFGbbDqF5Una8LGHzjZwZWT+pZqKh8qxVswjlrMQaS8nlCTDnB3ri4hMtp/Hc+1x/8NtvKZmBrbIgydntIN69tAavQTgAyRJIwAMy8cD8P1WizsJChlDdyI+g4WWDULgH+bA6mqrzo4YWflGpY0L1qgmPCGSSXcbb0UdNnEucpB72RPBcx
+9
View File
@@ -8,6 +8,15 @@ RUN apt-get update && \
pip install virtualenv && \
rm -rf /var/lib/apt/lists/*
# setup for private deps
RUN apt-get update && apt-get install -y --no-install-recommends git openssh-client && rm -rf /var/lib/apt/lists/*
COPY .secrets/deps-key /root/.ssh/id_ed25519
COPY .secrets/deps-key.pub /root/.ssh/id_ed25519.pub
RUN chmod 600 /root/.ssh/id_ed25519
COPY .secrets/known_hosts /root/.ssh/known_hosts
COPY .secrets/gitconfig /root/.gitconfig
ENV GOPRIVATE="git.blackforestbytes.com/*"
COPY . /buildsrc
RUN cd /buildsrc && cp "scn_send.sh" "../scn_send.sh" && make build
+8 -2
View File
@@ -119,11 +119,17 @@ func (h APIHandler) ListMessages(pctx ginext.PreContext) ginext.HTTPResponse {
}
if len(q.Search) != 0 {
filter.SearchStringFTS = langext.Ptr(langext.ArrMap(q.Search, func(v string) string { return strings.TrimSpace(v) }))
searchTerms := langext.ArrFilter(langext.ArrMap(q.Search, func(v string) string { return strings.TrimSpace(v) }), func(v string) bool { return v != "" })
if len(searchTerms) != 0 {
filter.SearchStringFTS = langext.Ptr(searchTerms)
}
}
if len(q.StringSearch) != 0 {
filter.SearchStringPlain = langext.Ptr(langext.ArrMap(q.StringSearch, func(v string) string { return strings.TrimSpace(v) }))
searchTerms := langext.ArrFilter(langext.ArrMap(q.StringSearch, func(v string) string { return strings.TrimSpace(v) }), func(v string) bool { return v != "" })
if len(searchTerms) != 0 {
filter.SearchStringPlain = langext.Ptr(searchTerms)
}
}
if len(q.Channels) != 0 {
+43 -4
View File
@@ -4,13 +4,15 @@ import (
"crypto/sha512"
"encoding/hex"
"fmt"
"strconv"
"strings"
"time"
"unicode"
"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
"git.blackforestbytes.com/BlackForestBytes/goext/mathext"
"git.blackforestbytes.com/BlackForestBytes/goext/sq"
"strconv"
"strings"
"time"
)
type MessageFilter struct {
@@ -219,7 +221,7 @@ func (f MessageFilter) SQL() (string, string, sq.PP, error) {
if f.SearchStringFTS != nil {
filter := make([]string, 0)
for _, v := range *f.SearchStringFTS {
filter = append(filter, fmt.Sprintf("(messages_fts match :%s)", params.Add(v)))
filter = append(filter, fmt.Sprintf("(messages_fts match :%s)", params.Add(sanitizeFTSMatchQuery(v))))
}
sqlClauses = append(sqlClauses, "("+strings.Join(filter, " OR ")+")")
}
@@ -246,6 +248,43 @@ func (f MessageFilter) SQL() (string, string, sq.PP, error) {
return sqlClause, joinClause, params, nil
}
// sanitizeFTSMatchQuery converts an arbitrary user-provided search string into a valid FTS5 MATCH query.
// It preserves explicit "quoted phrases" typed by the user and wraps every other whitespace-separated word
// in double-quotes, so that FTS5 special characters ( - : * ^ ( ) AND OR NOT NEAR ... ) inside plain search
// terms are treated as literal text instead of query operators.
func sanitizeFTSMatchQuery(s string) string {
out := make([]string, 0)
buf := strings.Builder{}
inQuote := false
flush := func() {
if buf.Len() > 0 {
out = append(out, `"`+strings.ReplaceAll(buf.String(), `"`, `""`)+`"`)
buf.Reset()
}
}
for _, r := range s {
switch {
case r == '"':
// a double-quote opens or closes an explicit phrase; flush the pending word either way
flush()
inQuote = !inQuote
case !inQuote && unicode.IsSpace(r):
flush()
default:
buf.WriteRune(r)
}
}
flush() // trailing word or an unterminated phrase
if len(out) == 0 {
return `""` // valid FTS5 query that simply matches nothing
}
return strings.Join(out, " ")
}
func (f MessageFilter) Hash() string {
bh, err := dataext.StructHash(f, dataext.StructHashOptions{HashAlgo: sha512.New()})
if err != nil {
+5
View File
@@ -830,6 +830,11 @@ func TestListMessagesSearch(t *testing.T) {
{"search=the(2)", 17, fmt.Sprintf("/api/v2/messages?search=%s", url.QueryEscape("THE"))},
{"search=please", 9, fmt.Sprintf("/api/v2/messages?search=%s", url.QueryEscape("please"))},
{"search=11pm", 2, fmt.Sprintf("/api/v2/messages?search=%s", url.QueryEscape("\"11:00pm\""))},
{"search=hyphen", 0, fmt.Sprintf("/api/v2/messages?search=%s", url.QueryEscape("yt-backup"))},
{"search=colon", 0, fmt.Sprintf("/api/v2/messages?search=%s", url.QueryEscape("foo:bar"))},
{"search=NOT", 0, fmt.Sprintf("/api/v2/messages?search=%s", url.QueryEscape("NOT"))},
{"search=empty", 22, fmt.Sprintf("/api/v2/messages?search=%s", url.QueryEscape(""))},
}
for _, testdata := range filterTests {
+23
View File
@@ -128,6 +128,29 @@ body
text-align: center;
}
#tr_links
{
position: absolute;
top: 0;
right: 0;
margin: -1px -1px 0 0;
display: flex;
gap: 1rem;
align-items: flex-start;
}
#tr_links .edge-btn
{
position: static;
margin: 0;
}
#tr_link_web
{
min-width: 40px;
text-align: center;
}
#tl_link1
{
top: 0;
+4 -1
View File
@@ -17,7 +17,10 @@
<a tabindex="-1" href="https://play.google.com/store/apps/details?id=com.blackforestbytes.simplecloudnotifier" class="button bordered edge-btn" id="tl_link1"><span class="icn-google-play"></span></a>
<a tabindex="-1" href="https://apps.apple.com/us/app/simplecloudnotifier/id6455594868" class="button bordered edge-btn" id="tl_link2"><span class="icn-app-store"></span></a>
<a tabindex="-1" href="/api" class="button bordered edge-btn" id="tr_link">API</a>
<div id="tr_links">
<a tabindex="-1" href="https://app.simplecloudnotifier.de" class="button bordered edge-btn" id="tr_link_web">Web</a>
<a tabindex="-1" href="/api" class="button bordered edge-btn" id="tr_link">API</a>
</div>
<a tabindex="-1" href="/" class="linkcaption"><h1>Simple Cloud Notifier</h1></a>
+2
View File
@@ -45,6 +45,7 @@ import {
PlayCircleOutline,
StopOutline,
ArrowLeftOutline,
DownOutline,
} from '@ant-design/icons-angular/icons';
import { routes } from './app.routes';
@@ -91,6 +92,7 @@ const icons: IconDefinition[] = [
PlayCircleOutline,
StopOutline,
ArrowLeftOutline,
DownOutline,
];
export const appConfig: ApplicationConfig = {
+117 -21
View File
@@ -1,54 +1,150 @@
import { Injectable, signal, computed } from '@angular/core';
const USER_ID_KEY = 'scn_user_id';
const ADMIN_KEY_KEY = 'scn_admin_key';
export interface Account {
userId: string;
adminKey: string;
username: string | null;
}
const ACCOUNTS_KEY = 'scn_accounts';
const ACTIVE_KEY = 'scn_active_user_id';
// Legacy single-account storage keys (migrated on first load).
const LEGACY_USER_ID_KEY = 'scn_user_id';
const LEGACY_ADMIN_KEY_KEY = 'scn_admin_key';
@Injectable({
providedIn: 'root'
})
export class AuthService {
private userId = signal<string | null>(null);
private adminKey = signal<string | null>(null);
private _accounts = signal<Account[]>([]);
private _activeUserId = signal<string | null>(null);
isAuthenticated = computed(() => !!this.userId() && !!this.adminKey());
/** All logged-in accounts. */
accounts = this._accounts.asReadonly();
activeUserId = this._activeUserId.asReadonly();
activeAccount = computed(() => {
const id = this._activeUserId();
return this._accounts().find(a => a.userId === id) ?? null;
});
isAuthenticated = computed(() => !!this.activeAccount());
constructor() {
this.loadFromStorage();
}
private loadFromStorage(): void {
const userId = localStorage.getItem(USER_ID_KEY);
const adminKey = localStorage.getItem(ADMIN_KEY_KEY);
if (userId && adminKey) {
this.userId.set(userId);
this.adminKey.set(adminKey);
const raw = localStorage.getItem(ACCOUNTS_KEY);
if (raw) {
try {
const parsed = JSON.parse(raw);
if (Array.isArray(parsed)) {
this._accounts.set(
parsed
.filter(a => a && a.userId && a.adminKey)
.map(a => ({ userId: a.userId, adminKey: a.adminKey, username: a.username ?? null }))
);
}
} catch {
// Ignore malformed storage; treat as logged out.
}
}
let active = localStorage.getItem(ACTIVE_KEY);
// Migrate legacy single-account storage into the multi-account format.
if (this._accounts().length === 0) {
const legacyId = localStorage.getItem(LEGACY_USER_ID_KEY);
const legacyKey = localStorage.getItem(LEGACY_ADMIN_KEY_KEY);
if (legacyId && legacyKey) {
this._accounts.set([{ userId: legacyId, adminKey: legacyKey, username: null }]);
active = legacyId;
localStorage.removeItem(LEGACY_USER_ID_KEY);
localStorage.removeItem(LEGACY_ADMIN_KEY_KEY);
this.persist(active);
}
}
// Ensure the active pointer references an existing account.
if (!active || !this._accounts().some(a => a.userId === active)) {
active = this._accounts()[0]?.userId ?? null;
}
this._activeUserId.set(active);
}
private persist(activeOverride?: string | null): void {
localStorage.setItem(ACCOUNTS_KEY, JSON.stringify(this._accounts()));
const active = activeOverride !== undefined ? activeOverride : this._activeUserId();
if (active) {
localStorage.setItem(ACTIVE_KEY, active);
} else {
localStorage.removeItem(ACTIVE_KEY);
}
}
/** Add (or update) an account and make it the active one. */
login(userId: string, adminKey: string): void {
localStorage.setItem(USER_ID_KEY, userId);
localStorage.setItem(ADMIN_KEY_KEY, adminKey);
this.userId.set(userId);
this.adminKey.set(adminKey);
if (this._accounts().some(a => a.userId === userId)) {
this._accounts.update(list =>
list.map(a => (a.userId === userId ? { ...a, adminKey } : a))
);
} else {
this._accounts.update(list => [...list, { userId, adminKey, username: null }]);
}
this._activeUserId.set(userId);
this.persist();
}
/** Log out the currently active account. */
logout(): void {
localStorage.removeItem(USER_ID_KEY);
localStorage.removeItem(ADMIN_KEY_KEY);
this.userId.set(null);
this.adminKey.set(null);
const active = this._activeUserId();
if (active) {
this.removeAccount(active);
}
}
/** Log out a specific account (active or background). */
logoutAccount(userId: string): void {
this.removeAccount(userId);
}
private removeAccount(userId: string): void {
this._accounts.update(list => list.filter(a => a.userId !== userId));
if (this._activeUserId() === userId) {
this._activeUserId.set(this._accounts()[0]?.userId ?? null);
}
this.persist();
}
/** Switch which logged-in account is active. */
switchAccount(userId: string): void {
if (!this._accounts().some(a => a.userId === userId)) return;
this._activeUserId.set(userId);
this.persist();
}
/** Cache the resolved username on the active account. */
setActiveUsername(username: string | null): void {
const active = this._activeUserId();
if (!active) return;
this._accounts.update(list =>
list.map(a => (a.userId === active ? { ...a, username } : a))
);
this.persist();
}
getUserId(): string | null {
return this.userId();
return this._activeUserId();
}
getAdminKey(): string | null {
return this.adminKey();
return this.activeAccount()?.adminKey ?? null;
}
getAuthHeader(): string | null {
const key = this.adminKey();
const key = this.getAdminKey();
return key ? `SCN ${key}` : null;
}
}
@@ -137,7 +137,12 @@ export class AccountInfoComponent implements OnInit {
next: () => {
this.notification.success('Account deleted');
this.authService.logout();
this.router.navigate(['/login']);
if (this.authService.isAuthenticated()) {
// Another account is still logged in — reload into it cleanly.
window.location.assign('/');
} else {
this.router.navigate(['/login']);
}
},
error: () => {
this.deleting.set(false);
@@ -1,6 +1,6 @@
import { Component, inject, signal } from '@angular/core';
import { CommonModule } from '@angular/common';
import { Router, ActivatedRoute } from '@angular/router';
import { ActivatedRoute } from '@angular/router';
import { FormsModule } from '@angular/forms';
import { NzInputModule } from 'ng-zorro-antd/input';
import { NzButtonModule } from 'ng-zorro-antd/button';
@@ -27,7 +27,6 @@ import { isAdminKey } from '../../../core/models';
export class LoginComponent {
private authService = inject(AuthService);
private apiService = inject(ApiService);
private router = inject(Router);
private route = inject(ActivatedRoute);
userId = '';
@@ -56,9 +55,11 @@ export class LoginComponent {
return;
}
// Login successful
// Login successful. Use a full navigation so all per-account state
// (singleton caches, component signals) is initialised for the new
// active account — important when adding a second account.
const returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/messages';
this.router.navigateByUrl(returnUrl);
window.location.assign(returnUrl);
},
error: (err) => {
this.authService.logout();
@@ -50,50 +50,30 @@
</thead>
<tbody>
@for (channel of channels(); track channel.channel_id) {
<tr [class.clickable-row]="isOwned(channel)">
<tr class="clickable-row">
<td>
@if (isOwned(channel)) {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<div class="channel-name">{{ channel.display_name }}</div>
<div class="channel-id mono">{{ channel.channel_id }}</div>
</a>
} @else {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<div class="channel-name">{{ channel.display_name }}</div>
<div class="channel-id mono">{{ channel.channel_id }}</div>
}
</a>
</td>
<td>
@if (isOwned(channel)) {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<span class="mono">{{ channel.internal_name }}</span>
</a>
} @else {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<span class="mono">{{ channel.internal_name }}</span>
}
</a>
</td>
<td>
@if (isOwned(channel)) {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<div class="channel-name">{{ getOwnerDisplayName(channel.owner_user_id) }}</div>
<div class="channel-id mono">{{ channel.owner_user_id }}</div>
</a>
} @else {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<div class="channel-name">{{ getOwnerDisplayName(channel.owner_user_id) }}</div>
<div class="channel-id mono">{{ channel.owner_user_id }}</div>
}
</a>
</td>
<td>
@if (isOwned(channel)) {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<nz-tag [nzColor]="getSubscriptionStatus(channel).color">
{{ getSubscriptionStatus(channel).label }}
</nz-tag>
</a>
} @else {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
<nz-tag [nzColor]="getSubscriptionStatus(channel).color">
{{ getSubscriptionStatus(channel).label }}
</nz-tag>
}
</a>
</td>
<td>
@if (isOwned(channel)) {
@@ -105,32 +85,19 @@
}
</td>
<td>
@if (isOwned(channel)) {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
{{ channel.messages_sent }}
</a>
} @else {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
{{ channel.messages_sent }}
}
</a>
</td>
<td>
@if (isOwned(channel)) {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
@if (channel.timestamp_lastsent) {
<div class="timestamp-absolute">{{ channel.timestamp_lastsent | date:'yyyy-MM-dd HH:mm:ss' }}</div>
<div class="timestamp-relative">{{ channel.timestamp_lastsent | relativeTime }}</div>
} @else {
<span class="text-muted">Never</span>
}
</a>
} @else {
<a class="cell-link" [routerLink]="['/channels', channel.channel_id]">
@if (channel.timestamp_lastsent) {
<div class="timestamp-absolute">{{ channel.timestamp_lastsent | date:'yyyy-MM-dd HH:mm:ss' }}</div>
<div class="timestamp-relative">{{ channel.timestamp_lastsent | relativeTime }}</div>
} @else {
<span class="text-muted">Never</span>
}
}
</a>
</td>
@if (expertMode()) {
<td>
@@ -56,24 +56,25 @@
</span>
</div>
<div class="header-right">
<div class="expert-mode-toggle">
<nz-switch
[ngModel]="expertMode()"
(ngModelChange)="settingsService.setExpertMode($event)"
nzSize="small"
></nz-switch>
<span class="expert-mode-label">Expert</span>
<div
class="account-trigger"
nz-dropdown
nzTrigger="click"
[nzClickHide]="false"
nzPlacement="bottomRight"
[nzDropdownMenu]="accountMenu"
>
<div class="user-info">
@if (username()) {
<span class="username">{{ username() }}</span>
}
<span class="user-id mono">{{ userId }}</span>
@if (currentKey()) {
<span class="key-id mono">{{ currentKey()!.keytoken_id }}</span>
}
</div>
<span nz-icon nzType="down" class="account-caret"></span>
</div>
<div class="user-info">
<span class="user-id mono">{{ userId }}</span>
@if (currentKey()) {
<span class="key-id mono">{{ currentKey()!.keytoken_id }}</span>
}
</div>
<button nz-button nzType="text" nzDanger (click)="logout()">
<span nz-icon nzType="logout"></span>
Logout
</button>
</div>
</nz-header>
<nz-content class="content-area">
@@ -81,3 +82,65 @@
</nz-content>
</nz-layout>
</nz-layout>
<nz-dropdown-menu #accountMenu="nzDropdownMenu">
<div class="account-dropdown">
<!-- Settings -->
<div class="dropdown-section">
<div class="settings-row">
<span class="settings-label">
<span nz-icon nzType="setting"></span>
Expert mode
</span>
<nz-switch
[ngModel]="expertMode()"
(ngModelChange)="settingsService.setExpertMode($event)"
nzSize="small"
></nz-switch>
</div>
</div>
<div class="dropdown-divider"></div>
<!-- Accounts -->
<div class="dropdown-section accounts-section">
@for (acc of accounts(); track acc.userId) {
<div
class="account-item"
[class.active]="acc.userId === userId"
(click)="switchAccount(acc.userId)"
>
<span nz-icon nzType="user" class="account-avatar"></span>
<div class="account-meta">
<span class="account-name">{{ acc.username || acc.userId }}</span>
<span class="account-sub mono">{{ acc.userId }}</span>
</div>
@if (acc.userId === userId) {
<span nz-icon nzType="check" class="account-check"></span>
}
<button
nz-button
nzType="text"
nzSize="small"
nzDanger
class="account-logout"
title="Logout"
(click)="logoutAccount(acc.userId, $event)"
>
<span nz-icon nzType="logout"></span>
</button>
</div>
}
</div>
<div class="dropdown-divider"></div>
<!-- Add account -->
<div class="dropdown-section">
<button nz-button nzType="text" class="add-account-btn" (click)="addAccount()">
<span nz-icon nzType="user-add"></span>
Login with another account
</button>
</div>
</div>
</nz-dropdown-menu>
@@ -51,17 +51,6 @@
align-items: center;
}
.expert-mode-toggle {
display: flex;
align-items: center;
gap: 8px;
.expert-mode-label {
font-size: 13px;
color: #666;
}
}
.header-trigger {
font-size: 18px;
cursor: pointer;
@@ -79,11 +68,49 @@
gap: 16px;
}
// --- Account switcher trigger (in header) ---
.account-trigger {
display: flex;
align-items: center;
gap: 10px;
cursor: pointer;
padding: 6px 10px;
border-radius: 8px;
max-width: 260px;
transition: background 0.2s;
&:hover {
background: rgba(0, 0, 0, 0.04);
}
.account-caret {
font-size: 11px;
color: #999;
flex-shrink: 0;
}
}
.user-info {
display: flex;
flex-direction: column;
align-items: flex-end;
line-height: 1.3;
min-width: 0;
.username,
.user-id,
.key-id {
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.username {
color: #333;
font-size: 13px;
font-weight: 600;
}
.user-id {
color: #666;
@@ -96,6 +123,120 @@
}
}
// --- Account switcher dropdown panel ---
.account-dropdown {
background: #fff;
border-radius: 8px;
box-shadow: 0 6px 24px rgba(0, 0, 0, 0.14);
padding: 6px;
min-width: 260px;
max-width: calc(100vw - 24px);
}
.dropdown-section {
display: flex;
flex-direction: column;
}
.dropdown-divider {
height: 1px;
background: #f0f0f0;
margin: 6px 4px;
}
.settings-row {
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
padding: 8px 10px;
.settings-label {
display: flex;
align-items: center;
gap: 8px;
font-size: 14px;
color: #333;
}
}
.accounts-section {
max-height: 40vh;
overflow-y: auto;
}
.account-item {
display: flex;
align-items: center;
gap: 10px;
padding: 8px 10px;
border-radius: 6px;
cursor: pointer;
transition: background 0.2s;
&:hover {
background: rgba(0, 0, 0, 0.04);
}
&.active {
background: #e6f4ff;
&:hover {
background: #d6ecff;
}
}
.account-avatar {
font-size: 18px;
color: #888;
flex-shrink: 0;
}
.account-meta {
display: flex;
flex-direction: column;
line-height: 1.3;
min-width: 0;
flex: 1;
.account-name {
font-size: 14px;
font-weight: 600;
color: #333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.account-sub {
font-size: 12px;
color: #999;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.account-check {
color: #1890ff;
flex-shrink: 0;
}
.account-logout {
flex-shrink: 0;
}
}
.add-account-btn {
width: 100%;
display: flex;
align-items: center;
justify-content: flex-start;
gap: 8px;
padding: 8px 10px;
height: auto;
}
.content-area {
margin-left: 240px;
transition: margin-left 0.2s;
@@ -116,3 +257,25 @@ nz-layout:has(.ant-layout-sider-collapsed) .content-area {
margin-left: 80px;
}
}
// --- Mobile ---
@media (max-width: 600px) {
.app-header {
padding: 0 12px;
}
.header-right {
gap: 8px;
}
.account-trigger {
max-width: 62vw;
gap: 6px;
padding: 6px;
// Keep the trigger to one identifying line on small screens.
.user-info .key-id {
display: none;
}
}
}
@@ -39,11 +39,14 @@ export class MainLayoutComponent implements OnInit {
isCollapsed = signal(false);
userId = this.authService.getUserId();
accounts = this.authService.accounts;
currentKey = signal<KeyToken | null>(null);
username = signal<string | null>(null);
expertMode = this.settingsService.expertMode;
ngOnInit(): void {
this.loadCurrentKey();
this.loadUser();
}
private loadCurrentKey(): void {
@@ -55,12 +58,44 @@ export class MainLayoutComponent implements OnInit {
});
}
private loadUser(): void {
const userId = this.userId;
if (!userId) return;
this.apiService.getUser(userId).subscribe({
next: (user) => {
this.username.set(user.username);
// Cache the resolved name so the account switcher can label it.
this.authService.setActiveUsername(user.username);
}
});
}
toggleCollapsed(): void {
this.isCollapsed.update(v => !v);
}
logout(): void {
this.authService.logout();
switchAccount(userId: string): void {
if (userId === this.userId) return;
this.authService.switchAccount(userId);
// Full reload so all per-account state (caches, component signals) resets cleanly.
window.location.assign('/');
}
logoutAccount(userId: string, event: Event): void {
event.stopPropagation();
const wasActive = userId === this.authService.getUserId();
this.authService.logoutAccount(userId);
if (!this.authService.isAuthenticated()) {
this.router.navigate(['/login']);
} else if (wasActive) {
window.location.assign('/');
}
// Otherwise a background account was removed; the accounts() signal updates the list.
}
addAccount(): void {
this.router.navigate(['/login']);
}
}