Merge branch 'master' into fix-google-rejection

Author: medyo

.github/workflows/distribute.yml

@@ -70,6 +70,10 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
       - name: Install yarn dependencies
         run: yarn
 
@@ -78,7 +82,7 @@ jobs:
 
       - name: Upload the package to Chrome web store
         if: ${{ github.event.inputs.testMode == 'false' }}
-        run: npx chrome-webstore-upload-cli@2 upload --source chrome_extension.zip --extension-id $EXTENSION_ID --auto-publish
+        run: npx chrome-webstore-upload-cli@3 upload --source chrome_extension.zip --extension-id $EXTENSION_ID --auto-publish
         env:
           EXTENSION_ID: ${{ secrets.CHROME_EXTENSION_ID }}
           CLIENT_ID: ${{secrets.CHROME_EXTENSION_CLIENT_ID}}
@@ -106,10 +110,10 @@ jobs:
         run: yarn build:firefox
       - name: Upload the package to Firefox web store
         if: ${{ github.event.inputs.testMode == 'false' }}
-        uses: yayuyokitano/firefox-addon@v0.0.6-alpha
+        uses: wdzeng/firefox-addon@v1
         with:
-          api_key: ${{ secrets.WEB_EXT_API_KEY }}
-          api_secret: ${{ secrets.WEB_EXT_API_SECRET }}
-          guid: '{f8793186-e9da-4332-aa1e-dc3d9f7bb04c}'
-          xpi_path: firefox_extension.zip
-          src_path: source_code.zip
+          jwt-issuer: ${{ secrets.WEB_EXT_API_KEY }}
+          jwt-secret: ${{ secrets.WEB_EXT_API_SECRET }}
+          addon-guid: '{f8793186-e9da-4332-aa1e-dc3d9f7bb04c}'
+          xpi-path: firefox_extension.zip
+          source-file-path: source_code.zip

public/base.manifest.json

@@ -2,22 +2,16 @@
   "manifest_version": 3,
   "name": "Hackertab.dev - developer news",
   "description": "All developer news in one tab",
-  "version": "1.23.1",
+  "version": "1.23.2",
   "chrome_url_overrides": {
     "newtab": "index.html"
   },
-  "host_permissions": [
-    "https://*.hackertab.dev/*"
-  ],
+  "host_permissions": ["https://*.hackertab.dev/*"],
   "content_scripts": [
     {
-      "matches": [
-        "https://hackertab.dev/*"
-      ],
+      "matches": ["https://hackertab.dev/*"],
       "run_at": "document_start",
-      "js": [
-        "content.js"
-      ]
+      "js": ["content.js"]
     }
   ],
   "icons": {

public/firefox.manifest.json

@@ -1,5 +1,10 @@
 {
   "background": {
     "scripts": ["background.js"]
+  },
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "{f8793186-e9da-4332-aa1e-dc3d9f7bb04c}"
+    }
   }
 }

src/components/Layout/AppLayout.tsx

@@ -6,6 +6,7 @@ import 'src/assets/App.css'
 import { AuthModal, useAuth } from 'src/features/auth'
 import { usePostStreak } from 'src/features/hits'
 import { MarketingBanner } from 'src/features/MarketingBanner'
+import { identifyUserStreak } from 'src/lib/analytics'
 import { AuthProvider } from 'src/providers/AuthProvider'
 import { Header } from './Header'
 
@@ -17,6 +18,7 @@ export const AppLayout = () => {
     if (isConnected) {
       postStreakMutation.mutateAsync(undefined).then((data) => {
         setStreak(data.streak)
+        identifyUserStreak(data.streak)
       })
     }
   }, [isConnected])

src/features/auth/components/AuthModal.tsx

@@ -1,4 +1,4 @@
-import { AuthProvider, GithubAuthProvider, GoogleAuthProvider } from 'firebase/auth'
+import { GithubAuthProvider, GoogleAuthProvider } from 'firebase/auth/web-extension'
 import { useCallback, useState } from 'react'
 import { FaGithub } from 'react-icons/fa'
 import { FcGoogle } from 'react-icons/fc'
@@ -18,6 +18,7 @@ type AuthModalProps = {
 const googleAuthProvider = new GoogleAuthProvider()
 const githubAuthProvider = new GithubAuthProvider()
 
+type AuthProvider = GoogleAuthProvider | GithubAuthProvider
 export const AuthModal = ({ showAuth }: AuthModalProps) => {
   const { closeAuthModal, authError, setAuthError } = useAuth()
   const [selectedProvider, setSelectedProvider] = useState<AuthProvider>(googleAuthProvider)

src/features/auth/hooks/useAuth.ts

@@ -1,4 +1,4 @@
-import { signOut } from 'firebase/auth'
+import { signOut } from 'firebase/auth/web-extension'
 import { AuthModalStore, AuthStore } from 'src/features/auth'
 import { trackUserDisconnect } from 'src/lib/analytics'
 import { firebaseAuth } from 'src/lib/firebase'

src/lib/analytics.ts

@@ -73,6 +73,7 @@ export enum Attributes {
   DURATION = 'Duration',
   PROVIDER = 'Provider',
   ADV = 'ADV',
+  STREAK = 'Streak',
 }
 
 const _SEP_ = ' '
@@ -434,7 +435,9 @@ export const identifyUserMaxVisibleCards = (maxVisibleCards: number) => {
 export const identifyAdvBlocked = (blocked: boolean) => {
   identifyUserProperty(Attributes.ADV, blocked)
 }
-
+export const identifyUserStreak = (value: number) => {
+  identifyUserProperty(Attributes.STREAK, value)
+}
 // Private functions
 type trackEventProps = {
   object: Exclude<Objects, null | undefined>

src/lib/firebase.ts

@@ -1,5 +1,5 @@
 import { initializeApp } from 'firebase/app'
-import { getAuth } from 'firebase/auth'
+import { getAuth } from 'firebase/auth/web-extension'
 import { FIREBASE_API_KEY } from 'src/config'
 
 const firebaseConfig = {

src/lib/interceptors/DefaultRequestInterceptor.ts

@@ -32,6 +32,5 @@ const getUserToken = async () => {
       }
       unsub()
     })
-    resolve('abc')
   })
 }

src/providers/AuthProvider.tsx

@@ -1,4 +1,8 @@
-import { GithubAuthProvider, GoogleAuthProvider, signInWithCredential } from 'firebase/auth'
+import {
+  GithubAuthProvider,
+  GoogleAuthProvider,
+  signInWithCredential,
+} from 'firebase/auth/web-extension'
 import { useCallback, useEffect } from 'react'
 import { useNavigate, useSearchParams } from 'react-router-dom'
 import toast from 'react-simple-toasts'