Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Newaltv1 #74

Open
wants to merge 400 commits into
base: codefreez
Choose a base branch
from
Open
Changes from 4 commits
Commits
Show all changes
400 commits
Select commit Hold shift + click to select a range
1ab4e98
Update telemetryFactory.js
snehal0904 Sep 28, 2023
c74d108
null record fix for student
Aar-if Sep 28, 2023
5d00c0d
Merge pull request #9 from Aar-if/newaltv1
snehal0904 Sep 28, 2023
b8360b3
Update lessonList.js
snehal0904 Sep 28, 2023
7de6020
Update subjectList.js
snehal0904 Sep 28, 2023
ad5d752
undefined fix
Aar-if Sep 29, 2023
126328b
removed log
Aar-if Sep 29, 2023
f77c5bb
logout telemetry fix
Aar-if Sep 29, 2023
9fc2e82
logout
Aar-if Sep 29, 2023
bb82177
Google analytics fix
Aar-if Sep 29, 2023
00444c2
Merge pull request #10 from Aar-if/newaltv1
snehal0904 Sep 29, 2023
efa932c
Google analytics fix alt 2023
Aar-if Sep 29, 2023
f65167f
Teacher login fix
Aar-if Sep 29, 2023
82a95c2
Merge pull request #11 from Aar-if/newaltv1
snehal0904 Sep 29, 2023
42bc858
Student single creation api update
Aar-if Sep 30, 2023
aea2e87
Merge pull request #12 from Aar-if/newaltv1
snehal0904 Sep 30, 2023
3245a4f
Teacher single creation api update
Aar-if Sep 30, 2023
fa7de1d
minify.js added
Aar-if Sep 30, 2023
4dbb188
Merge pull request #13 from Aar-if/newaltv1
Aar-if Sep 30, 2023
022c83e
minify.js renamed
Aar-if Sep 30, 2023
d1ac842
Merge pull request #14 from Aar-if/newaltv1
snehal0904 Sep 30, 2023
145bb45
Update TeacherCSV.jsx
snehal0904 Oct 2, 2023
9308f15
Batching fix + SchoolName mapped to student ListView
Aar-if Oct 3, 2023
bfee1bb
Removed createdAT updatedAT
Aar-if Oct 3, 2023
2ac592b
Merge pull request #15 from Aar-if/newaltv1
snehal0904 Oct 3, 2023
e232fff
Batching fix for records less than 100 or more than 100
Aar-if Oct 3, 2023
8fa3721
Merge pull request #16 from Aar-if/newaltv1
snehal0904 Oct 3, 2023
13d8004
clearing expired token
Aar-if Oct 3, 2023
d6bdcfb
Not Found fix
Aar-if Oct 4, 2023
ab0f501
Not Found fix update 1
Aar-if Oct 4, 2023
532b64b
Merge pull request #17 from Aar-if/newaltv1
snehal0904 Oct 4, 2023
79ef2ca
Not Found fix update 2
Aar-if Oct 4, 2023
69cb06d
Not Found fix update 3
Aar-if Oct 4, 2023
ebdae7f
Merge pull request #18 from Aar-if/newaltv1
snehal0904 Oct 4, 2023
9767a16
Not Found revert
Aar-if Oct 4, 2023
c50b1a5
Merge pull request #19 from Aar-if/newaltv1
snehal0904 Oct 4, 2023
9948cf1
Not found update fix
Aar-if Oct 4, 2023
b581d49
Not found update fix 2
Aar-if Oct 4, 2023
b325772
Merge pull request #20 from Aar-if/newaltv1
snehal0904 Oct 4, 2023
afeffac
test
Aar-if Oct 4, 2023
47eac41
Token fix
Aar-if Oct 5, 2023
22e3ae2
Merge pull request #21 from Aar-if/newaltv1
snehal0904 Oct 5, 2023
c5cb53a
Course Tracking fix 2
Aar-if Oct 5, 2023
5da00a9
Merge pull request #22 from Aar-if/newaltv1
snehal0904 Oct 5, 2023
c4e7f4d
ScoreCard fix
Aar-if Oct 5, 2023
2b7b60c
Merge pull request #23 from Aar-if/newaltv1
snehal0904 Oct 5, 2023
08c2c17
Replaced harcoded api links
Aar-if Oct 6, 2023
2871bc5
Loader update in List View
Aar-if Oct 9, 2023
3a1c96e
Loader update in List View 2
Aar-if Oct 9, 2023
fff2a49
Merge pull request #24 from Aar-if/newaltv1
snehal0904 Oct 9, 2023
87cab3c
Error response CSV update
Aar-if Oct 9, 2023
a7181f3
Merge pull request #25 from Aar-if/newaltv1
snehal0904 Oct 9, 2023
c0f15f7
Reading CSV contents using papaparse library
Aar-if Oct 10, 2023
293e2dd
Triggering the response CSV download only once containing all respons…
Aar-if Oct 10, 2023
7e2b6ff
Merge pull request #26 from Aar-if/newaltv1
snehal0904 Oct 10, 2023
3c37dc9
Refresh token time update
Aar-if Oct 10, 2023
db82e51
Merge pull request #27 from Aar-if/newaltv1
snehal0904 Oct 10, 2023
53f4b40
Changed token storage from local to session for tokens and all api's
Aar-if Oct 11, 2023
15317a9
Merge pull request #28 from Aar-if/newaltv1
snehal0904 Oct 11, 2023
481b189
Teacher app Class list page added
Aar-if Oct 12, 2023
302bd50
Removed logs
Aar-if Oct 12, 2023
390e485
Merge pull request #29 from Aar-if/newaltv1
snehal0904 Oct 12, 2023
b1a0ff7
Admin module code refactor and Optimization update 1
Aar-if Oct 13, 2023
ac11d11
Not found after login fixed
Aar-if Oct 13, 2023
9386339
Not found after login fixed 2
Aar-if Oct 13, 2023
7e7bb4f
Api call time updated
Aar-if Oct 13, 2023
076bac8
Merge pull request #30 from Aar-if/newaltv1
snehal0904 Oct 16, 2023
f062f2c
Pagination limit added
Aar-if Oct 18, 2023
4fd6a7d
Download Username Pass api update
Aar-if Oct 23, 2023
6515b36
delay time increased
Aar-if Nov 17, 2023
b3a60c4
Merge pull request #31 from Aar-if/newaltv1
snehal0904 Nov 17, 2023
7a5bba7
remainder added
Aar-if Nov 17, 2023
2417e44
Merge pull request #32 from Aar-if/newaltv1
snehal0904 Nov 17, 2023
53108fe
useSWR
Aar-if Nov 20, 2023
0df3527
Merge pull request #33 from Aar-if/newaltv1
Aar-if Nov 20, 2023
83e8fb5
reminder update
Aar-if Nov 20, 2023
62ac884
Merge pull request #34 from Aar-if/newaltv1
Aar-if Nov 20, 2023
c0b8fc7
removed reminder
Aar-if Dec 12, 2023
e006095
Scroll bar
Aar-if Dec 13, 2023
4b50a58
Merge pull request #35 from Aar-if/newaltv1
snehal0904 Dec 13, 2023
4a93df0
all students list
Aar-if Dec 14, 2023
6d7df50
spaces bug fixed
Aar-if Jan 29, 2024
8e8e221
Merge pull request #36 from Aar-if/newaltv1
Aar-if Jan 29, 2024
e59affc
Player, Telemetry and api changes
Aar-if Feb 21, 2024
73b19dd
Multiple api's issue
Aar-if Feb 22, 2024
02833c7
fix 2
Aar-if Feb 22, 2024
ec5e783
comment changes
Aar-if Feb 22, 2024
35b0577
comment changes
Aar-if Feb 22, 2024
84752bc
Merge pull request #37 from Aar-if/newaltv1
snehal0904 Feb 22, 2024
9a2d510
Enrolment ID and duration undefined issue fix
Aar-if Feb 26, 2024
d0a910b
Merge pull request #38 from Aar-if/newaltv1
Aar-if Feb 26, 2024
1261944
Practice questions data storage fix
Aar-if Feb 28, 2024
f1e872b
Merge pull request #39 from Aar-if/newaltv1
Aar-if Feb 28, 2024
130299a
timeSpent added and NaN issue fix for video content
Aar-if Feb 28, 2024
b4eb502
Merge pull request #40 from Aar-if/newaltv1
Aar-if Feb 28, 2024
c9261ac
progress tracking tick issue fix for video
Aar-if Feb 29, 2024
4a831a9
Merge pull request #41 from Aar-if/newaltv1
Aar-if Feb 29, 2024
c18c88a
service worker changes
Aar-if Feb 29, 2024
8953e6d
Merge pull request #42 from Aar-if/newaltv1
Aar-if Feb 29, 2024
15715b6
service worker testing update 2
Aar-if Feb 29, 2024
8d4a23d
Merge pull request #43 from Aar-if/newaltv1
Aar-if Feb 29, 2024
c6175e8
theme file changes
Aar-if Mar 5, 2024
5c3603a
Merge pull request #44 from Aar-if/newaltv1
Aar-if Mar 5, 2024
7958452
Student bulkupload api and CSV changes
Arif-tekdi-technologies Mar 15, 2024
7dea361
Merge pull request #45 from Aar-if/newaltv1
Aar-if Mar 15, 2024
745dea8
Student details csv export
Arif-tekdi-technologies Mar 15, 2024
dc060d9
Merge pull request #46 from Aar-if/newaltv1
Aar-if Mar 15, 2024
3b14db4
Teacher and school changes added
Arif-tekdi-technologies Mar 15, 2024
f38ab1e
Merge pull request #47 from Aar-if/newaltv1
Aar-if Mar 15, 2024
d7729b6
Student details based on UDISE api and button chamges added
Arif-tekdi-technologies Mar 16, 2024
9b097d5
Merge pull request #48 from Aar-if/newaltv1
Aar-if Mar 16, 2024
8e00c35
teacher list api based on school udise api and button added
Arif-tekdi-technologies Mar 16, 2024
8833b73
Merge pull request #49 from Aar-if/newaltv1
Aar-if Mar 16, 2024
24191ee
promotion field addd
Arif-tekdi-technologies Mar 19, 2024
1024e75
Merge pull request #50 from Aar-if/newaltv1
Aar-if Mar 19, 2024
f2d4bb0
lessonTracking api updated contentType and timeSpent
Arif-tekdi-technologies Mar 19, 2024
4378e45
Merge pull request #51 from Aar-if/newaltv1
Aar-if Mar 19, 2024
2a8034c
School and timespent changes aded
Arif-tekdi-technologies Mar 20, 2024
d9e035a
Merge pull request #52 from Aar-if/newaltv1
Aar-if Mar 20, 2024
1faf05e
Class name added in download csv using username and pass
Arif-tekdi-technologies Mar 20, 2024
247efee
Merge pull request #53 from Aar-if/newaltv1
Aar-if Mar 20, 2024
9eefddd
Restricted skip from assessment.
Arif-tekdi-technologies Mar 21, 2024
f66f2d1
Merge pull request #54 from Aar-if/newaltv1
Aar-if Mar 21, 2024
dea75cf
assessment hotfix
Arif-tekdi-technologies Mar 27, 2024
cb6d9b4
Merge pull request #55 from Aar-if/newaltv1
Aar-if Mar 27, 2024
551d24d
.img fix
Arif-tekdi-technologies Apr 2, 2024
a15d192
Merge pull request #56 from Aar-if/newaltv1
Aar-if Apr 2, 2024
162d064
.img green tick issue fix
Arif-tekdi-technologies Apr 2, 2024
61db8ef
Merge pull request #57 from Aar-if/newaltv1
Aar-if Apr 2, 2024
0fa73c2
Update demoData.js
snehal0904 Jun 17, 2024
ada603a
Update demoData.js
snehal0904 Jun 17, 2024
9315adf
Update demoData.js
snehal0904 Jun 17, 2024
e2636aa
fix:H5P Content Tracking Data
sagarkoshti1990 Jun 18, 2024
e32b680
Create newaltv1-dev-frontend.yml
PrasadAthani Jul 10, 2024
5fe5bdd
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 10, 2024
5fdbf33
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 10, 2024
ef034dc
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 10, 2024
f2e02ce
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 10, 2024
bf0d0b2
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 12, 2024
7d7ad4a
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 12, 2024
48cb61b
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 12, 2024
50cac66
Update newaltv1-dev-frontend.yml
PrasadAthani Jul 12, 2024
c22858a
fix: Remove all harcoded URL from manifest file and added in env
deechavhan098 Sep 4, 2024
5644844
Create develop-frontend.yml
PrasadAthani Sep 4, 2024
21ded09
Update develop-frontend.yml
PrasadAthani Sep 4, 2024
c45ed2c
Delete .github/workflows/newaltv1-dev-frontend.yml
PrasadAthani Sep 4, 2024
62b33ec
Delete .github/workflows/sandbox-build-deploy.yml
PrasadAthani Sep 4, 2024
72b38ae
Merge pull request #60 from deepali-chavhan/develop
ankush-maherwal Sep 4, 2024
7784c4a
fix: Added dev env in all the env file
deechavhan098 Sep 4, 2024
dd9ee3f
Merge pull request #61 from deepali-chavhan/develop
ankush-maherwal Sep 5, 2024
b55f1a2
fix: production env updated
deechavhan098 Sep 5, 2024
262b21f
Merge pull request #62 from deepali-chavhan/develop
PrasadAthani Sep 5, 2024
b9df629
Update .env.development
PrasadAthani Sep 5, 2024
4966fe7
Update .env.production
PrasadAthani Sep 5, 2024
9abd07f
Update Auth.ts
PrasadAthani Sep 5, 2024
978d600
Update App.js
PrasadAthani Sep 5, 2024
a7a2bbb
Update getNewAccessToken.jsx
PrasadAthani Sep 5, 2024
55a6a6b
Create Test-file.txt
PrasadAthani Sep 5, 2024
f6a3327
Update Auth.ts
PrasadAthani Sep 6, 2024
b5b7a3a
Update App.js
PrasadAthani Sep 6, 2024
c58b199
Update getNewAccessToken.jsx
PrasadAthani Sep 6, 2024
84a52f9
Create Test-File
PrasadAthani Sep 6, 2024
92afaad
Update Auth.ts
PrasadAthani Sep 6, 2024
ad70c71
Update getNewAccessToken.jsx
PrasadAthani Sep 6, 2024
77de71e
Update App.js
PrasadAthani Sep 6, 2024
617f968
Update Test-File
PrasadAthani Sep 6, 2024
b52485f
fix: Added secret key in env and remove from code
deechavhan098 Sep 9, 2024
9b40c0b
fix: changes in auth ts for getting undefine secret key
deechavhan098 Sep 9, 2024
e921f55
fix: changes in auth ts for getting undefine secret key
deechavhan098 Sep 9, 2024
9062a37
Merge pull request #63 from deepali-chavhan/develop
ankush-maherwal Sep 9, 2024
e5c0e00
Add DownloadCsv and DownloadStudentDetails components with CSV downlo…
pmulik34 Sep 12, 2024
6a2869f
TaskId #226755 fix: Integrate Edit API & remove some input fields
deechavhan098 Sep 12, 2024
87a8987
Merge pull request #64 from deepali-chavhan/develop
ankush-maherwal Sep 12, 2024
7f42f43
TaskId #226755 fix: Changes for class , set read only for edit mode
deechavhan098 Sep 12, 2024
6ffa482
remove redundant code and also fetch api base url from .env file
pmulik34 Sep 12, 2024
c0eb048
Merge branch 'develop' of https://github.com/transform1234/alt-fronte…
pmulik34 Sep 12, 2024
a851ebd
Align modal in a mobile view
pmulik34 Sep 12, 2024
cf6d71b
Filter options
pmulik34 Sep 13, 2024
9e4ec2b
feat: Add support for dynamic payloads in API fetch functions, allowi…
pmulik34 Sep 13, 2024
8f46b8e
corrected block option issue
pmulik34 Sep 13, 2024
b14eb89
TaskId #226755 fix: new api's added state,district,block and added lo…
deechavhan098 Sep 13, 2024
76987c8
Merge branch 'develop' of github.com:transform1234/alt-frontend into …
deechavhan098 Sep 13, 2024
c0ea2c8
corrected conditionally display state district and school data
pmulik34 Sep 13, 2024
857b925
corrected issue with dropdown values also implemented displaying tabl…
pmulik34 Sep 13, 2024
8ad11b2
TaskId #226755 fix: optimize the code for multiple api's calls
deechavhan098 Sep 13, 2024
3b195ec
corrected school namd and class keys
pmulik34 Sep 13, 2024
23cdd5e
Renamed dropdown values for better readability and understanding
pmulik34 Sep 16, 2024
5a1580d
Merge pull request #66 from pmulik34/develop
ankush-maherwal Sep 16, 2024
fea84df
Refactor dropdown change handler for cascading resets
pmulik34 Sep 16, 2024
46a4928
Fix: Resolve all conflicts
deechavhan098 Sep 16, 2024
ebb4149
Merge pull request #65 from deepali-chavhan/develop
ankush-maherwal Sep 16, 2024
da9675c
Fix: react-csv issue fix
deechavhan098 Sep 16, 2024
a45d671
Merge pull request #68 from deepali-chavhan/develop
ankush-maherwal Sep 16, 2024
7ef4342
Fix: Added getDistrictList in student form
deechavhan098 Sep 16, 2024
67ed8fa
Merge pull request #69 from deepali-chavhan/develop
PrasadAthani Sep 17, 2024
fe3c648
Merge pull request #67 from pmulik34/develop
ankush-maherwal Sep 18, 2024
492d1cf
Resolved UI issues related to modal and table
pmulik34 Sep 18, 2024
a62a30a
display 5 rows on table
pmulik34 Sep 18, 2024
8491904
Merge pull request #70 from pmulik34/develop
ankush-maherwal Sep 18, 2024
870a9b9
Bug #227127 fix: UI alignment fixes and data setting on form click
deechavhan098 Sep 19, 2024
ab21182
Merge branch 'develop' of github.com:transform1234/alt-frontend into …
deechavhan098 Sep 19, 2024
7cc7c36
Merge pull request #71 from deepali-chavhan/develop
ankush-maherwal Sep 20, 2024
ff1cfcb
manual merge
ankush-maherwal Oct 17, 2024
0499127
Merge pull request #73 from transform1234/develop
ankush-maherwal Oct 17, 2024
1b45733
Update Test-File
PrasadAthani Oct 17, 2024
ae35518
Update develop-frontend.yml
PrasadAthani Oct 17, 2024
3663536
Update develop-frontend.yml
PrasadAthani Oct 17, 2024
29390a2
Delete .github/workflows/develop-frontend.yml
PrasadAthani Oct 17, 2024
2861ea5
Create prod-newaltva-deploy.yml
PrasadAthani Oct 17, 2024
684ec9a
Update prod-newaltva-deploy.yml
PrasadAthani Oct 17, 2024
9ee931f
Update Test-File
PrasadAthani Oct 17, 2024
44c362c
manual merge
ankush-maherwal Oct 17, 2024
bbd5288
Merge pull request #75 from transform1234/develop
ankush-maherwal Oct 17, 2024
3c31a93
Update prod-newaltva-deploy.yml
PrasadAthani Oct 17, 2024
2e5dba1
Update prod-newaltva-deploy.yml
PrasadAthani Oct 17, 2024
0567e8d
manual merge
ankush-maherwal Oct 18, 2024
74549d8
Merge pull request #76 from ankush-maherwal/ankush-newaltv1
ankush-maherwal Oct 18, 2024
9482f8e
manual merge
ankush-maherwal Oct 18, 2024
72c0d0f
manual merge
ankush-maherwal Oct 18, 2024
9a7c5cd
Merge pull request #77 from ankush-maherwal/ankush-newaltv1
ankush-maherwal Oct 18, 2024
8b95e05
Call search api with filters inside Download CSV MOdal
pmulik34 Oct 18, 2024
01046c5
Merge branch 'develop' of https://github.com/transform1234/alt-fronte…
pmulik34 Oct 18, 2024
bd001ab
removed comments
pmulik34 Oct 18, 2024
9a657f6
Merge pull request #78 from pmulik34/develop
PrasadAthani Oct 18, 2024
e48c461
Update DownloadCsv.jsx
pmulik34 Oct 18, 2024
1c11856
Merge pull request #82 from pmulik34/patch-3
PrasadAthani Oct 18, 2024
8405f0e
Update StudentListView.jsx
pmulik34 Oct 18, 2024
2eed1c1
Merge pull request #83 from pmulik34/patch-4
PrasadAthani Oct 18, 2024
27efb89
Add inputbox instead of dropdown and also call search api
pmulik34 Oct 18, 2024
8138a46
Add inputbox instead of dropdown and also call search api and remove …
pmulik34 Oct 18, 2024
ed325a4
Update StudentListView.jsx , removed rowData varaible
pmulik34 Oct 18, 2024
831abda
Update DownloadStudentDetails.jsx , Add inputbox instead of dropdown …
pmulik34 Oct 18, 2024
c88a5ed
Merge pull request #85 from pmulik34/patch-5
PrasadAthani Oct 18, 2024
afd1bb3
Merge pull request #86 from pmulik34/patch-6
PrasadAthani Oct 18, 2024
4570dd2
Merge pull request #84 from pmulik34/develop
PrasadAthani Oct 18, 2024
f639068
Update Test-file.txt
PrasadAthani Oct 23, 2024
f57908c
fix: service worker new version available
Oct 24, 2024
3470433
Merge pull request #87 from sagarkoshti1990/develop
ankush-maherwal Oct 24, 2024
0437b6e
Update StudentLogin.js
PrasadAthani Oct 25, 2024
eda05e2
Update StudentLogin.js
PrasadAthani Oct 25, 2024
5c03a13
fix:Build the file name based on the timestamp and revert the old cod…
Oct 25, 2024
9df868f
manual merge
ankush-maherwal Nov 4, 2024
f8ec60d
fix: issues fixes in student and techer filter and csv upload
deechavhan098 Nov 23, 2024
9d37425
Merge pull request #89 from deepali-chavhan/issue-fix
ankush-maherwal Nov 23, 2024
9488a85
fix: issues fixes in student and teacher component
deechavhan098 Nov 23, 2024
fd16065
fix: data updated for csv
deechavhan098 Nov 23, 2024
380ccfc
Merge pull request #90 from deepali-chavhan/issue-fix
ankush-maherwal Nov 23, 2024
165c85f
Merge pull request #88 from sagarkoshti1990/develop
ankush-maherwal Nov 25, 2024
0542193
Merge pull request #58 from sagarkoshti1990/newaltv1-new
ankush-maherwal Nov 25, 2024
08a4d60
Merge pull request #91 from transform1234/develop
ankush-maherwal Nov 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/common-lib/.env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
3 changes: 2 additions & 1 deletion packages/common-lib/.env.production
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
5 changes: 3 additions & 2 deletions packages/common-lib/src/services/Auth.ts
Original file line number Diff line number Diff line change
@@ -3,14 +3,15 @@ import axios from 'axios'
export function fetchToken(
authUrl: string,
username: string,
password: string
password: string,
secret_key:string
): Promise<any> {
const params = new URLSearchParams()
params.append('client_id', 'hasura-app')
params.append('username', username)
params.append('password', password)
params.append('grant_type', 'password')
params.append('client_secret', '9ca6e96d-f72e-4208-91f4-a2d8e681f767')
params.append('client_secret', secret_key)

const config = {
headers: {
3 changes: 2 additions & 1 deletion packages/core/.env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
3 changes: 2 additions & 1 deletion packages/core/.env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
3 changes: 2 additions & 1 deletion packages/core/src/pages/Login.js
Original file line number Diff line number Diff line change
@@ -75,7 +75,8 @@ export default function Login({ swPath }) {
const result = await fetchToken(
process.env.REACT_APP_AUTH_URL,
credentials?.username,
credentials?.password
credentials?.password,
process.env.REACT_APP_SECRET_KEY
);
if (result?.data) {
let token = result.data.access_token;
3 changes: 2 additions & 1 deletion packages/core/src/pages/StudentLogin.js
Original file line number Diff line number Diff line change
@@ -186,7 +186,8 @@ export default function StudentLogin({ swPath }) {
const result = await fetchToken(
process.env.REACT_APP_AUTH_URL,
credentials?.username,
credentials?.password
credentials?.password,
process.env.REACT_APP_SECRET_KEY
);

if (result?.data) {
3 changes: 2 additions & 1 deletion packages/student-app/.env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
3 changes: 2 additions & 1 deletion packages/student-app/.env.production
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
2 changes: 1 addition & 1 deletion packages/student-app/src/App.js
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ function App() {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
body: `client_id=hasura-app&token=${refreshToken}&client_secret=9ca6e96d-f72e-4208-91f4-a2d8e681f767`,
body: `client_id=hasura-app&token=${refreshToken}&client_secret=${process.env.REACT_APP_SECRET_KEY}`,
}
);
console.log("REFRESH check");
2 changes: 1 addition & 1 deletion packages/student-app/src/api's/getNewAccessToken.jsx
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ const getNewAccessToken = async () => {
client_id: "hasura-app",
refresh_token: token,
grant_type: "refresh_token",
client_secret: "9ca6e96d-f72e-4208-91f4-a2d8e681f767",
client_secret: process.env.REACT_APP_SECRET_KEY,
})
);