diff --git a/VERSION b/VERSION index 76914dd..e8423da 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.9 +0.4.10 diff --git a/source_clean/VERSION b/source_clean/VERSION index 76914dd..e8423da 100644 --- a/source_clean/VERSION +++ b/source_clean/VERSION @@ -1 +1 @@ -0.4.9 +0.4.10 diff --git a/source_clean/deploy.sh b/source_clean/deploy.sh index d2f20e1..98c4b81 100755 Binary files a/source_clean/deploy.sh and b/source_clean/deploy.sh differ diff --git a/source_clean/src/cloud/credential.service.ts b/source_clean/src/cloud/credential.service.ts index 1ecd168..264dbbe 100644 --- a/source_clean/src/cloud/credential.service.ts +++ b/source_clean/src/cloud/credential.service.ts @@ -35,9 +35,9 @@ function decryptCookie(encrypted: string): string { function extractCookieUid(cookie: string): string { if (!cookie) return ''; - let m = cookie.match(/__uid=([a-zA-Z0-9+/=_-]+)/); + let m = cookie.match(/__uid=([^;]+)/); if (m) return m[1]; - m = cookie.match(/b-user-id=([a-zA-Z0-9-]+)/); + m = cookie.match(/b-user-id=([^;]+)/); if (m) return m[1]; return ''; } diff --git a/source_clean/src/database/database.ts b/source_clean/src/database/database.ts index 921b83f..a7f655f 100755 --- a/source_clean/src/database/database.ts +++ b/source_clean/src/database/database.ts @@ -40,6 +40,7 @@ function runMigrations(db: Database.Database): void { cloud_type TEXT NOT NULL, cookie TEXT, cloud_type_uid TEXT DEFAULT NULL, + cookie_uid TEXT DEFAULT NULL, nickname TEXT, is_active INTEGER NOT NULL DEFAULT 1, storage_used TEXT, @@ -108,6 +109,13 @@ function runMigrations(db: Database.Database): void { value TEXT NOT NULL DEFAULT '', description TEXT, updated_at TEXT NOT NULL DEFAULT (datetime('now', 'localtime')) + CREATE TABLE IF NOT EXISTS push_users ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + account TEXT NOT NULL UNIQUE, + notify_config TEXT, + created_at TEXT NOT NULL DEFAULT (datetime('now','localtime')), + updated_at TEXT NOT NULL DEFAULT (datetime('now','localtime')) + ); ); CREATE TABLE IF NOT EXISTS content_cache ( @@ -209,6 +217,7 @@ function migrateCloudConfigs(db: Database.Database): void { cookie TEXT, cloud_type_uid TEXT DEFAULT NULL, nickname TEXT, + cookie_uid TEXT DEFAULT NULL, is_active INTEGER NOT NULL DEFAULT 1, storage_used TEXT, storage_total TEXT,