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

Fixed GEWIS login #75

Merged
merged 8 commits into from
Dec 11, 2023
Merged

Fixed GEWIS login #75

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5a323c
Fixed GEWIS login
CodeNamedRobin Oct 28, 2023
f5ced81
Removed unneded todo
CodeNamedRobin Oct 28, 2023
4a4cc4d
Removed unneeded TODO
CodeNamedRobin Oct 28, 2023
99c1346
Merge branch 'main' into feature/gewis-login
CodeNamedRobin Nov 14, 2023
3c0df6e
Used proper aliasing for routes
CodeNamedRobin Dec 2, 2023
fcb5203
Added requested features from Samuel Oosterholt
CodeNamedRobin Dec 6, 2023
0f4c4be
Merge branch 'main' into feature/gewis-login
CodeNamedRobin Dec 11, 2023
f6f3a73
Merge remote-tracking branch 'origin/main' into feature/gewis-login
JustSamuel Dec 11, 2023
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
6 changes: 4 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/router/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ const router = createRouter({
{
path: '',
component: LoginView,
name: 'login'
name: 'login',
alias: ['/login'],
},
{
path: '/passwordreset',
Expand Down
3 changes: 1 addition & 2 deletions src/views/LoginView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ const password = loginForm.defineComponentBinds('password');
const route = useRoute();

onBeforeMount(() => {
console.log(route.query.token);
CodeNamedRobin marked this conversation as resolved.
Show resolved Hide resolved
CodeNamedRobin marked this conversation as resolved.
Show resolved Hide resolved
if (route.query.token !== undefined) {
const token = route.query.token as string;
authStore.gewisWebLogin(uuid(), token, apiService).catch(() => {
Expand Down Expand Up @@ -132,8 +133,6 @@ const loginHandler = loginForm.handleSubmit(async (values) => {
}
});

// TODO: fix the GEWIS login
// See: https://github.com/GEWIS/sudosos-frontend-vue3/issues/32
const loginViaGEWIS = () => {
window.location.href = `https://gewis.nl/token/${import.meta.env.VITE_APP_GEWIS_TOKEN}`;
};
Expand Down
3 changes: 1 addition & 2 deletions src/views/ProductsContainersView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ onMounted(async () => {
const vatGroupsResp = await apiService.vatGroups.getAllVatGroups();
vatGroups.value = vatGroupsResp.data.records;

// TODO: Put getAllContainers into container store and take care of pagination
// See: https://github.com/GEWIS/sudosos-frontend-vue3/issues/51

CodeNamedRobin marked this conversation as resolved.
Show resolved Hide resolved
await apiService.container.getAllContainers(500, 0).then((resp: any) => {
(resp.data.records as ContainerResponse[]).forEach((container) =>
apiService.container.getSingleContainer(container.id).then((res) => {
Expand Down