btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix: notify that the user is not an admin when trying to login with a non admin account in admin dashboard (#3651)

Browse Source
This commit is contained in:
Joel Jacob Stephen
2023-12-14 12:36:05 +05:30
committed by GitHub
parent 5209c0a8ca
commit c47e2e7767
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/hoppscotch-sh-admin/locales/en.json
View File

@@ -131,7 +131,7 @@
"send_magic_link": "Send magic link", "send_magic_link": "Send magic link",
"sign_in_agreement": "By signing in, you are agreeing to our", "sign_in_agreement": "By signing in, you are agreeing to our",
"sign_in_options": "All sign in option", "sign_in_options": "All sign in option",
"sign_out": "sign out", "sign_out": "Sign out",
"team_name_long": "Team name should be atleast 6 characters long!!", "team_name_long": "Team name should be atleast 6 characters long!!",
"user_not_found": "User not found in the infra!!" "user_not_found": "User not found in the infra!!"
}, },

1
packages/hoppscotch-sh-admin/src/components.d.ts vendored
View File

@@ -30,7 +30,6 @@ declare module '@vue/runtime-core' {
HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable'] HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs'] HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle'] HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default'] IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
IconLucideInbox: typeof import('~icons/lucide/inbox')['default'] IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default'] SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default']

4
packages/hoppscotch-sh-admin/src/components/app/Login.vue
View File

@@ -184,6 +184,10 @@ const nonAdminUser = ref(false);
const allowedAuthProviders = ref<string[]>([]); const allowedAuthProviders = ref<string[]>([]);
onMounted(async () => { onMounted(async () => {
const user = auth.getCurrentUser();
if (user && !user.isAdmin) {
nonAdminUser.value = true;
}
allowedAuthProviders.value = await getAllowedAuthProviders(); allowedAuthProviders.value = await getAllowedAuthProviders();
}); });