starting auth logic

patrick-carmo · Apr 12, 2024 · 13ec4f3 · 13ec4f3
1 parent d5ab14c
commit 13ec4f3
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 48 deletions.
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation project(':capacitor-clipboard')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
+    implementation project(':capacitor-preferences')
     implementation project(':capacitor-share')
     implementation project(':capacitor-status-bar')
 

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -17,6 +17,9 @@ project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/
 include ':capacitor-keyboard'
 project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
 
+include ':capacitor-preferences'
+project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
+
 include ':capacitor-share'
 project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')
 

diff --git a/news.apk b/news.apk
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -20,9 +20,8 @@
           </ion-item>
         </ion-menu-toggle>
         <ion-menu-toggle>
-          <ion-item>
+          <ion-item (click)="signOut()">
             <ion-label>Sair</ion-label>
-            <ion-button (click)="verifyToken()"></ion-button>
             <ion-icon name="exit-sharp" slot="start"></ion-icon>
           </ion-item>
         </ion-menu-toggle>

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -12,12 +12,4 @@ export class AppComponent {
   async signOut() {
     await this.auth.signOut();
   }
-
-  async getUser() {
-    console.log(await this.auth.getUser())
-  }
-
-  async verifyToken(){
-    await this.auth.verifyToken()
-  }
 }
diff --git a/src/app/login/login.page.html b/src/app/login/login.page.html
@@ -10,6 +10,7 @@ <h1>Login</h1>
       <ion-input fill="outline" shape="round" label="Senha:" labelPlacement="floating" name="password" ngModel type="password" required [(ngModel)]="password"></ion-input>
 
       <div>
+        <ion-button fill="clear" shape="round">Criar Conta</ion-button>
         <ion-button fill="clear" shape="round">Esqueceu a senha?</ion-button>
         <ion-button fill="clear" shape="round" (click)="googleAuth()">
           <ion-icon name="logo-google"></ion-icon>

diff --git a/src/app/login/login.page.ts b/src/app/login/login.page.ts
@@ -16,7 +16,7 @@ export class LoginPage {
   private messageTimeout: any;
 
   constructor(
-    private auth: AuthService,
+    public auth: AuthService,
     private loadingControler: LoadingController,
     private router: Router
   ) {}
@@ -30,30 +30,30 @@ export class LoginPage {
   }
 
   async emailAuth(email: string, password: string) {
-    this.showLoading();
+    await this.showLoading();
     const error = await this.auth.emailSignIn(email, password);
-    this.dimisLoading();
+    await this.dimisLoading();
 
     error ? this.errorMessage(error) : this.router.navigate(['/']);
   }
 
   async googleAuth() {
-    this.showLoading();
+    await this.showLoading();
     const error = await this.auth.googleSignIn();
-    this.dimisLoading();
+    await this.dimisLoading();
 
     error ? this.errorMessage(error) : this.router.navigate(['/']);
   }
 
-  async showLoading() {
+  private async showLoading() {
     this.loading = await this.loadingControler.create({
       message: 'Enviando...',
     });
 
-    this.loading.present();
+    await this.loading.present();
   }
 
-  async dimisLoading() {
+  private async dimisLoading() {
     if (this.loading) {
       await this.loading.dismiss();
     }

diff --git a/src/app/services/auth-guard.service.ts b/src/app/services/auth-guard.service.ts
@@ -6,16 +6,21 @@ import { AuthService } from './auth.service';
   providedIn: 'root',
 })
 export class AuthGuard implements CanActivate {
+
   constructor(private auth: AuthService, private router: Router) {}
 
   async canActivate() {
-    const user = await this.auth.getUser();
+    try {
+      const result = await this.auth.isLogged();
+      if (!result) {
+        this.router.navigate(['/login']);
+        return false;
+      }
 
-    if (!user) {
+      return true;
+    } catch (error) {
       this.router.navigate(['/login']);
       return false;
     }
-
-    return true;
   }
 }
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
@@ -13,11 +13,10 @@ export class AuthService {
 
   async createUser(email: string, password: string) {
     try {
-      const data = await this.auth.createUserWithEmailAndPassword(
+      await this.auth.createUserWithEmailAndPassword(
         email,
         password
       );
-      await this.setToken(data);
 
       return;
     } catch (error) {
@@ -27,8 +26,8 @@ export class AuthService {
 
   async emailSignIn(email: string, password: string) {
     try {
-      const data = await this.auth.signInWithEmailAndPassword(email, password);
-      await this.setToken(data);
+      await this.auth.signInWithEmailAndPassword(email, password);
+
       return;
     } catch (error) {
       return firebaseError(error);
@@ -38,8 +37,7 @@ export class AuthService {
   async googleSignIn() {
     try {
       const provider = new firebase.auth.GoogleAuthProvider();
-      const data = await this.auth.signInWithPopup(provider);
-      await this.setToken(data);
+      await this.auth.signInWithPopup(provider);
 
       return;
     } catch (error) {
@@ -83,19 +81,21 @@ export class AuthService {
     }
   }
 
-  async verifyToken() {
-    try {
-      const token = await this.getToken();
-
-      if (!token) {
-        return this.router.navigate(['/login']);
-      }
-
-      const data = await this.auth.signInWithCustomToken(token);
-      return await this.setToken(data);
-    } catch (error) {
-      return firebaseError(error);
-    }
+  async isLogged(): Promise<any> {
+    return new Promise((resolve, reject) => {
+      this.auth.authState.subscribe(
+        (user) => {
+          if (user) {
+            resolve(user);
+          } else {
+            reject('Usuário não logado');
+          }
+        },
+        (error) => {
+          reject(error);
+        }
+      );
+    });
   }
 
   async getUser() {
@@ -107,22 +107,21 @@ export class AuthService {
     }
   }
 
-  async getToken() {
+  async getToken(key: string) {
     try {
-      const token = await Preferences.get({ key: 'token' });
+      const token = await Preferences.get({ key });
       return token.value;
     } catch (error) {
-      return firebaseError(error);
+      return 'Erro interno do servidor'
     }
   }
 
-  async setToken(data: any) {
+  async setToken(key: string, value: any) {
     try {
-      const token = await data.user?.getIdToken();
-      if (token) await Preferences.set({ key: 'token', value: token });
+      await Preferences.set({ key, value });
       return;
     } catch (error) {
-      return firebaseError(error);
+      return 'Erro interno do servidor'
     }
   }
 }