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.

Sign up for GitHub

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

fix: Move auth_url variable to env file #301

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

fix: Move auth_url variable to env file #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ffd72d
fix: prod build deploy github added
Sep 15, 2022
5b917f9
fix: prod build deploy github added
Sep 15, 2022
88ed7de
workflow name corrected
Sep 16, 2022
11f303e
Merge branch 'main' of github.com:arajput/frontend-modulefederation i…
Sep 16, 2022
7075a78
Merge branch 'shiksha-platform:main' into main
arajput Sep 17, 2022
f46efff
Merge branch 'main' of github.com:arajput/frontend-modulefederation i…
Sep 29, 2022
9afb6c8
fix: move auth_url from manifest to env file
Oct 2, 2022
0be1286
fix: code format fixes
Oct 2, 2022
825849f
Merge branch 'shiksha-platform:main' into main
arajput Oct 2, 2022
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
2 changes: 1 addition & 1 deletion packages/assessment/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
}
],
"api_url": "https://dev.shikshaplatform.io",
"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",

"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/attendance/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080",
"weekDays": ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
"attendancePastDays": 90,
Expand Down
1 change: 0 additions & 1 deletion packages/calendar/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/calendar/src/services/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/classes/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/classes/src/services/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/common-lib/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
3 changes: 2 additions & 1 deletion packages/core/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://sandbox.shikshaplatform.io/api/v1
REACT_APP_API_URL=https://sandbox.shikshaplatform.io/api/v1
REACT_APP_AUTH_TOKEN_URL=https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token
3 changes: 2 additions & 1 deletion packages/core/.env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://sandbox.shikshaplatform.io/api/v1
REACT_APP_API_URL=https://sandbox.shikshaplatform.io/api/v1
REACT_APP_AUTH_TOKEN_URL=https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token
1 change: 0 additions & 1 deletion packages/core/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
3 changes: 1 addition & 2 deletions packages/core/src/pages/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
Center,
} from "native-base";
import { useTranslation } from "react-i18next";
import manifest from "../manifest";
import {
fetchToken,
eventBus,
Expand Down Expand Up @@ -68,7 +67,7 @@ export default function Login({ swPath }) {
const fcmToken = await getUserToken(swPath);

const result = await fetchToken(
manifest.auth_url,
process.env.REACT_APP_AUTH_TOKEN_URL,
credentials?.username,
credentials?.password
);
Expand Down
2 changes: 1 addition & 1 deletion packages/lessonplans/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
}
],
"api_url": "https://dev.shikshaplatform.io",
"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",

"maxWidth": "1080"
}
2 changes: 1 addition & 1 deletion packages/mylearning/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
}
],
"api_url": "https://dev.shikshaplatform.io",
"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",

"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/notification/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/profile/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
2 changes: 1 addition & 1 deletion packages/schools/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
}
],
"api_url": "https://dev.shikshaplatform.io",
"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",

"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/student/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/student/src/services/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/teacher-app/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}
2 changes: 1 addition & 1 deletion packages/visits/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@
}
],
"api_url": "https://dev.shikshaplatform.io",
"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",

"maxWidth": "1080"
}
1 change: 0 additions & 1 deletion packages/worksheet/src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,5 @@
}
],

"auth_url": "https://dev-shiksha.uniteframework.io/auth/realms/sunbird-rc/protocol/openid-connect/token",
"maxWidth": "1080"
}