Skip to content

Commit 9669359

Browse files
rashedmytPrabhakar Kumar
authored andcommitted
Deletes JAVA APIs from MATLAB startup script.
1 parent 849ee4b commit 9669359

File tree

2 files changed

+2
-30
lines changed

2 files changed

+2
-30
lines changed

matlab_proxy/app_state.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@
66
import logging
77
import os
88
import time
9+
import uuid
910
from collections import deque
1011
from datetime import datetime, timedelta, timezone
1112
from typing import Final, Optional
12-
import uuid
1313

1414
from matlab_proxy import util
1515
from matlab_proxy.constants import (
1616
CONNECTOR_SECUREPORT_FILENAME,
17-
MATLAB_LOGS_FILE_NAME,
1817
IS_CONCURRENCY_CHECK_ENABLED,
18+
MATLAB_LOGS_FILE_NAME,
1919
USER_CODE_OUTPUT_FILE_NAME,
2020
)
21-
2221
from matlab_proxy.settings import get_process_startup_timeout
23-
2422
from matlab_proxy.util import mw, mwi, system, windows
2523
from matlab_proxy.util.mwi import environment_variables as mwi_env
2624
from matlab_proxy.util.mwi import token_auth
@@ -675,12 +673,6 @@ async def __setup_env_for_matlab(self) -> dict:
675673
matlab_env["MLM_WEB_LICENSE"] = "true"
676674
matlab_env["MLM_WEB_USER_CRED"] = access_token_data["token"]
677675
matlab_env["MLM_WEB_ID"] = self.licensing["entitlement_id"]
678-
matlab_env["MW_LOGIN_EMAIL_ADDRESS"] = self.licensing["email_addr"]
679-
matlab_env["MW_LOGIN_FIRST_NAME"] = self.licensing["first_name"]
680-
matlab_env["MW_LOGIN_LAST_NAME"] = self.licensing["last_name"]
681-
matlab_env["MW_LOGIN_DISPLAY_NAME"] = self.licensing["display_name"]
682-
matlab_env["MW_LOGIN_USER_ID"] = self.licensing["user_id"]
683-
matlab_env["MW_LOGIN_PROFILE_ID"] = self.licensing["profile_id"]
684676

685677
matlab_env["MHLM_CONTEXT"] = (
686678
"MATLAB_JAVASCRIPT_DESKTOP"

matlab_proxy/matlab/startup.m

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,5 @@
11
% Copyright 2020-2024 The MathWorks, Inc.
22

3-
% Configure logged in user if possible
4-
if ~isempty(getenv('MW_LOGIN_USER_ID'))
5-
user_id = getenv('MW_LOGIN_USER_ID');
6-
first_name = getenv('MW_LOGIN_FIRST_NAME');
7-
last_name = getenv('MW_LOGIN_LAST_NAME');
8-
email_address = getenv('MW_LOGIN_EMAIL_ADDRESS');
9-
profile_id = getenv('MW_LOGIN_PROFILE_ID');
10-
display_name = getenv('MW_LOGIN_DISPLAY_NAME');
11-
12-
li = com.mathworks.matlab_login.MatlabLogin.isUserLoggedIn(2, 'DESKTOP');
13-
token = li.getToken();
14-
login_level = 2;
15-
remember_me = true;
16-
li = com.mathworks.matlab_login.MatlabLogin.saveCacheLoginInfo(first_name, ...
17-
last_name, email_address, user_id, token, profile_id, login_level, ...
18-
remember_me, email_address, display_name);
19-
% Clear all local variables from users workspace.
20-
clear li login_level user_id first_name last_name email_address profile_id display_name token remember_me
21-
end
22-
233
if (strlength(getenv('MWI_BASE_URL')) > 0)
244
connector.internal.setConfig('contextRoot', getenv('MWI_BASE_URL'));
255
end

0 commit comments

Comments
 (0)