MMI-2119-env-name-as-key

app/scripts/controllers/mmi-controller.js

@@ -267,7 +267,7 @@ export default class MMIController extends EventEmitter {
         custodianDetails: accounts[item].custodianDetails,
         labels: accounts[item].labels,
         token: accounts[item].token,
-        apiUrl: accounts[item].apiUrl,
+        envName: custodianName,
         custodyType: custodian.keyringClass.type,
         chainId: accounts[item].chainId,
       })),
@@ -278,7 +278,6 @@ export default class MMIController extends EventEmitter {
         name: accounts[item].name,
         custodianDetails: accounts[item].custodianDetails,
         labels: accounts[item].labels,
-        apiUrl: accounts[item].apiUrl,
         custodyType: custodian.keyringClass.type,
         custodianName,
         chainId: accounts[item].chainId,
@@ -362,7 +361,7 @@ export default class MMIController extends EventEmitter {
 
   async getCustodianAccounts(
     token,
-    apiUrl,
+    envName,
     custodianType,
     getNonImportedAccounts,
   ) {
@@ -391,14 +390,14 @@ export default class MMIController extends EventEmitter {
 
     const accounts = await keyring.getCustodianAccounts(
       token,
-      apiUrl,
+      envName,
       null,
       getNonImportedAccounts,
     );
     return accounts;
   }
 
-  async getCustodianAccountsByAddress(token, apiUrl, address, custodianType) {
+  async getCustodianAccountsByAddress(token, envName, address, custodianType) {
     let keyring;
 
     if (custodianType) {
@@ -412,7 +411,11 @@ export default class MMIController extends EventEmitter {
       throw new Error('No custodian specified');
     }
 
-    const accounts = await keyring.getCustodianAccounts(token, apiUrl, address);
+    const accounts = await keyring.getCustodianAccounts(
+      token,
+      envName,
+      address,
+    );
     return accounts;
   }
 
@@ -530,18 +533,19 @@ export default class MMIController extends EventEmitter {
     return keyring ? keyring.getAllAccountsWithToken(token) : [];
   }
 
-  async setCustodianNewRefreshToken({ address, newAuthDetails }) {
+  async setCustodianNewRefreshToken({ address, refreshToken }) {
     const custodyType = this.custodyController.getCustodyTypeByAddress(
       toChecksumHexAddress(address),
     );
 
     const keyring = await this.addKeyringIfNotExists(custodyType);
 
-    await keyring.replaceRefreshTokenAuthDetails(address, newAuthDetails);
+    await keyring.replaceRefreshTokenAuthDetails(address, refreshToken);
   }
 
   async handleMmiCheckIfTokenIsPresent(req) {
-    const { token, apiUrl } = req.params;
+    const { token, envName } = req.params;
+    // TODO (Bernardo) - Check if this is the case
     const custodyType = 'Custody - JSONRPC'; // Only JSONRPC is supported for now
 
     // This can only work if the extension is unlocked
@@ -551,7 +555,7 @@ export default class MMIController extends EventEmitter {
 
     return await this.custodyController.handleMmiCheckIfTokenIsPresent({
       token,
-      apiUrl,
+      envName,
       keyring,
     });
   }

app/scripts/lib/rpc-method-middleware/handlers/institutional/mmi-check-if-token-is-present.js

@@ -18,7 +18,7 @@ export default mmiAuthenticate;
  * @typedef {object} MmiCheckIfTokenIsPresentParam
  * @property {string} service - The service to which we are authenticating, e.g. 'codefi-compliance'
  * @property {object} environment - The environment in which we are authenticating, e.g. 'saturn-dev'
- * @property {apiUrl} apiUrl - The API URL to which we are authenticating, e.g. 'https://saturn-custody.codefi.network/eth'
+ * @property {envName} envName - The environment to which we are authenticating, e.g. 'neptune-custody-prod'
  * @property {object} token - The token used to authenticate
  */
 

package.json

@@ -237,10 +237,10 @@
     "@lavamoat/lavadome-react": "0.0.11",
     "@lavamoat/snow": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@metamask-institutional/custody-controller": "^0.2.18",
-    "@metamask-institutional/custody-keyring": "^1.0.7",
-    "@metamask-institutional/extension": "^0.3.12",
-    "@metamask-institutional/institutional-features": "^1.2.9",
+    "@metamask-institutional/custody-controller": "^0.2.20",
+    "@metamask-institutional/custody-keyring": "^1.0.10",
+    "@metamask-institutional/extension": "^0.3.13",
+    "@metamask-institutional/institutional-features": "^1.2.11",
     "@metamask-institutional/portfolio-dashboard": "^1.4.0",
     "@metamask-institutional/rpc-allowlist": "^1.0.0",
     "@metamask-institutional/sdk": "^0.1.23",

ui/components/institutional/jwt-url-form/__snapshots__/jwt-url-form.test.js.snap

@@ -25,34 +25,6 @@ exports[`JwtUrlForm shows JWT text area when no jwt token exists 1`] = `
         />
       </div>
     </div>
-    <div
-      class="mm-box mm-box--width-full"
-    >
-      <p
-        class="mm-box mm-text mm-text--body-md mm-box--display-block mm-box--color-text-default"
-      />
-      <div
-        class="mm-box mm-box--margin-top-4"
-      >
-        <div
-          class="MuiFormControl-root MuiTextField-root MuiFormControl-fullWidth"
-        >
-          <div
-            class="MuiInputBase-root MuiInput-root TextField-inputRoot-57 MuiInputBase-fullWidth MuiInput-fullWidth MuiInputBase-formControl MuiInput-formControl"
-          >
-            <input
-              aria-invalid="false"
-              class="MuiInputBase-input MuiInput-input"
-              data-testid="jwt-api-url-input"
-              dir="auto"
-              id="api-url-box"
-              type="text"
-              value="url"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
   </div>
 </div>
 `;

ui/components/institutional/jwt-url-form/jwt-url-form.js

@@ -14,7 +14,6 @@ import {
 } from '../../../helpers/constants/design-system';
 import { ButtonVariant, Box, Button, Text } from '../../component-library';
 import TextArea from '../../ui/textarea';
-import TextField from '../../ui/text-field';
 import JwtDropdown from '../jwt-dropdown';
 
 const JwtUrlForm = (props) => {
@@ -101,40 +100,15 @@ const JwtUrlForm = (props) => {
           </Box>
         )}
       </Box>
-      <Box width={BlockSize.Full}>
-        <Text display={Display.Block} variant={TextVariant.bodyMd}>
-          {props.urlInputText}
-        </Text>
-        <Box marginTop={4}>
-          <TextField
-            fullWidth
-            id="api-url-box"
-            data-testid="jwt-api-url-input"
-            type="text"
-            onChange={(e) => {
-              props.onUrlChange(e.target.value);
-            }}
-            value={props.apiUrl}
-            inputProps={{
-              backgroundColor: BackgroundColor.backgroundDefault,
-              color: TextColor.textDefault,
-              padding: 2,
-            }}
-          />
-        </Box>
-      </Box>
     </Box>
   );
 };
 
 JwtUrlForm.propTypes = {
   jwtList: PropTypes.array.isRequired,
-  onUrlChange: PropTypes.func.isRequired,
   onJwtChange: PropTypes.func.isRequired,
   currentJwt: PropTypes.string,
   jwtInputText: PropTypes.string,
-  apiUrl: PropTypes.string,
-  urlInputText: PropTypes.string,
 };
 
 export default JwtUrlForm;

ui/components/institutional/jwt-url-form/jwt-url-form.stories.js

@@ -7,8 +7,6 @@ export default {
   args: {
     jwtList: ['jwt1', 'jwt2', 'jwt3'],
     currentJwt: 'jwt1',
-    urlInputText: 'url',
-    apiUrl: 'https://apiurl.io/v1',
     jwtInputText: 'some input text',
     onJwtChange: () => {
       /**/

ui/components/institutional/jwt-url-form/jwt-url-form.test.js

@@ -20,8 +20,6 @@ describe('JwtUrlForm', function () {
     currentJwt: 'jwt1',
     onJwtChange: jest.fn(),
     jwtInputText: 'input text',
-    apiUrl: 'url',
-    urlInputText: '',
     onUrlChange: jest.fn(),
   };
 
@@ -42,23 +40,6 @@ describe('JwtUrlForm', function () {
     expect(screen.getByText('input text')).toBeInTheDocument();
   });
 
-  it('calls onUrlChange when API URL input value changes', () => {
-    const { getByTestId } = renderWithProvider(
-      <JwtUrlForm {...props} />,
-      store,
-    );
-
-    const apiUrlinput = getByTestId('jwt-api-url-input');
-
-    fireEvent.change(apiUrlinput, { target: { value: 'url' } });
-
-    fireEvent.change(apiUrlinput, {
-      target: { value: 'new url' },
-    });
-
-    expect(props.onUrlChange).toHaveBeenCalled();
-  });
-
   it('shows JWT text area when no jwt token exists', () => {
     const customProps = {
       ...props,

ui/helpers/utils/institutional/find-by-custodian-name.ts

@@ -13,6 +13,7 @@ type Custodian = {
   version: number;
 };
 
+// TODO (Bernardo) - There can be multiple custodian with the same name, envName should be used instead
 export function findCustodianByDisplayName(
   displayName: string,
   custodians: Custodian[],