mirror of
https://github.com/modrinth/code.git
synced 2026-09-04 22:10:15 +00:00
feat: add shared UI package auth DI
This commit is contained in:
@@ -40,6 +40,7 @@ import {
|
|||||||
OverflowMenu,
|
OverflowMenu,
|
||||||
PopupNotificationPanel,
|
PopupNotificationPanel,
|
||||||
ProgressSpinner,
|
ProgressSpinner,
|
||||||
|
provideAuth,
|
||||||
provideModalBehavior,
|
provideModalBehavior,
|
||||||
provideModrinthClient,
|
provideModrinthClient,
|
||||||
provideNotificationManager,
|
provideNotificationManager,
|
||||||
@@ -57,7 +58,7 @@ import { openUrl } from '@tauri-apps/plugin-opener'
|
|||||||
import { type } from '@tauri-apps/plugin-os'
|
import { type } from '@tauri-apps/plugin-os'
|
||||||
import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
|
import { saveWindowState, StateFlags } from '@tauri-apps/plugin-window-state'
|
||||||
import { $fetch } from 'ofetch'
|
import { $fetch } from 'ofetch'
|
||||||
import { computed, onMounted, onUnmounted, provide, ref, watch } from 'vue'
|
import { computed, onMounted, onUnmounted, provide, reactive, ref, watch, watchEffect } from 'vue'
|
||||||
import { RouterView, useRoute, useRouter } from 'vue-router'
|
import { RouterView, useRoute, useRouter } from 'vue-router'
|
||||||
|
|
||||||
import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
|
import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
|
||||||
@@ -454,6 +455,21 @@ const credentials = ref()
|
|||||||
|
|
||||||
const modrinthLoginFlowWaitModal = ref()
|
const modrinthLoginFlowWaitModal = ref()
|
||||||
|
|
||||||
|
const authProvider = reactive({
|
||||||
|
session_token: null,
|
||||||
|
user: null,
|
||||||
|
requestSignIn: async (_redirectPath) => {
|
||||||
|
await signIn()
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
watchEffect(() => {
|
||||||
|
authProvider.session_token = credentials.value?.session ?? null
|
||||||
|
authProvider.user = credentials.value?.user ?? null
|
||||||
|
})
|
||||||
|
|
||||||
|
provideAuth(authProvider)
|
||||||
|
|
||||||
async function fetchCredentials() {
|
async function fetchCredentials() {
|
||||||
const creds = await getCreds().catch(handleError)
|
const creds = await getCreds().catch(handleError)
|
||||||
if (creds && creds.user_id) {
|
if (creds && creds.user_id) {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { provideNotificationManager } from '@modrinth/ui'
|
import { provideNotificationManager } from '@modrinth/ui'
|
||||||
|
|
||||||
import { FrontendNotificationManager } from './frontend-notifications'
|
import { FrontendNotificationManager } from './frontend-notifications'
|
||||||
|
import { setupAuthProvider } from './setup/auth'
|
||||||
import { setupFilePickerProvider } from './setup/file-picker'
|
import { setupFilePickerProvider } from './setup/file-picker'
|
||||||
import { setupModrinthClientProvider } from './setup/modrinth-client'
|
import { setupModrinthClientProvider } from './setup/modrinth-client'
|
||||||
import { setupPageContextProvider } from './setup/page-context'
|
import { setupPageContextProvider } from './setup/page-context'
|
||||||
@@ -9,6 +10,7 @@ import { setupTagsProvider } from './setup/tags'
|
|||||||
export function setupProviders(auth: Awaited<ReturnType<typeof useAuth>>) {
|
export function setupProviders(auth: Awaited<ReturnType<typeof useAuth>>) {
|
||||||
provideNotificationManager(new FrontendNotificationManager())
|
provideNotificationManager(new FrontendNotificationManager())
|
||||||
|
|
||||||
|
setupAuthProvider(auth)
|
||||||
setupModrinthClientProvider(auth)
|
setupModrinthClientProvider(auth)
|
||||||
setupTagsProvider()
|
setupTagsProvider()
|
||||||
setupFilePickerProvider()
|
setupFilePickerProvider()
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import type { Labrinth } from '@modrinth/api-client'
|
||||||
|
import { type AuthProvider, provideAuth } from '@modrinth/ui'
|
||||||
|
import { reactive, watchEffect } from 'vue'
|
||||||
|
|
||||||
|
export function setupAuthProvider(auth: Awaited<ReturnType<typeof useAuth>>) {
|
||||||
|
const router = useRouter()
|
||||||
|
const authProvider = reactive<AuthProvider>({
|
||||||
|
session_token: null,
|
||||||
|
user: null,
|
||||||
|
requestSignIn: async (redirectPath: string) => {
|
||||||
|
await router.push({
|
||||||
|
path: '/auth/sign-in',
|
||||||
|
query: {
|
||||||
|
redirect: redirectPath,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
watchEffect(() => {
|
||||||
|
authProvider.session_token = auth.value.token || null
|
||||||
|
authProvider.user = (auth.value.user as Labrinth.Users.v2.User | null) ?? null
|
||||||
|
})
|
||||||
|
|
||||||
|
provideAuth(authProvider)
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import type { Labrinth } from '@modrinth/api-client/src/modules/labrinth/types'
|
||||||
|
|
||||||
|
import { createContext } from './create-context'
|
||||||
|
|
||||||
|
export interface AuthProvider {
|
||||||
|
session_token: string | null
|
||||||
|
user: Labrinth.Users.v2.User | null
|
||||||
|
requestSignIn: (redirectPath: string) => void | Promise<void>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const [injectAuth, provideAuth] = createContext<AuthProvider>('root', 'auth')
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
export * from './api-client'
|
export * from './api-client'
|
||||||
|
export * from './auth'
|
||||||
export * from './app-backup'
|
export * from './app-backup'
|
||||||
export * from './content-manager'
|
export * from './content-manager'
|
||||||
export { createContext } from './create-context'
|
export { createContext } from './create-context'
|
||||||
|
|||||||
Reference in New Issue
Block a user