π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Restore query-token public album links
Anand Baburajan167dd6767324
diff --git a/docs/docs/photos/faq/sharing-and-collaboration.md b/docs/docs/photos/faq/sharing-and-collaboration.mdindex 1bfb5c563b..3dcb9998f2 100644--- a/docs/docs/photos/faq/sharing-and-collaboration.md+++ b/docs/docs/photos/faq/sharing-and-collaboration.md@@ -83,13 +83,13 @@ Yes! Ente's custom domains feature lets you serve your public album links usingFor example, instead of:```-https://albums.ente.com/...#...+https://albums.ente.com/?t=...#...```You can use:```-https://pics.example.org/...#...+https://pics.example.org/?t=...#...```**Requirements:**@@ -650,7 +650,7 @@ Create a public link for your album, then add an iframe to your HTML with the UR```html<iframe- src="https://embed.ente.com/...#..."+ src="https://embed.ente.com/?t=...#..."width="800"height="600"frameborder="0"@@ -670,7 +670,7 @@ If you're using the easy method (copy embed HTML button), the app automaticallyIf you're creating the embed code manually and have a custom domain configured:- Replace your custom domain with `embed.ente.com` in the iframe src-- For example: `https://embed.ente.com/...#...` (not `https://pics.example.org/...#...`)+- For example: `https://embed.ente.com/?t=...#...` (not `https://pics.example.org/?t=...#...`)The embed will still work perfectly - it's just served from the embed subdomain instead of your custom domain.diff --git a/docs/docs/photos/features/sharing-and-collaboration/custom-domains/index.md b/docs/docs/photos/features/sharing-and-collaboration/custom-domains/index.mdindex 0aa204683e..e92228db65 100644--- a/docs/docs/photos/features/sharing-and-collaboration/custom-domains/index.md+++ b/docs/docs/photos/features/sharing-and-collaboration/custom-domains/index.md@@ -10,13 +10,13 @@ Custom domains allow you to serve your public links with your own personalized dFor example, if I have an Ente album and wish to share it with my friends, I can open the album's sharing settings and create a public link. When I copy this link, it will be of the form of```-https://albums.ente.com/...#...+https://albums.ente.com/?t=...#...```The custom domains feature allows you to instead create a link that uses your own domain, say```-https://pics.example.org/...#...+https://pics.example.org/?t=...#...```You don't need to run any servers or manage any services, Ente will still host and serve your album for you, the only thing that changes is that you can serve your links using your personalized domain.diff --git a/docs/docs/photos/features/sharing-and-collaboration/embed.md b/docs/docs/photos/features/sharing-and-collaboration/embed.mdindex fcf3066a07..ac5b576100 100644--- a/docs/docs/photos/features/sharing-and-collaboration/embed.md+++ b/docs/docs/photos/features/sharing-and-collaboration/embed.md@@ -48,7 +48,7 @@ First, you need to create a public link for the album you want to embed:1. Open the album in Ente (web or mobile app)2. Open the album's sharing settings3. Create a public link-4. Copy the link (it will look like `https://albums.ente.com/...#...`)+4. Copy the link (it will look like `https://albums.ente.com/?t=...#...`)#### Step 2 - Add iframe to your website@@ -56,7 +56,7 @@ Add an iframe to your HTML with the public link as the source, replacing `albums```html<iframe- src="https://embed.ente.com/...#..."+ src="https://embed.ente.com/?t=...#..."width="800"height="600"frameborder="0"@@ -98,7 +98,7 @@ You can customize the appearance by adjusting the iframe attributes:style="position: relative; padding-bottom: 75%; height: 0; overflow: hidden;"><iframe- src="https://embed.ente.com/...#..."+ src="https://embed.ente.com/?t=...#..."style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;"frameborder="0"allowfullscreendiff --git a/docs/docs/photos/features/sharing-and-collaboration/public-links.md b/docs/docs/photos/features/sharing-and-collaboration/public-links.mdindex a8159ea3de..5cb78f7b6d 100644--- a/docs/docs/photos/features/sharing-and-collaboration/public-links.md+++ b/docs/docs/photos/features/sharing-and-collaboration/public-links.md@@ -199,7 +199,7 @@ Learn more in the [Collaboration guide](/photos/features/sharing-and-collaboratiUse your own domain instead of `albums.ente.com` for your public links.-For example: `https://pics.example.org/...#...` instead of `https://albums.ente.com/...#...`+For example: `https://pics.example.org/?t=...#...` instead of `https://albums.ente.com/?t=...#...`Learn more in the [Custom domains guide](/photos/features/sharing-and-collaboration/custom-domains/).diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dartindex e470e70f11..80fbaf253e 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart@@ -1170,7 +1170,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {MaterialPageRoute(builder: (context) => WebPage(widget.title ?? "",- "https://albums.ente.com/$authToken#$albumKey",+ "https://albums.ente.com/?t=$authToken#$albumKey",),),);diff --git a/server/pkg/repo/public/collection_link.go b/server/pkg/repo/public/collection_link.goindex 70283c0b6e..0a72d68673 100644--- a/server/pkg/repo/public/collection_link.go+++ b/server/pkg/repo/public/collection_link.go@@ -38,7 +38,7 @@ func (pcr *CollectionLinkRepo) GetAlbumUrl(app ente.App, token string) string {if app == ente.Locker {return fmt.Sprintf("%s/c/%s", pcr.lockerHost, token)}- return fmt.Sprintf("%s/%s", pcr.albumHost, token)+ return fmt.Sprintf("%s/?t=%s", pcr.albumHost, token)}func (pcr *CollectionLinkRepo) Insert(ctx context.Context,diff --git a/web/packages/media/collection.ts b/web/packages/media/collection.tsindex fd17728d2e..9b2d7f36f9 100644--- a/web/packages/media/collection.ts+++ b/web/packages/media/collection.ts@@ -81,7 +81,7 @@ export const RemoteCollectionUser = z.looseObject({type RemoteCollectionUser = z.infer<typeof RemoteCollectionUser>;export interface PublicURL {- // The URL is of the form "https://albums.ente.com/<token>", without a+ // The URL is of the form "https://albums.ente.com/?t=<token>", without a// fragment. The decryption key is client side only and never reaches// remote; the client appends it as the fragment to form the shareable URL.url: string;