- Fix Firefox cookies issue

- Add privacy conset in welcome screen for Firefox extension
raindropio · Nov 5, 2024 · 5fd4d37 · 5fd4d37
1 parent a3abfd6
commit 5fd4d37
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 440 deletions.
diff --git a/build/xcode/Save to Raindrop.io/App/Info.plist b/build/xcode/Save to Raindrop.io/App/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.57</string>
+	<string>5.6.60</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>366</string>
+	<string>367</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/build/xcode/Save to Raindrop.io/Extension/Info.plist b/build/xcode/Save to Raindrop.io/Extension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.6.57</string>
+	<string>5.6.60</string>
 	<key>CFBundleVersion</key>
-	<string>366</string>
+	<string>367</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>

diff --git a/build/xcode/Save to Raindrop.io/Save to Raindrop.io.xcodeproj/project.pbxproj b/build/xcode/Save to Raindrop.io/Save to Raindrop.io.xcodeproj/project.pbxproj
@@ -441,7 +441,7 @@
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 366;
+				CURRENT_PROJECT_VERSION = 367;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -452,7 +452,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.57;
+				MARKETING_VERSION = 5.6.60;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -467,7 +467,7 @@
 				CODE_SIGN_ENTITLEMENTS = Extension/Extension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 366;
+				CURRENT_PROJECT_VERSION = 367;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -478,7 +478,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.57;
+				MARKETING_VERSION = 5.6.60;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari.extension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -497,7 +497,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 366;
+				CURRENT_PROJECT_VERSION = 367;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -508,7 +508,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.57;
+				MARKETING_VERSION = 5.6.60;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -525,7 +525,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 366;
+				CURRENT_PROJECT_VERSION = 367;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7459JWM5TY;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -536,7 +536,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 5.6.57;
+				MARKETING_VERSION = 5.6.60;
 				PRODUCT_BUNDLE_IDENTIFIER = io.raindrop.safari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/...eproj/project.xcworkspace/xcuserdata/exentrich.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/exentrich.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "app",
-	"version": "5.6.60",
+	"version": "5.6.61",
 	"description": "All-in-one bookmark manager",
 	"author": "Rustem Mussabekov",
 	"license": "MIT",

diff --git a/src/assets/target/extension/welcome/index.html b/src/assets/target/extension/welcome/index.html
@@ -28,6 +28,18 @@ <h2>
             </h2>
             <div class="spacer"></div>
             <div class="scroll-icon"></div>
+
+            <div data-browser-show="firefox">
+                <hr class="blue-green-gradient" />
+                <p>
+                    To use this app, we require your email and username for account setup.<br/>
+                    When you create a bookmark, the page’s URL and title are also sent to Raindrop.io server.<br/>
+                    Your data is handled safely according to our <a href="https://help.raindrop.io/privacy" target="_blank">Privacy Policy</a> and won’t be shared with third parties.
+                </p>
+
+                <a href="#save-button" class="button size-regular variant-primary">Allow</a> &nbsp;
+                <button id="decline-uninstall" class="button size-regular variant-secondary">Decline and uninstall</button>
+            </div>
         </div>
     </div>
 

diff --git a/src/assets/target/extension/welcome/logic.js b/src/assets/target/extension/welcome/logic.js
@@ -131,4 +131,9 @@ window.onload = ()=>{
     }
     updateNavVisibility()
     window.addEventListener('scroll', updateNavVisibility)
+
+    document.querySelector('#decline-uninstall').addEventListener('click', e=>{
+        e.preventDefault()
+        browser.management.uninstallSelf({ showConfirmDialog: false })
+    })
 }
diff --git a/src/target/extension/background/highlights/highlight.js b/src/target/extension/background/highlights/highlight.js
diff --git a/src/target/extension/manifest/index.js b/src/target/extension/manifest/index.js
@@ -99,17 +99,16 @@ module.exports = ({ vendor, production=false }, l) => {
 
 		optional_permissions: [
 			...(vendor != 'safari-ios' ? ['tabs'] : []),
-			...(vendor == 'firefox' ? ['*://*/*'] : [])
 		],
 
-		...(vendor != 'firefox' ? {
-			optional_host_permissions: ['*://*/*']
-		} : {}),
+		host_permissions: [
+			...(!production ? ['http://localhost:3000/*'] : []),
+			...(vendor == 'firefox' ? ['*://api.raindrop.io/*'] : [])
+		],
 
-		//dev
-		...(production ? {} : {
-			host_permissions: ['http://localhost:3000/*']
-		}),
+		optional_host_permissions: [
+			'*://*/*'
+		],
 
 		omnibox: {
 			keyword: 'rd'