Merge pull request #292 from Outblock:233-feature-firebase-auth-for-w…

…eb-extensions 233-feature-firebase-auth-for-web-extensions
Outblock · Dec 17, 2024 · 48797ff · 48797ff
2 parents aefa24b + 27d555e
commit 48797ff
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 143 deletions.
diff --git a/build/plugins/AssetReplacePlugin.js b/build/plugins/AssetReplacePlugin.js
diff --git a/build/plugins/FirebaseFixPlugin.js b/build/plugins/FirebaseFixPlugin.js
diff --git a/build/webpack.common.config.js b/build/webpack.common.config.js
@@ -1,10 +1,6 @@
 const webpack = require('webpack');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-const ESLintWebpackPlugin = require('eslint-webpack-plugin');
-// const tsImportPluginFactory = require('ts-import-plugin');
-const AssetReplacePlugin = require('./plugins/AssetReplacePlugin');
-const FirebaseFixPlugin = require('./plugins/FirebaseFixPlugin');
 const { version } = require('../_raw/manifest.json');
 const path = require('path');
 const CopyPlugin = require('copy-webpack-plugin');
@@ -105,19 +101,6 @@ const config = (env) => {
             name: '[name].[ext]',
           },
         },
-        // {
-        //   test: /\.wasm$/,
-        //   include: path.resolve(__dirname, 'node_modules/@trustwallet/wallet-core/dist/lib'),
-        //   use: [{
-        //     loader: 'file-loader',
-        //     options: {
-        //       name: '[name].[ext]',
-        //       outputPath: '/',
-        //     },
-        //   }],
-        //   type: 'javascript/auto',
-
-        // },
         {
           test: /\.wasm$/,
           type: 'webassembly/async',
@@ -142,10 +125,6 @@ const config = (env) => {
       ],
     },
     plugins: [
-      new FirebaseFixPlugin(),
-      // new ESLintWebpackPlugin({
-      //   files: '**/*.{ts,tsx,js,jsx}',
-      // }),
       new CopyPlugin({
         patterns: [
           {
@@ -187,9 +166,6 @@ const config = (env) => {
         process: 'process',
         dayjs: 'dayjs',
       }),
-      // new AssetReplacePlugin({
-      //   '#PAGEPROVIDER#': 'pageProvider',
-      // }),
       new webpack.DefinePlugin({
         'process.env.version': JSON.stringify(`version: ${version}`),
         'process.env.release': JSON.stringify(version),

diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
@@ -7,7 +7,7 @@ import * as bip39 from 'bip39';
 import { ethErrors } from 'eth-rpc-errors';
 import * as ethUtil from 'ethereumjs-util';
 import { getApp } from 'firebase/app';
-import { getAuth } from 'firebase/auth';
+import { getAuth } from 'firebase/auth/web-extension';
 import web3, { TransactionError } from 'web3';
 
 import eventBus from '@/eventBus';

diff --git a/src/background/index.ts b/src/background/index.ts
@@ -7,7 +7,7 @@ import {
   indexedDBLocalPersistence,
   setPersistence,
   onAuthStateChanged,
-} from 'firebase/auth';
+} from 'firebase/auth/web-extension';
 
 import eventBus from '@/eventBus';
 import { Message } from '@/shared/utils/messaging';

diff --git a/src/background/service/openapi.ts b/src/background/service/openapi.ts
@@ -11,7 +11,7 @@ import {
   onAuthStateChanged,
   type Unsubscribe,
   type User,
-} from 'firebase/auth';
+} from 'firebase/auth/web-extension';
 import { getInstallations, getId } from 'firebase/installations';
 import type { TokenInfo } from 'flow-native-token-registry';
 import log from 'loglevel';

diff --git a/src/background/service/userWallet.ts b/src/background/service/userWallet.ts
@@ -1,7 +1,7 @@
 import * as secp from '@noble/secp256k1';
 import * as fcl from '@onflow/fcl';
 import { getApp } from 'firebase/app';
-import { getAuth, signInAnonymously } from 'firebase/auth';
+import { getAuth, signInAnonymously } from 'firebase/auth/web-extension';
 
 import { type ActiveChildType } from '@/shared/types/wallet-types';
 import { withPrefix } from '@/shared/utils/address';