Skip to content

fix: remove signInWithPopup #48

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
ittipatken wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: remove signInWithPopup #48

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
8 changes: 1 addition & 7 deletions src/app/auth.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {inject, Injectable} from '@angular/core';
import {Auth, getRedirectResult, GoogleAuthProvider, idToken, signInWithPopup, signInWithRedirect, signOut, user, User} from '@angular/fire/auth';
import {Auth, getRedirectResult, GoogleAuthProvider, idToken, signInWithRedirect, signOut, user, User} from '@angular/fire/auth';
import {BehaviorSubject, Subscription} from 'rxjs';

@Injectable({
Expand Down Expand Up @@ -28,12 +28,6 @@ export class AuthService {
getRedirectResult(this.auth); // ignore result
}

signInWithPopup() {
const provider = new GoogleAuthProvider();
provider.setCustomParameters({hd: 'docchula.com'});
return signInWithPopup(this.auth, provider);
}

signInWithRedirect() {
const provider = new GoogleAuthProvider();
provider.setCustomParameters({hd: 'docchula.com'});
Expand Down
18 changes: 7 additions & 11 deletions src/app/welcome/welcome.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,14 @@ export class WelcomePage implements OnInit, OnDestroy {
spinner: "crescent",
});
await loading.present();
await this.authService.signInWithRedirect().catch(async (error) => {
await this.alertError(
"Login Failed",
`Unable to sign in. Please try again. (${error.code}: ${error.message})`
);
})
.finally(() => loading.dismiss());

this.authService.signInWithPopup().catch(async (error) => {
if (error.code === "auth/popup-closed-by-user") {
// User closed the popup without completing the sign-in. May cause by popup blocker.
await this.authService.signInWithRedirect();
} else {
await this.alertError(
"Login Failed",
`Unable to sign in. Please try again. (${error.code}: ${error.message})`,
);
}
}).finally(() => loading.dismiss());
}

logout() {
Expand Down