Handle change of API endpoint in next places and other fixes

openhive-network · Apr 4, 2024 · a491798 · a491798
1 parent e11ec7d
commit a491798
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 64 deletions.
diff --git a/apps/blog/pages/[param]/settings.tsx b/apps/blog/pages/[param]/settings.tsx
@@ -24,6 +24,7 @@ import { useParams } from 'next/navigation';
 import { useUser } from '@smart-signer/lib/auth/use-user';
 import { cn } from '@ui/lib/utils';
 import { hiveChainService } from '@transaction/lib/hive-chain-service';
+import { hbauthUseStrictMode, hbauthService } from '@smart-signer/lib/hbauth-service';
 
 const DEFAULTS_ENDPOINTS = [
   'https://api.hive.blog',
@@ -213,6 +214,10 @@ export default function UserSettings() {
             onValueChange={async (newEndpoint) => {
               setEndpoint(newEndpoint);
               await hiveChainService.setHiveChainEndpoint(newEndpoint);
+              await hbauthService.setOnlineClient(
+                hbauthUseStrictMode,
+                {node: newEndpoint}
+                );
             }}
             value={endpoint}
           >

diff --git a/packages/smart-signer/lib/api-handlers/auth/login.ts b/packages/smart-signer/lib/api-handlers/auth/login.ts
@@ -10,7 +10,7 @@ import { IronSessionData } from '@smart-signer/types/common';
 import { cookieNamePrefix } from '@smart-signer/lib/session';
 import { checkCsrfHeader } from '@smart-signer/lib/csrf-protection';
 import { verifyLoginChallenge } from '@smart-signer/lib/verify-login-challenge';
-import { verifyLogin } from '@smart-signer/lib/auth/use-sign-in';
+import { verifyLogin } from '@smart-signer/lib/verify-login';
 import { getLoginChallengeFromTransactionForLogin } from '@smart-signer/lib/login-operation'
 
 import { getLogger } from '@hive/ui/lib/logging';

diff --git a/packages/smart-signer/lib/auth/use-sign-in.tsx b/packages/smart-signer/lib/auth/use-sign-in.tsx
@@ -2,71 +2,13 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { QUERY_KEY } from '@smart-signer/lib/query-keys';
 import { fetchJson } from '@smart-signer/lib/fetch-json';
 import { PostLoginSchema } from '@smart-signer/lib/auth/utils';
-import { User, KeyType } from '@smart-signer/types/common';
+import { User } from '@smart-signer/types/common';
 import { csrfHeaderName } from '@smart-signer/lib/csrf-protection';
-import { authorityChecker, AuthorityLevel } from '@smart-signer/lib/authority-checker';
-import { ApiTransaction } from '@hive/wax';
+import { verifyLogin } from '@smart-signer/lib/verify-login';
 
 import { getLogger } from '@ui/lib/logging';
 const logger = getLogger('app');
 
-/**
- * Authenticate user by checking signature in fake transaction.
- *
- * @param {PostLoginSchema} data
- * @param {string} [uid='']
- * @returns {Promise<User>}
- */
-export async function verifyLogin(data: PostLoginSchema, uid: string = ''): Promise<User> {
-  const { username, keyType, pack, strict, loginType } = data;
-  logger.info('verifyLogin arg data', data);
-  let authorityLevel: AuthorityLevel;
-  if (keyType === KeyType.posting) {
-    authorityLevel = AuthorityLevel.POSTING;
-  } else if (keyType === KeyType.active) {
-    authorityLevel = AuthorityLevel.ACTIVE;
-  } else {
-    throw new Error('Unsupported keyType');
-  }
-
-  try {
-    const isAuthenticated = await authorityChecker(
-      JSON.parse(data.txJSON) as ApiTransaction,
-      username,
-      authorityLevel,
-      pack,
-      strict
-    );
-
-    const mode = strict ? 'strict' : 'non-strict';
-    if (isAuthenticated) {
-      logger.info(
-        'User %s passed authentication in %s mode with key type %s',
-        username, mode, keyType
-        );
-    } else {
-      logger.info(
-        'User %s failed authentication in %s mode with key type %s',
-        username, mode, keyType
-        );
-    }
-
-    const user: User = {
-      isLoggedIn: isAuthenticated,
-      username,
-      avatarUrl: '',
-      loginType,
-      keyType,
-      authenticateOnBackend: false,
-    };
-    return user;
-
-  } catch (error) {
-    logger.error('error in verifyLogin', error);
-    throw error;
-  }
-}
-
 /**
  * Authenticate user via request to backend.
  *

diff --git a/packages/smart-signer/lib/authority-checker.ts b/packages/smart-signer/lib/authority-checker.ts
@@ -1,12 +1,12 @@
 import {
-  createHiveChain,
   IHiveChainInterface,
   ApiTransaction,
   ApiAuthority,
   TAccountName,
   ApiKeyAuth,
   TTransactionPackType
 } from '@hive/wax';
+import { hiveChainService } from '@transaction/lib/hive-chain-service';
 
 import { getLogger } from '@hive/ui/lib/logging';
 const logger = getLogger('app');
@@ -71,7 +71,7 @@ export const authorityChecker = async (
     logger.info('authorityChecker args: %o',
       { txJSON, expectedSignerAccount, expectedAuthorityLevel, pack });
 
-    const hiveChain: IHiveChainInterface = await createHiveChain();
+    const hiveChain: IHiveChainInterface = await hiveChainService.getHiveChain();
     const txBuilder = hiveChain.TransactionBuilder.fromApi(txJSON);
 
     const authorityVerificationResult = await hiveChain.api.database_api

diff --git a/packages/smart-signer/lib/storage-mixin.ts b/packages/smart-signer/lib/storage-mixin.ts
@@ -44,6 +44,7 @@ export function StorageMixin<TBase extends WithStorage>(Base: TBase) {
                     && isStorageAvailable(this.storageType, true)) {
                 this.storage = window.sessionStorage;
             } else {
+                this.storageType = 'memoryStorage';
                 this.storage = memoryStorage;
             }
         }

diff --git a/packages/smart-signer/lib/use-local-storage.ts b/packages/smart-signer/lib/use-local-storage.ts
@@ -27,7 +27,7 @@ function useLocalStorage<T extends string | object>(key: string, initialValue: T
   // Return a wrapped version of useState's setter function that
   // persists the new value to localStorage.
   const setValue = (value: T) => {
-    logger.info('in useLocalStorage setValue, value is %o', value);
+    logger.info('In useLocalStorage setValue for key %s to: %o', key, value);
     try {
       // Allow value to be a function so we have same API as useState
       const valueToStore = value instanceof Function ? value(storedValue) : value;

diff --git a/packages/smart-signer/lib/verify-login.ts b/packages/smart-signer/lib/verify-login.ts
@@ -0,0 +1,65 @@
+import { PostLoginSchema } from '@smart-signer/lib/auth/utils';
+import { User, KeyType } from '@smart-signer/types/common';
+import { authorityChecker, AuthorityLevel } from '@smart-signer/lib/authority-checker';
+import { ApiTransaction } from '@hive/wax';
+
+import { getLogger } from '@ui/lib/logging';
+const logger = getLogger('app');
+
+/**
+ * Authenticate user by checking signature in fake transaction.
+ *
+ * @param {PostLoginSchema} data
+ * @param {string} [uid='']
+ * @returns {Promise<User>}
+ */
+export async function verifyLogin(data: PostLoginSchema, uid: string = ''): Promise<User> {
+    const { username, keyType, pack, strict, loginType } = data;
+    logger.info('verifyLogin argument data: %o', data);
+    let authorityLevel: AuthorityLevel;
+    if (keyType === KeyType.posting) {
+      authorityLevel = AuthorityLevel.POSTING;
+    } else if (keyType === KeyType.active) {
+      authorityLevel = AuthorityLevel.ACTIVE;
+    } else {
+      throw new Error('Unsupported keyType');
+    }
+
+    try {
+      const isAuthenticated = await authorityChecker(
+        JSON.parse(data.txJSON) as ApiTransaction,
+        username,
+        authorityLevel,
+        pack,
+        strict
+      );
+
+      const mode = strict ? 'strict' : 'non-strict';
+      if (isAuthenticated) {
+        logger.info(
+          'User %s passed authentication in %s mode with key type %s',
+          username, mode, keyType
+          );
+      } else {
+        logger.info(
+          'User %s failed authentication in %s mode with key type %s',
+          username, mode, keyType
+          );
+      }
+
+      const user: User = {
+        isLoggedIn: isAuthenticated,
+        username,
+        avatarUrl: '',
+        loginType,
+        keyType,
+        authenticateOnBackend: false,
+      };
+      return user;
+
+    } catch (error) {
+      logger.error('error in verifyLogin', error);
+      throw error;
+    }
+  }
+