Merge branch 'support-google-oauth' into refactor-main

2023-07-24 21:31:45 +08:00
parent 8956e2fd60 c144c64fff
commit f37e41eb1d
14 changed files with 459 additions and 7 deletions
@@ -13,6 +13,7 @@ import { API, getLogo, getSystemName, showError, showNotice } from './helpers';
 import PasswordResetForm from './components/PasswordResetForm';
 import GitHubOAuth from './components/GitHubOAuth';
 import DiscordOAuth from './components/DiscordOAuth';
+import GoogleOAuth from './components/GoogleOAuth';
 import PasswordResetConfirm from './components/PasswordResetConfirm';
 import { UserContext } from './context/User';
 import { StatusContext } from './context/Status';
@@ -241,6 +242,7 @@ function App() {
        }
      />
      <Route
+        HEAD
        path='/oauth/discord'
        element={
          <Suspense fallback={<Loading></Loading>}>
@@ -248,6 +250,15 @@ function App() {
          </Suspense>
        }
      />
+      <Route
+        path='/oauth/google'
+        element={
+          <Suspense fallback={<Loading></Loading>}>
+            <GoogleOAuth />
+            support-google-oauth
+          </Suspense>
+        }
+      />
      <Route
        path='/setting'
        element={
@@ -261,11 +272,11 @@ function App() {
      <Route
        path='/topup'
        element={
-        <PrivateRoute>
-          <Suspense fallback={<Loading></Loading>}>
-            <TopUp />
-          </Suspense>
-        </PrivateRoute>
+          <PrivateRoute>
+            <Suspense fallback={<Loading></Loading>}>
+              <TopUp />
+            </Suspense>
+          </PrivateRoute>
        }
      />
      <Route