Merge pull request #308 from AuenKr/fix-facebook-login

hkirat · web-flow · commit 4d018e1a96e7 · 2024-06-03T00:19:23.000+05:30
remove Facebook login completely
diff --git a/apps/backend/package.json b/apps/backend/package.json
@@ -20,7 +20,6 @@
     "express-session": "^1.18.0",
     "jsonwebtoken": "^9.0.2",
     "passport": "^0.7.0",
-    "passport-facebook": "^3.0.0",
     "passport-github2": "^0.1.12",
     "passport-google-oauth20": "^2.0.0"
   },
diff --git a/apps/backend/src/passport.ts b/apps/backend/src/passport.ts
@@ -1,6 +1,5 @@
 const GoogleStrategy = require('passport-google-oauth20').Strategy;
 const GithubStrategy = require('passport-github2').Strategy;
-const FacebookStrategy = require('passport-facebook').Strategy;
 import passport from 'passport';
 import dotenv from 'dotenv';
 import { db } from './db';
@@ -21,18 +20,13 @@ const GITHUB_CLIENT_ID =
   process.env.GITHUB_CLIENT_ID || 'your_github_client_id';
 const GITHUB_CLIENT_SECRET =
   process.env.GITHUB_CLIENT_SECRET || 'your_github_client_secret';
-const FACEBOOK_APP_ID = process.env.FACEBOOK_APP_ID || 'your_facebook_app_id';
-const FACEBOOK_APP_SECRET =
-  process.env.FACEBOOK_APP_SECRET || 'your_facebook_app_secret';
 
 export function initPassport() {
   if (
     !GOOGLE_CLIENT_ID ||
     !GOOGLE_CLIENT_SECRET ||
     !GITHUB_CLIENT_ID ||
-    !GITHUB_CLIENT_SECRET ||
-    !FACEBOOK_APP_ID ||
-    !FACEBOOK_APP_SECRET
+    !GITHUB_CLIENT_SECRET
   ) {
     throw new Error(
       'Missing environment variables for authentication providers',
diff --git a/apps/backend/src/router/auth.ts b/apps/backend/src/router/auth.ts
@@ -78,17 +78,4 @@ router.get(
   }),
 );
 
-router.get(
-  '/facebook',
-  passport.authenticate('facebook', { scope: ['profile'] }),
-);
-
-router.get(
-  '/facebook/callback',
-  passport.authenticate('facebook', {
-    successRedirect: CLIENT_URL,
-    failureRedirect: '/login/failed',
-  }),
-);
-
 export default router;
diff --git a/apps/frontend/src/App.tsx b/apps/frontend/src/App.tsx
@@ -5,7 +5,6 @@ import { Game } from './screens/Game';
 import Login from './screens/Login';
 import { Suspense } from 'react';
 import { RecoilRoot } from 'recoil';
-import { useUser } from '@repo/store/useUser';
 import { Loader } from './components/Loader';
 import { Layout } from './layout';
 
@@ -22,7 +21,6 @@ function App() {
 }
 
 function AuthApp() {
-  const user = useUser();
   return (
     <BrowserRouter>
       <Routes>
diff --git a/apps/frontend/src/screens/Login.tsx b/apps/frontend/src/screens/Login.tsx
@@ -1,5 +1,6 @@
 import Google from '../assets/google.png';
 import Github from '../assets/github.png';
+
 import { useNavigate } from 'react-router-dom';
 
 const BACKEND_URL =
@@ -22,19 +23,19 @@ const Login = () => {
         Enter the Game World
       </h1>
       <div className="bg-stone-800 rounded-lg shadow-lg p-8 flex flex-col md:flex-row">
-        <div className="mb-8 md:mb-0 md:mr-8 justify-center flex flex-col">
+        <div className="mb-8 md:mb-0 md:mr-8 justify-center flex flex-col space-y-4">
           <div
-            className="flex items-center justify-center chess-board text-white px-4 py-2 rounded-md mb-4 cursor-pointer hover:bg-gray-600 transition-colors duration-300"
+            className="flex items-center justify-center chess-board text-white px-4 py-2 rounded-md cursor-pointer hover:bg-gray-600 transition-colors duration-300"
             onClick={google}
           >
-            <img src={Google} alt="" className="w-6 h-6 mr-2" />
+            <img src={Google} alt="Sign in with Google" className="w-6 h-6 mr-2" />
             Sign in with Google
           </div>
           <div
             className="flex items-center justify-center chess-board text-white px-4 py-2 rounded-md cursor-pointer hover:bg-gray-600 transition-colors duration-300"
             onClick={github}
           >
-            <img src={Github} alt="" className="w-6 h-6 mr-2" />
+            <img src={Github} alt="Sign in with Github" className="w-6 h-6 mr-2" />
             Sign in with Github
           </div>
         </div>
diff --git a/apps/native/app/login/index.tsx b/apps/native/app/login/index.tsx
@@ -63,16 +63,11 @@ const styles = StyleSheet.create({
   },
   button2: {
     backgroundColor: '#302c2a',
-
     padding: 12,
     margin: 10,
     borderRadius: 8,
     justifyContent: 'center',
   },
-  facebookButton: {
-    backgroundColor: '#3b5998',
-    margin: 10,
-  },
   loginText: {
     color: '#FFF',
     fontSize: 20,
diff --git a/packages/db/prisma/migrations/20240508152337_remove_facebook_login/migration.sql b/packages/db/prisma/migrations/20240508152337_remove_facebook_login/migration.sql
@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - The values [FACEBOOK] on the enum `AuthProvider` will be removed. If these variants are still used in the database, this will fail.
+
+*/
+-- AlterEnum
+BEGIN;
+CREATE TYPE "AuthProvider_new" AS ENUM ('EMAIL', 'GOOGLE', 'GITHUB');
+ALTER TABLE "User" ALTER COLUMN "provider" TYPE "AuthProvider_new" USING ("provider"::text::"AuthProvider_new");
+ALTER TYPE "AuthProvider" RENAME TO "AuthProvider_old";
+ALTER TYPE "AuthProvider_new" RENAME TO "AuthProvider";
+DROP TYPE "AuthProvider_old";
+COMMIT;
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
@@ -83,6 +83,5 @@ enum TimeControl {
 enum AuthProvider {
   EMAIL
   GOOGLE
-  FACEBOOK
   GITHUB
 }
diff --git a/yarn.lock b/yarn.lock
@@ -8669,13 +8669,6 @@ pascal-case@^2.0.0:
     camel-case "^3.0.0"
     upper-case-first "^1.1.0"
 
-passport-facebook@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/passport-facebook/-/passport-facebook-3.0.0.tgz#b16f7314128be55d020a2b75f574c194bd6d9805"
-  integrity sha512-K/qNzuFsFISYAyC1Nma4qgY/12V3RSLFdFVsPKXiKZt434wOvthFW1p7zKa1iQihQMRhaWorVE1o3Vi1o+ZgeQ==
-  dependencies:
-    passport-oauth2 "1.x.x"
-
 passport-github2@^0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/passport-github2/-/passport-github2-0.1.12.tgz#a72ebff4fa52a35bc2c71122dcf470d1116f772c"
@@ -10140,7 +10133,16 @@ strict-uri-encode@^2.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
   integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10218,7 +10220,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10232,6 +10234,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -11227,7 +11236,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11245,6 +11254,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -11404,4 +11422,4 @@ zustand@^4.5.2:
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.2.tgz#fddbe7cac1e71d45413b3682cdb47b48034c3848"
   integrity sha512-2cN1tPkDVkwCy5ickKrI7vijSjPksFRfqS6237NzT0vqSsztTNnQdHw9mmN7uBdk3gceVXU0a+21jFzFzAc9+g==
   dependencies:
-    use-sync-external-store "1.2.0"
+    use-sync-external-store "1.2.0"

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,5 @@ enum TimeControl {`
`83`	`83`	`enum AuthProvider {`
`84`	`84`	`EMAIL`
`85`	`85`	`GOOGLE`
`86`		`- FACEBOOK`
`87`	`86`	`GITHUB`
`88`	`87`	`}`