Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for persist storage #19

Merged
merged 1 commit into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 0 additions & 64 deletions Account.js

This file was deleted.

18 changes: 7 additions & 11 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,24 @@
import * as React from "react";
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 Header from "./Header";
import NavigationBar from "./NavigationBar";
import {UserProvider} from "./UserContext";
import {CasdoorServerProvider} from "./CasdoorServerContext";
import {migrateDb} from "./TotpDatabase";

const App = () => {

const [userInfo, setUserInfo] = React.useState(null);
const [token, setToken] = React.useState(null);
const [casdoorServer, setCasdoorServer] = React.useState(null);

return (
<CasdoorServerProvider value={{casdoorServer, setCasdoorServer}} >
<UserProvider value={{userInfo, setUserInfo, token, setToken}} >
<React.Suspense fallback={<BulletList />}>
<SQLiteProvider databaseName="totp.db" onInit={migrateDb} options={{enableChangeListener: true}}>
<NavigationContainer>
<PaperProvider>
<Header />
<NavigationBar />
</PaperProvider>
</NavigationContainer>
</UserProvider>
</CasdoorServerProvider>
</SQLiteProvider>
</React.Suspense>
);
};
export default App;
36 changes: 24 additions & 12 deletions CasdoorLoginPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import React, {useEffect} from "react";
import React, {useEffect, useState} from "react";
import {WebView} from "react-native-webview";
import {View} from "react-native";
import {Portal} from "react-native-paper";
import SDK from "casdoor-react-native-sdk";
import UserContext from "./UserContext";
import PropTypes from "prop-types";
import EnterCasdoorSdkConfig from "./EnterCasdoorSdkConfig";
import CasdoorServerContext from "./CasdoorServerContext";
import useStore from "./useStorage";
// import {LogBox} from "react-native";
// LogBox.ignoreAllLogs();

Expand All @@ -29,10 +28,20 @@ const CasdoorLoginPage = ({onWebviewClose}) => {
CasdoorLoginPage.propTypes = {
onWebviewClose: PropTypes.func.isRequired,
};
const [casdoorLoginURL, setCasdoorLoginURL] = React.useState("");
const {setUserInfo, setToken} = React.useContext(UserContext);
const [showConfigPage, setShowConfigPage] = React.useState(true);
const {casdoorServer} = React.useContext(CasdoorServerContext);
const [casdoorLoginURL, setCasdoorLoginURL] = useState("");
const [showConfigPage, setShowConfigPage] = useState(true);

const {
serverUrl,
clientId,
redirectPath,
appName,
organizationName,
getCasdoorConfig,
setUserInfo,
setToken,
} = useStore();

const handleHideConfigPage = () => {
setShowConfigPage(false);
};
Expand All @@ -42,14 +51,15 @@ const CasdoorLoginPage = ({onWebviewClose}) => {
};

useEffect(() => {
if (casdoorServer) {
sdk = new SDK(casdoorServer);
if (serverUrl && clientId && redirectPath && appName && organizationName) {
sdk = new SDK(getCasdoorConfig());
getCasdoorSignInUrl();
}
}, [casdoorServer]);
}, [serverUrl, clientId, redirectPath, appName, organizationName]);

const onNavigationStateChange = async(navState) => {
if (navState.url.startsWith(casdoorServer.redirectPath)) {
const {redirectPath} = getCasdoorConfig();
if (navState.url.startsWith(redirectPath)) {
onWebviewClose();
const token = await sdk.getAccessToken(navState.url);
const userInfo = sdk.JwtDecode(token);
Expand All @@ -75,7 +85,9 @@ const CasdoorLoginPage = ({onWebviewClose}) => {
</Portal>
);
};

export const CasdoorLogout = () => {
sdk.clearState();
if (sdk) {sdk.clearState();}
};

export default CasdoorLoginPage;
20 changes: 0 additions & 20 deletions CasdoorServerContext.js

This file was deleted.

1 change: 1 addition & 0 deletions EditAccountDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export default function EnterAccountDetails({onClose, onEdit, placeholder}) {
const handleConfirm = () => {
onEdit(accountName);
};

return (
<View style={{flex: 1, justifyContent: "center", alignItems: "center"}}>
<Text style={{fontSize: 24, marginBottom: 5}}>Enter new account name</Text>
Expand Down
59 changes: 27 additions & 32 deletions EnterCasdoorSdkConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,52 +12,46 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import React, {useState} from "react";
import React from "react";
import {Alert, Text, View} from "react-native";
import {Button, IconButton, Portal, TextInput} from "react-native-paper";
import DefaultCasdoorSdkConfig from "./DefaultCasdoorSdkConfig";
import CasdoorServerContext from "./CasdoorServerContext";
import PropTypes from "prop-types";
import useStore from "./useStorage";

const EnterCasdoorSdkConfig = ({onClose, onWebviewClose}) => {
EnterCasdoorSdkConfig.propTypes = {
onClose: PropTypes.func.isRequired,
};
const {setCasdoorServer} = React.useContext(CasdoorServerContext);

const [CasdoorSdkConfig, setCasdoorSdkConfig] = useState({
serverUrl: "",
clientId: "",
appName: "",
organizationName: "",
redirectPath: "http://casdoor-app",
signinPath: "/api/signin",
});

const handleInputChange = (key, value) => {
setCasdoorSdkConfig({...CasdoorSdkConfig, [key]: value});
};
const {
serverUrl,
clientId,
redirectPath,
appName,
organizationName,
setServerUrl,
setClientId,
setAppName,
setOrganizationName,
setCasdoorConfig,
} = useStore();

const closeConfigPage = () => {
onClose();
onWebviewClose();
};

const handleSave = () => {
if (
!CasdoorSdkConfig.serverUrl ||
!CasdoorSdkConfig.clientId ||
!CasdoorSdkConfig.appName ||
!CasdoorSdkConfig.organizationName ||
!CasdoorSdkConfig.redirectPath
) {
if (!serverUrl || !clientId || !appName || !organizationName || !redirectPath) {
Alert.alert("Please fill in all the fields!");
return;
}
setCasdoorServer(CasdoorSdkConfig);
onClose();
};

const handleUseDefault = () => {
setCasdoorServer(DefaultCasdoorSdkConfig);
setCasdoorConfig(DefaultCasdoorSdkConfig);
onClose();
};

Expand All @@ -68,8 +62,8 @@ const EnterCasdoorSdkConfig = ({onClose, onWebviewClose}) => {
<Text style={{fontSize: 24, marginBottom: 5}}>Casdoor server</Text>
<TextInput
label="Endpoint"
value={CasdoorSdkConfig.serverUrl}
onChangeText={(text) => handleInputChange("serverUrl", text)}
value={serverUrl}
onChangeText={setServerUrl}
autoCapitalize="none"
style={{
borderWidth: 3,
Expand All @@ -85,8 +79,8 @@ const EnterCasdoorSdkConfig = ({onClose, onWebviewClose}) => {
/>
<TextInput
label="ClientID"
value={CasdoorSdkConfig.clientId}
onChangeText={(text) => handleInputChange("clientId", text)}
value={clientId}
onChangeText={setClientId}
autoCapitalize="none"
style={{
borderWidth: 3,
Expand All @@ -102,8 +96,8 @@ const EnterCasdoorSdkConfig = ({onClose, onWebviewClose}) => {
/>
<TextInput
label="appName"
value={CasdoorSdkConfig.appName}
onChangeText={(text) => handleInputChange("appName", text)}
value={appName}
onChangeText={setAppName}
autoCapitalize="none"
style={{
borderWidth: 3,
Expand All @@ -119,8 +113,8 @@ const EnterCasdoorSdkConfig = ({onClose, onWebviewClose}) => {
/>
<TextInput
label="organizationName"
value={CasdoorSdkConfig.organizationName}
onChangeText={(text) => handleInputChange("organizationName", text)}
value={organizationName}
onChangeText={setOrganizationName}
autoCapitalize="none"
style={{
borderWidth: 3,
Expand Down Expand Up @@ -173,4 +167,5 @@ const EnterCasdoorSdkConfig = ({onClose, onWebviewClose}) => {
</Portal>
);
};

export default EnterCasdoorSdkConfig;
Loading