@ic-reactor/react 0.4.4 → 0.4.6

package/dist/hooks/auth.d.ts

@@ -1,20 +1,21 @@
 import type { AuthClientLoginOptions } from "@dfinity/auth-client";
-import type { AgentManager } from "@ic-reactor/store";
+import type { AgentManager, Identity, Principal } from "@ic-reactor/store";
 import { AuthArgs } from "../types";
 export type AuthHooks = ReturnType<typeof getAuthHooks>;
 export declare const getAuthHooks: (agentManager: AgentManager) => {
+    useUserPrincipal: () => Principal | undefined;
     useAgentManager: () => AgentManager;
     useAuthStore: () => import("@ic-reactor/store").AgentAuthState;
     useAuthClient: ({ onAuthentication, onAuthenticationSuccess, onAuthenticationFailure, onLogin, onLoginSuccess, onLoginError, onLoggedOut, }?: AuthArgs) => {
         authClient: import("@dfinity/auth-client").AuthClient | null;
         authenticated: boolean;
         authenticating: boolean;
-        identity: import("@ic-reactor/store").Identity | null;
+        identity: Identity | null;
         login: (options?: AuthClientLoginOptions) => Promise<void>;
         logout: (options?: {
             returnTo?: string;
         }) => Promise<void>;
-        authenticate: () => Promise<void>;
+        authenticate: () => Promise<Identity>;
         loginLoading: boolean;
         loginError: Error | null;
     };

package/dist/hooks/auth.js

@@ -21,19 +21,28 @@ const getAuthHooks = (agentManager) => {
         const authState = (0, zustand_1.useStore)(authStore, (state) => state);
         return authState;
     };
+    const useUserPrincipal = () => {
+        const { identity } = useAuthStore();
+        return identity === null || identity === void 0 ? void 0 : identity.getPrincipal();
+    };
     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 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);
-            });
+            const authenticatePromise = new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+                try {
+                    const identity = yield authenticator();
+                    onAuthenticationSuccess === null || onAuthenticationSuccess === void 0 ? void 0 : onAuthenticationSuccess(identity);
+                    resolve(identity);
+                }
+                catch (e) {
+                    onAuthenticationFailure === null || onAuthenticationFailure === void 0 ? void 0 : onAuthenticationFailure(e);
+                    reject(e);
+                }
+            }));
+            onAuthentication === null || onAuthentication === void 0 ? void 0 : onAuthentication(() => authenticatePromise);
+            return authenticatePromise;
         }), [
             authenticator,
             onAuthentication,
@@ -43,34 +52,47 @@ const getAuthHooks = (agentManager) => {
         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 {
-                if (!authClient) {
-                    throw new Error("Auth client not initialized");
+            const loginPromise = new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+                try {
+                    if (!authClient) {
+                        throw new Error("Auth client not initialized");
+                    }
+                    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;
+                            const identity = yield authenticate();
+                            const principal = identity.getPrincipal();
+                            (_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(principal);
+                            resolve(principal);
+                        }), onError: (e) => {
+                            var _a;
+                            (_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);
+                            reject(error);
+                        } }));
                 }
-                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;
-                        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;
-                        (_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) {
-                setLoginError(e);
-                onLoginError === null || onLoginError === void 0 ? void 0 : onLoginError(e);
-            }
-            finally {
-                setLoginLoading(false);
-            }
-        }), [authClient, onLogin, onLoginSuccess, onLoginError, isLocalEnv]);
+                catch (e) {
+                    setLoginError(e);
+                    onLoginError === null || onLoginError === void 0 ? void 0 : onLoginError(e);
+                    reject(e);
+                }
+                finally {
+                    setLoginLoading(false);
+                }
+            }));
+            onLogin === null || onLogin === void 0 ? void 0 : onLogin(() => loginPromise);
+        }), [
+            authClient,
+            onLogin,
+            onLoginSuccess,
+            onLoginError,
+            isLocalEnv,
+            authenticate,
+        ]);
         const logout = (0, react_1.useCallback)((options) => __awaiter(void 0, void 0, void 0, function* () {
             if (!authClient) {
                 throw new Error("Auth client not initialized");
@@ -97,6 +119,7 @@ const getAuthHooks = (agentManager) => {
         };
     };
     return {
+        useUserPrincipal,
         useAgentManager,
         useAuthStore,
         useAuthClient,

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export { createReActorStore, createAgentManager, createActorManager, } from "@ic
 export * from "./context/agent";
 export * from "./context/actor";
 export declare const createReActor: <A extends unknown>({ isLocalEnv, ...options }: CreateReActorOptions) => ActorHooks<A> & {
+    useUserPrincipal: () => import("@dfinity/principal").Principal | undefined;
     useAgentManager: () => import("@ic-reactor/store").AgentManager;
     useAuthStore: () => import("@ic-reactor/store").AgentAuthState;
     useAuthClient: ({ onAuthentication, onAuthenticationSuccess, onAuthenticationFailure, onLogin, onLoginSuccess, onLoginError, onLoggedOut, }?: import("./types").AuthArgs) => {
@@ -16,7 +17,7 @@ export declare const createReActor: <A extends unknown>({ isLocalEnv, ...options
         logout: (options?: {
             returnTo?: string | undefined;
         } | undefined) => Promise<void>;
-        authenticate: () => Promise<void>;
+        authenticate: () => Promise<import("@ic-reactor/store").Identity>;
         loginLoading: boolean;
         loginError: Error | null;
     };

package/dist/index.js

@@ -43,10 +43,11 @@ const createReActor = (_a) => {
                 (process.env.NODE_ENV === "development" ||
                     process.env.DFX_NETWORK === "local"));
     const actorManager = (0, store_1.createReActorStore)(Object.assign({ isLocalEnv }, options));
-    const { useAuthClient, useAgentManager, useAuthStore } = (0, auth_1.getAuthHooks)(actorManager.agentManager);
+    const { useAuthClient, useUserPrincipal, useAgentManager, useAuthStore } = (0, auth_1.getAuthHooks)(actorManager.agentManager);
     const { initialize, useActorStore, useQueryCall, useUpdateCall, useMethodCall, useMethodField, useMethodFields, useMethodNames, useServiceFields, } = (0, actor_1.getActorHooks)(actorManager);
     return {
         initialize,
+        useUserPrincipal,
         useAgentManager,
         useMethodFields,
         useMethodField,

package/dist/types.d.ts

@@ -1,13 +1,13 @@
-import type { ExtractActorMethodArgs, ExtractActorMethodReturnType, Identity, ServiceMethodType } from "@ic-reactor/store";
+import type { ExtractActorMethodArgs, ExtractActorMethodReturnType, Identity, Principal, 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;
+    onAuthentication?: (promise: () => Promise<Identity>) => void;
     onAuthenticationSuccess?: (identity: Identity) => void;
-    onAuthenticationFailure?: (error: Error | undefined) => void;
-    onLoginSuccess?: () => void;
-    onLoginError?: (error: Error | undefined) => void;
-    onLogin?: () => void;
+    onAuthenticationFailure?: (error: Error) => void;
+    onLoginSuccess?: (principal: Principal) => void;
+    onLoginError?: (error: Error) => void;
+    onLogin?: (promise: () => Promise<Principal>) => void;
     onLoggedOut?: () => void;
 };
 export type ActorCallArgs<A, M extends keyof A> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/react",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "A React library for interacting with Dfinity actors",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,5 +48,5 @@
     "react": ">=16.8",
     "zustand": "4.4"
   },
-  "gitHead": "be65990c31a4e7a86539fec2c6600de3e32a0c79"
+  "gitHead": "48251ebc25add07c5a94ff63ebc8bf2dc8e0caba"
 }