feat: add secret check (#20)

casdoor · Aug 17, 2024 · a46b4a2 · a46b4a2
1 parent e96d171
commit a46b4a2
Show file tree

Hide file tree

Showing 10 changed files with 530 additions and 216 deletions.
diff --git a/App.js b/App.js
@@ -17,6 +17,7 @@ import {PaperProvider} from "react-native-paper";
 import {NavigationContainer} from "@react-navigation/native";
 import {BulletList} from "react-content-loader/native";
 import {SQLiteProvider} from "expo-sqlite";
+import Toast from "react-native-toast-message";
 import Header from "./Header";
 import NavigationBar from "./NavigationBar";
 import {migrateDb} from "./TotpDatabase";
@@ -31,6 +32,7 @@ const App = () => {
             <NavigationBar />
           </PaperProvider>
         </NavigationContainer>
+        <Toast />
       </SQLiteProvider>
     </React.Suspense>
   );

diff --git a/CasdoorLoginPage.js b/CasdoorLoginPage.js
@@ -14,10 +14,12 @@
 
 import React, {useEffect, useState} from "react";
 import {WebView} from "react-native-webview";
-import {View} from "react-native";
+import {Platform, SafeAreaView, StatusBar, StyleSheet, Text, TouchableOpacity} from "react-native";
 import {Portal} from "react-native-paper";
 import SDK from "casdoor-react-native-sdk";
 import PropTypes from "prop-types";
+import Toast from "react-native-toast-message";
+
 import EnterCasdoorSdkConfig from "./EnterCasdoorSdkConfig";
 import useStore from "./useStorage";
 // import {LogBox} from "react-native";
@@ -28,6 +30,7 @@ const CasdoorLoginPage = ({onWebviewClose}) => {
   CasdoorLoginPage.propTypes = {
     onWebviewClose: PropTypes.func.isRequired,
   };
+
   const [casdoorLoginURL, setCasdoorLoginURL] = useState("");
   const [showConfigPage, setShowConfigPage] = useState(true);
 
@@ -45,6 +48,11 @@ const CasdoorLoginPage = ({onWebviewClose}) => {
   const handleHideConfigPage = () => {
     setShowConfigPage(false);
   };
+
+  const handleShowConfigPage = () => {
+    setShowConfigPage(true);
+  };
+
   const getCasdoorSignInUrl = async() => {
     const signinUrl = await sdk.getSigninUrl();
     setCasdoorLoginURL(signinUrl);
@@ -68,24 +76,71 @@ const CasdoorLoginPage = ({onWebviewClose}) => {
     }
   };
 
+  const handleErrorResponse = (error) => {
+    Toast.show({
+      type: "error",
+      text1: "Error",
+      text2: error.description,
+      autoHide: true,
+    });
+    setShowConfigPage(true);
+  };
+
   return (
     <Portal>
-      <View style={{flex: 1}}>
-        {showConfigPage && <EnterCasdoorSdkConfig onClose={handleHideConfigPage} onWebviewClose={onWebviewClose} />}
-        {!showConfigPage && casdoorLoginURL !== "" && (
-          <WebView
-            source={{uri: casdoorLoginURL}}
-            onNavigationStateChange={onNavigationStateChange}
-            style={{flex: 1}}
-            mixedContentMode="always"
-            javaScriptEnabled={true}
+      <SafeAreaView style={styles.container}>
+        {showConfigPage && (
+          <EnterCasdoorSdkConfig
+            onClose={handleHideConfigPage}
+            onWebviewClose={onWebviewClose}
           />
         )}
-      </View>
+        {!showConfigPage && casdoorLoginURL !== "" && (
+          <>
+            <TouchableOpacity
+              style={styles.backButton}
+              onPress={handleShowConfigPage}
+            >
+              <Text style={styles.backButtonText}>Back to Config</Text>
+            </TouchableOpacity>
+            <WebView
+              source={{uri: casdoorLoginURL}}
+              onNavigationStateChange={onNavigationStateChange}
+              onError={(syntheticEvent) => {
+                const {nativeEvent} = syntheticEvent;
+                handleErrorResponse(nativeEvent);
+              }}
+              style={styles.webview}
+              mixedContentMode="always"
+              javaScriptEnabled={true}
+            />
+          </>
+        )}
+      </SafeAreaView>
     </Portal>
   );
 };
 
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: "white",
+    paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
+  },
+  webview: {
+    flex: 1,
+  },
+  backButton: {
+    padding: 10,
+    backgroundColor: "#007AFF",
+    alignItems: "center",
+  },
+  backButtonText: {
+    color: "white",
+    fontWeight: "bold",
+  },
+});
+
 export const CasdoorLogout = () => {
   if (sdk) {sdk.clearState();}
 };