tomecraft/tome-web
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade to firebase 9 to fix import issues

Browse Source
This commit is contained in:
snen 2021-11-08 05:08:29 -05:00
parent 2c3d29aef8
commit 4586c09293
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/api/auth.ts
View File

@ -1,7 +1,14 @@
import firebase from 'firebase' import {initializeApp} from 'firebase/app'
import 'firebase/auth' import {
getAuth,
onAuthStateChanged,
createUserWithEmailAndPassword,
signInWithEmailAndPassword,
GoogleAuthProvider,
signInWithPopup,
} from 'firebase/auth'
const app = firebase.initializeApp({ const app = initializeApp({
apiKey: "AIzaSyBICkyQIt-9lTsxHvRS1MOlZ-UdFVj8rsA", apiKey: "AIzaSyBICkyQIt-9lTsxHvRS1MOlZ-UdFVj8rsA",
authDomain: "tomecraft-87ce5.firebaseapp.com", authDomain: "tomecraft-87ce5.firebaseapp.com",
projectId: "tomecraft-87ce5", projectId: "tomecraft-87ce5",
@ -10,11 +17,11 @@ const app = firebase.initializeApp({
appId: "1:1021868917316:web:6c58534dd0ed491beab211", appId: "1:1021868917316:web:6c58534dd0ed491beab211",
}) })
const auth = app.auth() const auth = getAuth(app)
// auto-login // auto-login
export function subscribeToAuthState(handleUser: (user: {uid: string; displayName: string} | null) => void) { export function subscribeToAuthState(handleUser: (user: {uid: string; displayName: string} | null) => void) {
return auth.onAuthStateChanged(handleUser) return onAuthStateChanged(auth, handleUser)
} }
/// ///
@ -22,11 +29,11 @@ export function subscribeToAuthState(handleUser: (user: {uid: string; displayNam
/// ///
export async function registerBasic(email: string, password: string) { export async function registerBasic(email: string, password: string) {
const user = await auth.createUserWithEmailAndPassword(email, password) const user = await createUserWithEmailAndPassword(auth, email, password)
} }
export async function loginBasic(email: string, password: string): Promise<string | null> { export async function loginBasic(email: string, password: string): Promise<string | null> {
const credentials = await auth.signInWithEmailAndPassword(email, password) const credentials = await signInWithEmailAndPassword(auth, email, password)
return credentials.user?.uid ?? null return credentials.user?.uid ?? null
} }
@ -36,7 +43,7 @@ export async function loginBasic(email: string, password: string): Promise<strin
export async function loginGoogle(): Promise<string> { export async function loginGoogle(): Promise<string> {
// @ts-ignore deno does not recognize firebase.auth the way it is imported, but it exists // @ts-ignore deno does not recognize firebase.auth the way it is imported, but it exists
const provider = new firebase.auth.GoogleAuthProvider(); const provider = new GoogleAuthProvider(auth);
const {accessToken, credential, user} = await auth.signInWithPopup(provider) const {accessToken, credential, user} = await signInWithPopup(auth, provider)
return user.uid return user.uid
} }

4
import_map.json
View File

@ -2,9 +2,7 @@
"imports": { "imports": {
"~/": "./", "~/": "./",
"firebase": "https://cdn.skypack.dev/firebase@8.7.0/app", "firebase/": "https://cdn.skypack.dev/firebase@9.3.0/",
"firebase/auth": "https://cdn.skypack.dev/firebase@8.7.0/auth",
"firebase/firestore": "https://cdn.skypack.dev/firebase@8.7.0/firestore",
"http": "https://deno.land/std@0.105.0/http/mod.ts", "http": "https://deno.land/std@0.105.0/http/mod.ts",
"media-types": "https://deno.land/x/media_types@v2.10.0/mod.ts", "media-types": "https://deno.land/x/media_types@v2.10.0/mod.ts",
"oak": "https://deno.land/x/oak@v9.0.1/mod.ts", "oak": "https://deno.land/x/oak@v9.0.1/mod.ts",