@ic-reactor/react 0.4.2 → 0.4.4

package/dist/hooks/auth.d.ts

@@ -1,10 +1,11 @@
 import type { AuthClientLoginOptions } from "@dfinity/auth-client";
 import type { AgentManager } from "@ic-reactor/store";
+import { AuthArgs } from "../types";
 export type AuthHooks = ReturnType<typeof getAuthHooks>;
 export declare const getAuthHooks: (agentManager: AgentManager) => {
     useAgentManager: () => AgentManager;
     useAuthStore: () => import("@ic-reactor/store").AgentAuthState;
-    useAuthClient: () => {
+    useAuthClient: ({ onAuthentication, onAuthenticationSuccess, onAuthenticationFailure, onLogin, onLoginSuccess, onLoginError, onLoggedOut, }?: AuthArgs) => {
         authClient: import("@dfinity/auth-client").AuthClient | null;
         authenticated: boolean;
         authenticating: boolean;
@@ -15,6 +16,6 @@ export declare const getAuthHooks: (agentManager: AgentManager) => {
         }) => Promise<void>;
         authenticate: () => Promise<void>;
         loginLoading: boolean;
-        loginError: unknown;
+        loginError: Error | null;
     };
 };

package/dist/hooks/auth.js

@@ -13,7 +13,7 @@ exports.getAuthHooks = void 0;
 const react_1 = require("react");
 const zustand_1 = require("zustand");
 const getAuthHooks = (agentManager) => {
-    const { authenticate, authStore, isLocalEnv } = agentManager;
+    const { authenticate: authenticator, authStore, isLocalEnv } = agentManager;
     const useAgentManager = () => {
         return agentManager;
     };
@@ -21,37 +21,64 @@ const getAuthHooks = (agentManager) => {
         const authState = (0, zustand_1.useStore)(authStore, (state) => state);
         return authState;
     };
-    const useAuthClient = () => {
+    const useAuthClient = ({ onAuthentication, onAuthenticationSuccess, onAuthenticationFailure, onLogin, onLoginSuccess, onLoginError, onLoggedOut, } = {}) => {
         const [loginLoading, setLoginLoading] = (0, react_1.useState)(false);
         const [loginError, setLoginError] = (0, react_1.useState)(null);
         const { authClient, authenticated, authenticating, identity } = useAuthStore();
-        const login = (options) => __awaiter(void 0, void 0, void 0, function* () {
+        const authenticate = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
+            onAuthentication === null || onAuthentication === void 0 ? void 0 : onAuthentication();
+            authenticator()
+                .then((identity) => {
+                onAuthenticationSuccess === null || onAuthenticationSuccess === void 0 ? void 0 : onAuthenticationSuccess(identity);
+            })
+                .catch((e) => {
+                onAuthenticationFailure === null || onAuthenticationFailure === void 0 ? void 0 : onAuthenticationFailure(e);
+            });
+        }), [
+            authenticator,
+            onAuthentication,
+            onAuthenticationSuccess,
+            onAuthenticationFailure,
+        ]);
+        const login = (0, react_1.useCallback)((options) => __awaiter(void 0, void 0, void 0, function* () {
             setLoginLoading(true);
             setLoginError(null);
+            onLogin === null || onLogin === void 0 ? void 0 : onLogin();
             try {
-                yield (authClient === null || authClient === void 0 ? void 0 : authClient.login(Object.assign(Object.assign({ identityProvider: isLocalEnv
+                if (!authClient) {
+                    throw new Error("Auth client not initialized");
+                }
+                return yield authClient.login(Object.assign(Object.assign({ identityProvider: isLocalEnv
                         ? "https://identity.ic0.app/#authorize"
                         : "http://rdmx6-jaaaa-aaaaa-aaadq-cai.localhost:4943/#authorize" }, options), { onSuccess: () => __awaiter(void 0, void 0, void 0, function* () {
                         var _a;
-                        setLoginLoading(false);
                         yield authenticate();
                         (_a = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _a === void 0 ? void 0 : _a.call(options);
+                        onLoginSuccess === null || onLoginSuccess === void 0 ? void 0 : onLoginSuccess();
                     }), onError: (e) => {
                         var _a;
-                        setLoginError(e);
-                        setLoginLoading(false);
                         (_a = options === null || options === void 0 ? void 0 : options.onError) === null || _a === void 0 ? void 0 : _a.call(options, e);
-                    } })));
+                        const error = new Error("Login failed:" + e);
+                        setLoginError(error);
+                        onLoginError === null || onLoginError === void 0 ? void 0 : onLoginError(error);
+                    } }));
             }
             catch (e) {
-                setLoginLoading(false);
                 setLoginError(e);
+                onLoginError === null || onLoginError === void 0 ? void 0 : onLoginError(e);
+            }
+            finally {
+                setLoginLoading(false);
+            }
+        }), [authClient, onLogin, onLoginSuccess, onLoginError, isLocalEnv]);
+        const logout = (0, react_1.useCallback)((options) => __awaiter(void 0, void 0, void 0, function* () {
+            if (!authClient) {
+                throw new Error("Auth client not initialized");
             }
-        });
-        const logout = (options) => __awaiter(void 0, void 0, void 0, function* () {
-            yield (authClient === null || authClient === void 0 ? void 0 : authClient.logout(options));
+            yield authClient.logout(options);
             yield authenticate();
-        });
+            onLoggedOut === null || onLoggedOut === void 0 ? void 0 : onLoggedOut();
+        }), [authClient, onLoggedOut]);
         (0, react_1.useEffect)(() => {
             if (!authClient && !authenticating) {
                 authenticate();

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export * from "./context/actor";
 export declare const createReActor: <A extends unknown>({ isLocalEnv, ...options }: CreateReActorOptions) => ActorHooks<A> & {
     useAgentManager: () => import("@ic-reactor/store").AgentManager;
     useAuthStore: () => import("@ic-reactor/store").AgentAuthState;
-    useAuthClient: () => {
+    useAuthClient: ({ onAuthentication, onAuthenticationSuccess, onAuthenticationFailure, onLogin, onLoginSuccess, onLoginError, onLoggedOut, }?: import("./types").AuthArgs) => {
         authClient: import("@dfinity/auth-client").AuthClient | null;
         authenticated: boolean;
         authenticating: boolean;
@@ -18,6 +18,6 @@ export declare const createReActor: <A extends unknown>({ isLocalEnv, ...options
         } | undefined) => Promise<void>;
         authenticate: () => Promise<void>;
         loginLoading: boolean;
-        loginError: unknown;
+        loginError: Error | null;
     };
 };

package/dist/types.d.ts

@@ -1,6 +1,15 @@
-import type { ExtractActorMethodArgs, ExtractActorMethodReturnType, ServiceMethodType } from "@ic-reactor/store";
+import type { ExtractActorMethodArgs, ExtractActorMethodReturnType, Identity, ServiceMethodType } from "@ic-reactor/store";
 export type * from "@ic-reactor/store";
 export type * from "@ic-reactor/store/dist/actor/types";
+export type AuthArgs = {
+    onAuthentication?: () => void;
+    onAuthenticationSuccess?: (identity: Identity) => void;
+    onAuthenticationFailure?: (error: Error | undefined) => void;
+    onLoginSuccess?: () => void;
+    onLoginError?: (error: Error | undefined) => void;
+    onLogin?: () => void;
+    onLoggedOut?: () => void;
+};
 export type ActorCallArgs<A, M extends keyof A> = {
     functionName: M & string;
     args?: ExtractActorMethodArgs<A[M]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/react",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "A React library for interacting with Dfinity actors",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -35,7 +35,7 @@
     "node": ">=10"
   },
   "dependencies": {
-    "@ic-reactor/store": "^0.4.2",
+    "@ic-reactor/store": "^0.4.3",
     "zustand-utils": "^1.3"
   },
   "peerDependencies": {
@@ -48,5 +48,5 @@
     "react": ">=16.8",
     "zustand": "4.4"
   },
-  "gitHead": "d5817736d25a997a1b09f27f7546e8539cf5a6c2"
+  "gitHead": "be65990c31a4e7a86539fec2c6600de3e32a0c79"
 }