Skip to content

Commit 14f9cc9

Browse files
sriranjan-ssriranjan-s
authored
Merge pull request #1488 from Puli-shilpa/Dev-2.0
fixed session issue
2 parents ace5638 + 51e5ad0 commit 14f9cc9

File tree

8 files changed

+43
-23
lines changed

8 files changed

+43
-23
lines changed

‎frontend/micro-ui/web/micro-ui-internals/example/src/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ const enabledModules = [
7070
const initTokens = (stateCode) => {
7171
const userType = window.sessionStorage.getItem("userType") || process.env.REACT_APP_USER_TYPE || "CITIZEN";
7272

73-
const token = window.localStorage.getItem("token")|| process.env[`REACT_APP_${userType}_TOKEN`];
73+
const token = sessionStorage.getItem("token")|| process.env[`REACT_APP_${userType}_TOKEN`];
7474

75-
const citizenInfo = window.localStorage.getItem("Citizen.user-info")
75+
const citizenInfo = JSON.parse(sessionStorage.getItem("Citizen.user-info"));
7676

7777
const citizenTenantId = window.localStorage.getItem("Citizen.tenant-id") || stateCode;
7878

79-
const employeeInfo = window.localStorage.getItem("Employee.user-info");
79+
const employeeInfo = JSON.parse(sessionStorage.getItem("Employee.user-info"));
8080
const employeeTenantId = window.localStorage.getItem("Employee.tenant-id");
8181

8282
const userTypeInfo = userType === "CITIZEN" || userType === "QACT" ? "citizen" : "employee";

‎frontend/micro-ui/web/micro-ui-internals/package.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,17 @@
1212
"packages/modules/commonPt",
1313
"packages/modules/dss",
1414
"packages/modules/pt",
15-
"packages/modules/tl"
15+
"packages/modules/tl",
16+
"packages/modules/bills",
17+
"packages/modules/engagement",
18+
"packages/modules/fsm",
19+
"packages/modules/hrms",
20+
"packages/modules/mCollect",
21+
"packages/modules/noc",
22+
"packages/modules/obps",
23+
"packages/modules/pgr",
24+
"packages/modules/receipts",
25+
"packages/modules/ws"
1626
],
1727
"author": "Abhinav Kushwaha <abhinav.kushwaha@egovernments.org>",
1828
"license": "MIT",

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/SelectOtp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const SelectOtp = ({ config, otp, onOtpChange, onResend, onSelect, t, error, use
2323
code_verifier: sessionStorage.getItem("code_verfier_register"),
2424
code: code, module: "REGISTER"
2525
}
26-
console.log("token",code,TokenReq,sessionStorage.getItem("code_verfier_register"))
26+
//console.log("token",code,TokenReq,sessionStorage.getItem("code_verfier_register"))
2727
// const data = await Digit.DigiLockerService.token({TokenReq })
2828

2929
fetch('https://api.digitallocker.gov.in/public/oauth2/1/token', {

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Login/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ const setCitizenDetail = (userObject, token, tenantId) => {
1717
let locale = JSON.parse(sessionStorage.getItem("Digit.initData"))?.value?.selectedLanguage;
1818
localStorage.setItem("Citizen.tenant-id", tenantId);
1919
localStorage.setItem("tenant-id", tenantId);
20-
localStorage.setItem("citizen.userRequestObject", JSON.stringify(userObject));
20+
sessionStorage.setItem("citizen.userRequestObject", JSON.stringify(userObject));
2121
localStorage.setItem("locale", locale);
2222
localStorage.setItem("Citizen.locale", locale);
23-
localStorage.setItem("token", token);
24-
localStorage.setItem("Citizen.token", token);
25-
localStorage.setItem("user-info", JSON.stringify(userObject));
26-
localStorage.setItem("Citizen.user-info", JSON.stringify(userObject));
23+
sessionStorage.setItem("token", token);
24+
sessionStorage.setItem("Citizen.token", token);
25+
sessionStorage.setItem("user-info", JSON.stringify(userObject));
26+
sessionStorage.setItem("Citizen.user-info", JSON.stringify(userObject));
2727
};
2828

2929
const getFromLocation = (state, searchParams) => {

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/employee/Login/login.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ const setEmployeeDetail = (userObject, token) => {
1010
let locale = JSON.parse(sessionStorage.getItem("Digit.locale"))?.value || "en_IN";
1111
localStorage.setItem("Employee.tenant-id", userObject?.tenantId);
1212
localStorage.setItem("tenant-id", userObject?.tenantId);
13-
localStorage.setItem("citizen.userRequestObject", JSON.stringify(userObject));
13+
sessionStorage.setItem("citizen.userRequestObject", JSON.stringify(userObject));
1414
localStorage.setItem("locale", locale);
1515
localStorage.setItem("Employee.locale", locale);
16-
localStorage.setItem("token", token);
17-
localStorage.setItem("Employee.token", token);
18-
localStorage.setItem("user-info", JSON.stringify(userObject));
19-
localStorage.setItem("Employee.user-info", JSON.stringify(userObject));
16+
sessionStorage.setItem("token", token);
17+
sessionStorage.setItem("Employee.token", token);
18+
sessionStorage.setItem("user-info", JSON.stringify(userObject));
19+
sessionStorage.setItem("Employee.user-info", JSON.stringify(userObject));
2020
};
2121

2222
const Login = ({ config: propsConfig, t, isDisabled }) => {

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/PropertyTax.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ if(window.location.href.includes("code"))
101101
code_verifier: sessionStorage.getItem("code_verfier"),
102102
code: code, module: "PT"
103103
}
104-
console.log("token",code,TokenReq,sessionStorage.getItem("code_verfier"))
104+
// console.log("token",code,TokenReq,sessionStorage.getItem("code_verfier"))
105105
const data = await Digit.DigiLockerService.token({TokenReq })
106106
sessionStorage.setItem("DigiLocker.token1",data?.TokenRes?.access_token)
107107
//sessionStorage.setItem("DigiLocker.token1",data?.)

‎frontend/micro-ui/web/package.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,17 @@
1111
"micro-ui-internals/packages/modules/commonPt",
1212
"micro-ui-internals/packages/modules/dss",
1313
"micro-ui-internals/packages/modules/pt",
14-
"micro-ui-internals/packages/modules/tl"
14+
"micro-ui-internals/packages/modules/tl",
15+
"micro-ui-internals/packages/modules/bills",
16+
"micro-ui-internals/packages/modules/engagement",
17+
"micro-ui-internals/packages/modules/fsm",
18+
"micro-ui-internals/packages/modules/hrms",
19+
"micro-ui-internals/packages/modules/mcollect",
20+
"micro-ui-internals/packages/modules/noc",
21+
"micro-ui-internals/packages/modules/obps",
22+
"micro-ui-internals/packages/modules/pgr",
23+
"micro-ui-internals/packages/modules/receipts",
24+
"micro-ui-internals/packages/modules/ws"
1525
],
1626
"engines": {
1727
"node": ">=14"

‎frontend/micro-ui/web/src/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ if (!user || !user.access_token || !user.info) {
3030
return value && value !== "undefined" ? parseValue(value) : null;
3131
}
3232

33-
const token = getFromStorage("token")
33+
const token = sessionStorage.getItem("token")
3434

35-
const citizenToken = getFromStorage("Citizen.token")
36-
const citizenInfo = getFromStorage("Citizen.user-info")
37-
const citizenTenantId = getFromStorage("Citizen.tenant-id")
35+
const citizenToken = sessionStorage.getItem("Citizen.token")
36+
const citizenInfo = sessionStorage.getItem("Citizen.user-info")
37+
const citizenTenantId = sessionStorage.getItem("Citizen.tenant-id")
3838

39-
const employeeToken = getFromStorage("Employee.token")
40-
const employeeInfo = getFromStorage("Employee.user-info")
39+
const employeeToken = sessionStorage.getItem("Employee.token")
40+
const employeeInfo = sessionStorage.getItem("Employee.user-info")
4141
const employeeTenantId = getFromStorage("Employee.tenant-id")
4242

4343
const userType = token === citizenToken ? "citizen" : "employee";

0 commit comments

Comments
 (0)