refactor: improve variable namings

apps/dashboard-for-dapps/src/routes/index.tsx

@@ -74,7 +74,7 @@ const useFetchGrants = () => {
     queryKey: ["grants"],
     queryFn: () =>
       idOS.grants.list({
-        grantee: address,
+        granteeAddress: address,
       }),
     select: (data) =>
       data.map((grant) => ({
@@ -331,7 +331,6 @@ function CredentialDetails({
                         <List.Item
                           flexShrink="0"
                           key={key}
-                          role="button"
                           transition="transform 0.2s"
                           cursor="pointer"
                           _hover={{ transform: "scale(1.02)" }}
@@ -424,7 +423,7 @@ function SearchResults({ results }: { results: GrantsWithFormattedLockedUntil })
               pt="4"
               grow
               label="Owner"
-              value={grant.owner}
+              value={grant.ownerAddress}
               truncate
             />
             <DataListItem
@@ -439,7 +438,7 @@ function SearchResults({ results }: { results: GrantsWithFormattedLockedUntil })
               pt="4"
               grow
               label="Grantee"
-              value={grant.grantee}
+              value={grant.granteeAddress}
               truncate
             />
             <DataListItem

apps/idos-data-dashboard/src/core/idos/idos-provider.tsx

@@ -62,7 +62,7 @@ export const Provider = ({ children }: PropsWithChildren) => {
     if (profile) {
       // @ts-expect-error
       await _sdk.setSigner(signer.type, signer.value);
-      const _pk = _sdk.auth.currentUser.publicKey;
+      const _pk = _sdk.auth.currentUser.currentUserPublicKey;
 
       setPublicKey(_pk);
     }

apps/idos-data-dashboard/src/routes/dashboard/credentials/components/delete-credential.tsx

@@ -142,7 +142,7 @@ export const DeleteCredential = ({ isOpen, credential, onClose }: DeleteCredenti
   if (!credential) return null;
 
   const [currentToRevoke] = state;
-  const { grantee } = currentToRevoke ?? {};
+  const { granteeAddress } = currentToRevoke ?? {};
 
   const meta = JSON.parse(credential.public_notes);
 
@@ -172,7 +172,7 @@ export const DeleteCredential = ({ isOpen, credential, onClose }: DeleteCredenti
               <>
                 <Text mb={1}>Revoking grant for grantee:</Text>
                 <Code px={2} py={1} rounded="md" fontSize="sm" bg="neutral.800">
-                  {grantee}
+                  {granteeAddress}
                 </Code>
               </>
             ) : deleteCredential.isPending ? (

apps/idos-data-dashboard/src/routes/dashboard/credentials/components/grants-center.tsx

@@ -34,8 +34,8 @@ type GrantsCenterProps = {
 };
 
 function generateGrantId(grant: idOSGrant): string {
-  const { dataId, grantee, owner, lockedUntil } = grant;
-  return [dataId, grantee, owner, lockedUntil].join("-");
+  const { dataId, granteeAddress, ownerAddress, lockedUntil } = grant;
+  return [dataId, granteeAddress, ownerAddress, lockedUntil].join("-");
 }
 
 function timelockToMs(timelock: number): number {
@@ -96,7 +96,7 @@ const Shares = ({ credentialId, grants }: { credentialId: string; grants: idOSGr
                 data-grant={JSON.stringify(grant)}
               >
                 <Td maxW={140}>
-                  <Text isTruncated>{grant.grantee}</Text>
+                  <Text isTruncated>{grant.granteeAddress}</Text>
                 </Td>
                 <Td>
                   <Text>{grant.lockedUntil ? timelockToDate(grant.lockedUntil) : "-"}</Text>

apps/idos-data-dashboard/src/routes/dashboard/credentials/shared/index.ts

@@ -9,11 +9,11 @@ export const useFetchGrants = ({ credentialId }: { credentialId: string }) => {
   const queryClient = useQueryClient();
   const credentials = queryClient.getQueryData<idOSCredentialWithShares[]>(["credentials"]);
 
-  const owner = address?.includes("0x") ? address : publicKey;
+  const ownerAddress = address?.includes("0x") ? address : publicKey;
 
   return useQuery({
     queryKey: ["grants", credentialId],
-    queryFn: () => sdk.grants.list({ owner }),
+    queryFn: () => sdk.grants.list({ ownerAddress }),
     retry: 1,
     select(grants) {
       if (!credentials || !grants) return [];
@@ -34,8 +34,8 @@ export const useRevokeGrant = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{ transactionId: string }, DefaultError, idOSGrant, Ctx>({
-    mutationFn: ({ grantee, dataId, lockedUntil }: idOSGrant) =>
-      sdk.grants.revoke("credentials", dataId, grantee, dataId, lockedUntil),
+    mutationFn: ({ granteeAddress, dataId, lockedUntil }: idOSGrant) =>
+      sdk.grants.revoke("credentials", dataId, granteeAddress, dataId, lockedUntil),
     mutationKey: ["revokeGrant"],
     async onMutate(grant) {
       const previousCredentials =

apps/idos-enclave/src/lib/enclave.js

@@ -48,30 +48,31 @@ export class Enclave {
     });
   }
 
-  storage(humanId, signerAddress, signerPublicKey, expectedUserEncryptionPublicKey) {
-    humanId && this.store.set("human-id", humanId);
+  storage(userId, signerAddress, userEncryptionPublicKey, expectedUserEncryptionPublicKey) {
+    userId && this.store.set("user-id", userId);
     signerAddress && this.store.set("signer-address", signerAddress);
-    signerPublicKey && this.store.set("signer-public-key", signerPublicKey);
+    userEncryptionPublicKey && this.store.set("signer-public-key", userEncryptionPublicKey);
 
     const litAttrs = this.store.get("litAttrs");
     this.handlstoreableAttributes(litAttrs);
 
     const storeWithCodec = this.store.pipeCodec(Base64Codec);
 
     this.expectedUserEncryptionPublicKey = expectedUserEncryptionPublicKey;
-    this.humanId = humanId;
+    this.userId = userId;
 
     if (!this.isAuthorizedOrigin) {
       return {
-        humanId: "",
+        userId: "",
         encryptionPublicKey: "",
         signerAddress: "",
         signerPublicKey: "",
       };
     }
 
     return {
-      humanId: this.humanId ?? this.store.get("human-id"),
+      // TODO Remove human-user migration code.
+      userId: this.userId ?? this.store.get("user-id") ?? this.store.get("human-id"),
       encryptionPublicKey: storeWithCodec.get("encryption-public-key"),
       signerAddress: this.store.get("signer-address"),
       signerPublicKey: this.store.get("signer-public-key"),
@@ -157,7 +158,7 @@ export class Enclave {
 
   async ensureKeyPair() {
     const password = this.store.get("password");
-    const salt = this.humanId;
+    const salt = this.userId;
 
     const storeWithCodec = this.store.pipeCodec(Base64Codec);
 
@@ -250,10 +251,6 @@ export class Enclave {
     }
   }
 
-  messageParent(message) {
-    window.parent.postMessage(message, this.parentOrigin);
-  }
-
   async filterCredentialsByCountries(credentials, countries) {
     const decrypted = await Promise.all(
       credentials.map(async (credential) => ({
@@ -326,12 +323,12 @@ export class Enclave {
         const [requestName, requestData] = Object.entries(event.data).flat();
         const {
           fullMessage,
-          humanId,
+          userId,
           message,
           receiverPublicKey,
           senderPublicKey,
           signerAddress,
-          signerPublicKey,
+          signerEncryptionPublicKey,
           mode,
           theme,
           credentials,
@@ -352,9 +349,9 @@ export class Enclave {
           reset: () => [],
           configure: () => [mode, theme],
           storage: () => [
-            humanId,
+            userId,
             signerAddress,
-            signerPublicKey,
+            signerEncryptionPublicKey,
             expectedUserEncryptionPublicKey,
             litAttrs,
             userWallets,
@@ -401,7 +398,7 @@ export class Enclave {
   }
 
   async #openDialog(intent, message) {
-    if (!this.humanId) throw new Error("Can't open dialog without humanId");
+    if (!this.userId) throw new Error("Can't open dialog without userId");
     const width = 600;
     const height =
       this.configuration?.mode === "new" ? 600 : intent === "backupPasswordOrSecret" ? 520 : 400;
@@ -417,7 +414,7 @@ export class Enclave {
       .map((feat) => feat.join("="))
       .join(",");
 
-    const dialogURL = new URL(`/dialog.html?humanId=${this.humanId}`, window.location.origin);
+    const dialogURL = new URL(`/dialog.html?userId=${this.userId}`, window.location.origin);
     this.dialog = window.open(dialogURL, "idos-dialog", popupConfig);
 
     await new Promise((resolve) => this.dialog.addEventListener("ready", resolve, { once: true }));

apps/idos-enclave/src/lib/idOSKeyDerivation.ts

@@ -6,7 +6,7 @@ import { scrypt } from "scrypt-js";
  *    Unicode normalization of input strigs
  *    NFKC: compatibility decomposition followed by canonical composition
  * validateSalt
- *    UUID v4 format (idOS human IDs)
+ *    UUID v4 format (idOS user IDs)
  * n, r, p
  *    CPU/RAM cost (higher = costlier)
  *    n: iteration count

apps/idos-enclave/src/pages/App.tsx

@@ -64,7 +64,7 @@ export function App({ store, enclave }: AppProps) {
   const [origin, setOrigin] = useState<string | null>(null);
   const [message, setMessage] = useState<string | null>(null);
   const [encryptionPublicKey, setEncryptionUserPublicKey] = useState<string>("");
-  const [humanId] = useState<string | null>(
+  const [userId] = useState<string | null>(
     new URLSearchParams(window.location.search).get("humanId"),
   );
 
@@ -197,11 +197,7 @@ export function App({ store, enclave }: AppProps) {
   if (method === "password") {
     return (
       <Layout onHeaderClick={resetMethod}>
-        <PasswordForm
-          {...methodProps}
-          encryptionPublicKey={encryptionPublicKey}
-          humanId={humanId}
-        />
+        <PasswordForm {...methodProps} encryptionPublicKey={encryptionPublicKey} userId={userId} />
       </Layout>
     );
   }

apps/idos-enclave/src/pages/methods/Password.tsx

@@ -82,10 +82,10 @@ export function PasswordForm({
   onSuccess,
   store,
   encryptionPublicKey,
-  humanId,
+  userId,
 }: MethodProps<{ password: string; duration: number }> & {
   encryptionPublicKey?: string;
-  humanId: string | null;
+  userId: string | null;
 }) {
   const password = useSignal("");
   const duration = useSignal(7);
@@ -96,7 +96,8 @@ export function PasswordForm({
   const litCipher = store.get("lit-cipher-text");
 
   async function derivePublicKeyFromPassword(password: string) {
-    const salt = store.get("human-id") || humanId;
+    // TODO Remove human-user migration code.
+    const salt = store.get("user-id") || store.get("human-id") || userId;
     const secretKey = await idOSKeyDerivation({ password, salt });
     const keyPair = nacl.box.keyPair.fromSecretKey(secretKey);
     return encode(keyPair.publicKey);

examples/idos-example-dapp/api/EVM.ts

@@ -19,7 +19,7 @@ const evmGranteeSigner = new ethers.Wallet(
 const idosGrantee = await idOSGrantee.init({
   chainType: "EVM",
   granteeSigner: evmGranteeSigner,
-  encryptionSecret: ENCRYPTION_SECRET_KEY,
+  recipientEncryptionPrivateKey: ENCRYPTION_SECRET_KEY,
 });
 
 const encryptionPublicKey = idosGrantee.encryptionPublicKey;

examples/idos-example-dapp/api/NEAR.ts

@@ -15,7 +15,7 @@ const nearGranteeSigner = KeyPair.fromString(NEAR_GRANTEE_PRIVATE_KEY);
 const idosGrantee = await idOSGrantee.init({
   chainType: "NEAR",
   granteeSigner: nearGranteeSigner,
-  encryptionSecret: ENCRYPTION_SECRET_KEY,
+  recipientEncryptionPrivateKey: ENCRYPTION_SECRET_KEY,
 });
 
 const encryptionPublicKey = idosGrantee.encryptionPublicKey;
@@ -38,7 +38,7 @@ export default async function (request: VercelRequest, response: VercelResponse)
   }
 
   const rawBody = request.read();
-  let body;
+  let body: ReturnType<typeof JSON.parse>;
   try {
     body = JSON.parse(rawBody);
   } catch (e) {

examples/idos-example-dapp/src/creds2.integration.test.ts

@@ -63,7 +63,7 @@ const makePublicNotes = (plaintextW3cVc: ReturnType<typeof makeW3cCredential>):
 
 export const issuer_makeUserCredential = (
   idvData: IdvDataResult,
-  humanId: string,
+  userId: string,
   receiverEncryptionPublicKey: Uint8Array,
   issuerAttestationSecretKey: Uint8Array,
 ) => {
@@ -74,7 +74,7 @@ export const issuer_makeUserCredential = (
   const publicNotes = makePublicNotes(plaintextContent);
 
   return {
-    humanId,
+    userId,
     publicNotes: JSON.stringify(publicNotes),
     plaintextContent: toBytes(plaintextContent),
     receiverEncryptionPublicKey,
@@ -83,7 +83,7 @@ export const issuer_makeUserCredential = (
 
 export const issuer_makeUserCredentialForSharing = (
   idvData: IdvDataResult,
-  humanId: string,
+  userId: string,
   receiverEncryptionPublicKey: Uint8Array,
   issuerAttestationSecretKey: Uint8Array,
   originalCredentialId: string,
@@ -93,7 +93,7 @@ export const issuer_makeUserCredentialForSharing = (
   const plaintextContent = makeW3cCredential(idvData, issuerAttestationSecretKey);
 
   return {
-    humanId,
+    userId,
     publicNotes: "",
     plaintextContent: toBytes(plaintextContent),
     receiverEncryptionPublicKey,
@@ -115,7 +115,7 @@ import {
   shareCredentialByGrant,
 } from "@idos-network/issuer-sdk-js/credentials";
 
-const humanId = "bf8709ce-9dfc-11ef-a188-047c16570806";
+const userId = "bf8709ce-9dfc-11ef-a188-047c16570806";
 const userEncryptionSecretKey = Base64Codec.decode("nIvx0jPbA8d83rL+I7Vs1B/Fp6pndGtXOX4GDmlEkSQ=");
 const userEncryptionPublicKey = nacl.box.keyPair.fromSecretKey(userEncryptionSecretKey).publicKey;
 const _thirdPartyEncryptionSecretKey = Base64Codec.decode(
@@ -173,7 +173,7 @@ await (async () => {
   const issuerConfig = await issuerConfigBuild();
   const credential = issuer_makeUserCredential(
     getIdvData(),
-    humanId,
+    userId,
     userEncryptionPublicKey,
     issuerAttestationSecretKey,
   );
@@ -189,7 +189,7 @@ await (async () => {
   const issuerConfig = await issuerConfigBuild();
   const credential = issuer_makeUserCredential(
     getIdvData(),
-    humanId,
+    userId,
     userEncryptionPublicKey,
     issuerAttestationSecretKey,
   );
@@ -207,14 +207,14 @@ await (async () => {
     issuerConfig,
     issuer_makeUserCredential(
       getIdvData(),
-      humanId,
+      userId,
       userEncryptionPublicKey,
       issuerAttestationSecretKey,
     ),
   );
   const sharedCredential = issuer_makeUserCredentialForSharing(
     getIdvData(),
-    humanId,
+    userId,
     thirdPartyEncryptionPublicKey,
     issuerAttestationSecretKey,
     insertedCredential.id,
@@ -233,7 +233,7 @@ await (async () => {
   const issuerConfig = await issuerConfigBuild();
   const credential = issuer_makeUserCredential(
     getIdvData(),
-    humanId,
+    userId,
     userEncryptionPublicKey,
     issuerAttestationSecretKey,
   );

examples/idos-example-dapp/src/main.js

@@ -293,7 +293,8 @@ const connectWallet = {
       .h1("eyes", "User's grants to this dApp")
       .wait(
         "awaiting RPC",
-        cache.get("grants") || idos.grants.list({ owner, grantee: granteeInfo.grantee }),
+        cache.get("grants") ||
+          idos.grants.list({ ownerAddress: owner, granteeAddress: granteeInfo.grantee }),
       );
     cache.set("grants", grants);