Skip to content

Change login to be pop-up over redirect #27

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

Open
LamboCreeper wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change login to be pop-up over redirect #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ ui-debug.log
.idea
node_modules/
hosting/build
hosting/.env
2 changes: 1 addition & 1 deletion firestore.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ service cloud.firestore {
}

match /crt_repositories/{repository} {
allow read: if (request.auth.uid in request.resource.data.reviewers) || (request.auth.uid == request.resource.data.user);
allow read: if (request.auth.uid in request.resource.data.reviewers) || (request.auth.uid == resource.data.user);
allow write: if request.auth.uid == request.resource.data.user && hasUniqueFieldValue(database, "crt_repositories", request, "hash");
}

Expand Down
3 changes: 0 additions & 3 deletions hosting/.env
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions hosting/src/hooks/useLogin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useState } from "react";
import { getAuth, GithubAuthProvider, signInWithRedirect } from "firebase/auth";
import { getAuth, GithubAuthProvider, signInWithPopup } from "firebase/auth";
import { app } from "../firebase";

const auth = getAuth(app);
Expand All @@ -18,7 +18,10 @@ export function useLogin(): UseLoginHook {
provider.addScope("read:user");
provider.addScope("public_repo");

await signInWithRedirect(auth, provider);
const result = await signInWithPopup(auth, provider);
const credential = GithubAuthProvider.credentialFromResult(result);

sessionStorage.setItem("github_token", import.meta.env.VITE_LOCAL_GITHUB_TOKEN ?? credential!.accessToken!);

setLoading(false);
},
Expand Down
16 changes: 3 additions & 13 deletions hosting/src/hooks/useUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { getAuth, onAuthStateChanged, getRedirectResult, GithubAuthProvider, type User } from "firebase/auth";
import { getAuth, onAuthStateChanged, type User } from "firebase/auth";
import { app } from "../firebase";

const auth = getAuth(app);
Expand All @@ -8,18 +8,8 @@ export function useUser() {
const [user, setUser] = useState<User | undefined>();

useEffect(() => {
(async () => {
const result = await getRedirectResult(auth);

if (!result) return;

const credential = GithubAuthProvider.credentialFromResult(result);

sessionStorage.setItem("github_token", import.meta.env.VITE_LOCAL_GITHUB_TOKEN ?? credential!.accessToken!);
})();

const listener = onAuthStateChanged(auth, (user) => {
setUser(user ?? undefined);
const listener = onAuthStateChanged(auth, (authUser) => {
setUser(authUser ?? undefined);
});

return () => listener();
Expand Down