Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions src/components/App/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@ import './App.css'
import { Theater } from '../Theater'
import { Auth } from '../Auth'

import { $user } from '../../models/auth'
import {AppGate} from '../../models/app'
import {$router} from '../../models/router'
import {AppGate, Route} from '../../models/app'

export const App = () => {
useGate(AppGate)
const {email} = useStore($user)
return email ? (<Theater />) : (<Auth />)
const [, route] = useStore($router)
useGate(Route, { name: route ? route : '' })

if (route === 'theater') {
return <Theater />
}
return <Auth />
}
4 changes: 3 additions & 1 deletion src/models/app/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ import { Config } from './types'

export const initAppFx = createEffect<Config, unknown>()

export const AppGate = createGate()
export const AppGate = createGate()

export const Route = createGate<{name: string}>()
10 changes: 8 additions & 2 deletions src/models/app/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import { initializeApp } from 'firebase'
import { forward } from 'effector'

import {
initAppFx, AppGate
initAppFx, AppGate, Route
} from './'

import { fetchUsersFx } from '../users'

import { checkAuthFx } from '../auth'

import {
appId,
projectId,
Expand Down Expand Up @@ -41,5 +43,9 @@ initAppFx({

forward({
from: AppGate.open,
to: fetchUsersFx
to: [fetchUsersFx, checkAuthFx]
})

Route.state.updates.watch(({name}) => {
history.pushState({}, '', `/${name}`)
})
8 changes: 8 additions & 0 deletions src/models/auth/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,20 @@ export const logout = createEvent<string>()

export const updateSignInForm = createEvent<{ value: string; fieldName: string }>()

export const checkAuth = createEvent<User | null>()

export const restoredAuth = createEvent<User>()

export const manageGmailProviderFx = createEffect<void, User>()

export const manageEmailProviderFx = createEffect<Credentials, User>()

export const signUpViaEmailFx = createEffect<Credentials, { email: string }>()

export const checkAuthFx = createEffect<void, unknown>()

export const dropUserAuthFx = createEffect<string, unknown>()

export const $user = createStore<User>({
email: ''
})
Expand Down
58 changes: 48 additions & 10 deletions src/models/auth/init.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
import { forward, sample } from 'effector'
import { forward, sample, guard } from 'effector'
import { auth } from 'firebase'

import {
gSignIn,
signIn,
logout,
updateSignInForm,
checkAuth,
restoredAuth,
manageGmailProviderFx,
manageEmailProviderFx,
signUpViaEmailFx,
checkAuthFx,
dropUserAuthFx,
$user,
$signInForm
} from './'
Expand All @@ -17,9 +21,12 @@ import {
addUserFx,
updateUsersTableFx,
deleteUserFx,
$firebaseUsers
$firebaseUsers,
$usersByEmail
} from '../users'

import { User } from './types'

const gProvider = new auth.GoogleAuthProvider()

manageGmailProviderFx.use(async () => {
Expand All @@ -43,10 +50,22 @@ signUpViaEmailFx.use(async ({email, password}) => {
return {email}
})

checkAuthFx.use(() => {
auth().onAuthStateChanged(value => {
if (value !== null) {
checkAuth(value as User)
}
})
})

dropUserAuthFx.use(async () => {
await auth().signOut()
})

$user
.reset(logout)
.on([
manageGmailProviderFx.doneData, signUpViaEmailFx.doneData, manageEmailProviderFx.doneData
manageGmailProviderFx.doneData, signUpViaEmailFx.doneData, manageEmailProviderFx.doneData, restoredAuth
],
(_, user) => user
)
Expand Down Expand Up @@ -82,13 +101,32 @@ forward({
})

sample({
source: $firebaseUsers,
clock: logout,
//@ts-ignore
fn: (users, email) => Object.keys(users).find((id) => {
if (email === users[id].email) {
return id
}
source: guard({
source: sample({
source: $usersByEmail,
clock: [
manageGmailProviderFx.doneData,
signUpViaEmailFx.doneData,
manageEmailProviderFx.doneData
],
fn: (users, user) => users[user.email]
}),
filter: Boolean
}),
fn: (user) => user.id!,
target: deleteUserFx
})

forward({
from: logout,
to: dropUserAuthFx
})

forward({
from: checkAuth.filterMap((user) => {
if (user !== null) {
return user
}
}),
to: restoredAuth
})
3 changes: 2 additions & 1 deletion src/models/init.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import './app/init'
import './auth/init'
import './users/init'
import './tables/init'
import './tables/init'
import './router/init'
5 changes: 5 additions & 0 deletions src/models/router/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {createEvent, createStore} from 'effector'

export const redirect = createEvent<string>()

export const $router = createStore<string[]>([])
15 changes: 15 additions & 0 deletions src/models/router/init.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {sample} from 'effector'

import {$user} from '../auth'
import {redirect, $router} from './'

$router.on(redirect, (routes, link) => ([
...routes,
link
]))

sample({
source: $user,
fn: (user) => user.email ? 'theater' : '',
target: redirect
})
2 changes: 1 addition & 1 deletion src/models/users/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const $users = $firebaseUsers.map((fUsers) =>
Object.keys(fUsers).map((id) => fUsers[id])
)
export const $usersByEmail = $firebaseUsers.map((fUsers) => {
return Object.keys(fUsers).reduce((usersByEmail, id) => {
return Object.keys(fUsers).reduce<UsersMap>((usersByEmail, id) => {
const email = fUsers[id].email;
return {
[email]: {
Expand Down