@sapphire-ion/framework 0.30.10 → 0.30.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -30,9 +30,6 @@ export class AuthService {
|
|
|
30
30
|
if (this.isTokenValid(Token)) {
|
|
31
31
|
this.currentToken = await this.JWToken();
|
|
32
32
|
}
|
|
33
|
-
else {
|
|
34
|
-
return this.Loggout();
|
|
35
|
-
}
|
|
36
33
|
if (TokenAdmin && this.isTokenValid(TokenAdmin)) {
|
|
37
34
|
this._isAdmin = true;
|
|
38
35
|
}
|
|
@@ -146,4 +143,4 @@ class Token {
|
|
|
146
143
|
}
|
|
147
144
|
}
|
|
148
145
|
}
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/lib/services/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, firstValueFrom } from 'rxjs';\r\nimport { NavController } from '@ionic/angular';\r\nimport { Preferences } from '@capacitor/preferences';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\nimport { jwtDecode } from 'jwt-decode';\r\n\r\nimport { ApiUrlProviderService } from '../services/web/api-url-provider.service';\r\nimport { EnvironmentService } from './environment.service';\r\nimport { Utils } from './utils.service';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class AuthService {\r\n\r\n  constructor(\r\n    private http: HttpClient,\r\n    private navController: NavController,\r\n    private coreService: EnvironmentService,\r\n    private apiUrlProviderService: ApiUrlProviderService \r\n  ) {\r\n    this.SetToken();\r\n  }\r\n\r\n  private localUserKey      : string = this.coreService.environment.applicationName.toUpperCase() + \"_USER_KEY\";\r\n  private localAdminKey     : string = this.coreService.environment.applicationName.toUpperCase() + \"_ADMIN_KEY\";\r\n  public  currentToken: string | null = null;\r\n\r\n  async SetToken(): Promise<void> {\r\n    const Token      = await this.LoadToken();\r\n    const TokenAdmin = await this.LoadTokenAdmin();\r\n    if(this.isTokenValid(Token)){\r\n      this.currentToken = await this.JWToken();\r\n    }else{\r\n      return this.Loggout();\r\n    }\r\n\r\n    if(TokenAdmin && this.isTokenValid(TokenAdmin)){\r\n      this._isAdmin = true;\r\n    }\r\n\r\n    return;\r\n  }\r\n\r\n  async Loggout(): Promise<void> {\r\n    await Preferences.remove({ key: this.localUserKey });\r\n    await Preferences.remove({ key: this.localAdminKey });\r\n    this.currentToken = null;\r\n    this.navController.navigateRoot(\"login\");\r\n  }\r\n  \r\n  _isAdmin: boolean = false;\r\n  get isAdmin(){ return this._isAdmin;  }\r\n\r\n  async Login(credentials: Authentication): Promise<any> {\r\n    try{\r\n      const JWToken = await firstValueFrom(this.ApiLogin(credentials));\r\n      await this.SaveToken(JWToken);\r\n      await this.SetToken();\r\n      return (jwtDecode(JWToken));\r\n    }\r\n    catch (Error){\r\n      throw Error;\r\n    }\r\n  }\r\n\r\n  async BypassLogin(id: number): Promise<any> {\r\n    try{\r\n      const JWToken = await firstValueFrom(this.ApiBypassLogin(id));\r\n      await this.SaveToken(JWToken);\r\n      await this.SetToken();\r\n      return (jwtDecode(JWToken));\r\n    }\r\n    catch (Error){\r\n      throw Error;\r\n    }\r\n  }\r\n\r\n  ApiLogin(credentials: Authentication): Observable<string> {\r\n    return this.http.post<string>(this.apiUrlProviderService.apiUrl + 'auth', credentials);\r\n  }\r\n  ApiBypassLogin(id: number): Observable<string> {\r\n    return this.http.get<string>(this.apiUrlProviderService.apiUrl + `auth/${id}`);\r\n  }\r\n\r\n  async SaveToken(JWToken: string): Promise<void>{\r\n    if((jwtDecode(JWToken) as Token).id == 1){ \r\n      await Preferences.set({ key: this.localAdminKey, value: JWToken});\r\n    }\r\n    await Preferences.set({ key: this.localUserKey, value: JWToken })\r\n  }\r\n\r\n  async LoadToken(): Promise<Token | null | any> {\r\n    const JWToken = (await Preferences.get({ key: this.localUserKey})).value;\r\n    if(JWToken){\r\n      const ParsedObject = jwtDecode(JWToken);\r\n      return ParsedObject;\r\n    }else{\r\n      return null;\r\n    }\r\n  }\r\n  async LoadTokenAdmin(): Promise<Token | null | any> {\r\n    const JWToken = (await Preferences.get({ key: this.localAdminKey})).value;\r\n    if(JWToken){\r\n      const ParsedObject = jwtDecode(JWToken);\r\n      return ParsedObject;\r\n    }else{\r\n      return null;\r\n    }\r\n  }\r\n\r\n  async JWToken(): Promise<string> {\r\n    const JWToken: string = (await Preferences.get({ key: this.localUserKey })).value;\r\n    return JWToken;\r\n  }\r\n\r\n  async GetBearer(): Promise<string>{\r\n    return `Bearer ${await this.JWToken()}`\r\n  }\r\n\r\n  public isTokenValid(Token: any): boolean{\r\n    if(!Token){ return false; }else\r\n    return !(Utils.UNIXToDate(Token.exp) < new Date())\r\n  }\r\n}\r\n\r\nclass Authentication{\r\n  public Apelido: string = null;\r\n  public Senha  : string = null;\r\n}\r\n\r\nclass Token {\r\n  [prop: string]: any;\r\n  Acesso   : number = 0;\r\n  Apelido  : string = \"\";\r\n  Nome     : string = \"\";\r\n  id       : number = 0;\r\n  idEmpresa: number = 0;\r\n  \r\n  constructor(){}\r\n  \r\n  patch(token: Token | any): void{\r\n    for(let prop of Object.getOwnPropertyNames(token)){\r\n      if(Number((token[prop]))){\r\n        this[prop] = Number(token[prop]); \r\n        continue;\r\n      }\r\n      this[prop] = token[prop];\r\n    }\r\n  }\r\n}"]}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../src/lib/services/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, firstValueFrom } from 'rxjs';\r\nimport { NavController } from '@ionic/angular';\r\nimport { Preferences } from '@capacitor/preferences';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\nimport { jwtDecode } from 'jwt-decode';\r\n\r\nimport { ApiUrlProviderService } from '../services/web/api-url-provider.service';\r\nimport { EnvironmentService } from './environment.service';\r\nimport { Utils } from './utils.service';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class AuthService {\r\n\r\n  constructor(\r\n    private http: HttpClient,\r\n    private navController: NavController,\r\n    private coreService: EnvironmentService,\r\n    private apiUrlProviderService: ApiUrlProviderService \r\n  ) {\r\n    this.SetToken();\r\n  }\r\n\r\n  private localUserKey      : string = this.coreService.environment.applicationName.toUpperCase() + \"_USER_KEY\";\r\n  private localAdminKey     : string = this.coreService.environment.applicationName.toUpperCase() + \"_ADMIN_KEY\";\r\n  public  currentToken: string | null = null;\r\n\r\n  async SetToken(): Promise<void> {\r\n    const Token      = await this.LoadToken();\r\n    const TokenAdmin = await this.LoadTokenAdmin();\r\n    if(this.isTokenValid(Token)){\r\n      this.currentToken = await this.JWToken();\r\n    }\r\n\r\n    if(TokenAdmin && this.isTokenValid(TokenAdmin)){\r\n      this._isAdmin = true;\r\n    }\r\n\r\n    return;\r\n  }\r\n\r\n  async Loggout(): Promise<void> {\r\n    await Preferences.remove({ key: this.localUserKey });\r\n    await Preferences.remove({ key: this.localAdminKey });\r\n    this.currentToken = null;\r\n    this.navController.navigateRoot(\"login\");\r\n  }\r\n  \r\n  _isAdmin: boolean = false;\r\n  get isAdmin(){ return this._isAdmin;  }\r\n\r\n  async Login(credentials: Authentication): Promise<any> {\r\n    try{\r\n      const JWToken = await firstValueFrom(this.ApiLogin(credentials));\r\n      await this.SaveToken(JWToken);\r\n      await this.SetToken();\r\n      return (jwtDecode(JWToken));\r\n    }\r\n    catch (Error){\r\n      throw Error;\r\n    }\r\n  }\r\n\r\n  async BypassLogin(id: number): Promise<any> {\r\n    try{\r\n      const JWToken = await firstValueFrom(this.ApiBypassLogin(id));\r\n      await this.SaveToken(JWToken);\r\n      await this.SetToken();\r\n      return (jwtDecode(JWToken));\r\n    }\r\n    catch (Error){\r\n      throw Error;\r\n    }\r\n  }\r\n\r\n  ApiLogin(credentials: Authentication): Observable<string> {\r\n    return this.http.post<string>(this.apiUrlProviderService.apiUrl + 'auth', credentials);\r\n  }\r\n  ApiBypassLogin(id: number): Observable<string> {\r\n    return this.http.get<string>(this.apiUrlProviderService.apiUrl + `auth/${id}`);\r\n  }\r\n\r\n  async SaveToken(JWToken: string): Promise<void>{\r\n    if((jwtDecode(JWToken) as Token).id == 1){ \r\n      await Preferences.set({ key: this.localAdminKey, value: JWToken});\r\n    }\r\n    await Preferences.set({ key: this.localUserKey, value: JWToken })\r\n  }\r\n\r\n  async LoadToken(): Promise<Token | null | any> {\r\n    const JWToken = (await Preferences.get({ key: this.localUserKey})).value;\r\n    if(JWToken){\r\n      const ParsedObject = jwtDecode(JWToken);\r\n      return ParsedObject;\r\n    }else{\r\n      return null;\r\n    }\r\n  }\r\n  async LoadTokenAdmin(): Promise<Token | null | any> {\r\n    const JWToken = (await Preferences.get({ key: this.localAdminKey})).value;\r\n    if(JWToken){\r\n      const ParsedObject = jwtDecode(JWToken);\r\n      return ParsedObject;\r\n    }else{\r\n      return null;\r\n    }\r\n  }\r\n\r\n  async JWToken(): Promise<string> {\r\n    const JWToken: string = (await Preferences.get({ key: this.localUserKey })).value;\r\n    return JWToken;\r\n  }\r\n\r\n  async GetBearer(): Promise<string>{\r\n    return `Bearer ${await this.JWToken()}`\r\n  }\r\n\r\n  public isTokenValid(Token: any): boolean{\r\n    if(!Token){ return false; }else\r\n    return !(Utils.UNIXToDate(Token.exp) < new Date())\r\n  }\r\n}\r\n\r\nclass Authentication{\r\n  public Apelido: string = null;\r\n  public Senha  : string = null;\r\n}\r\n\r\nclass Token {\r\n  [prop: string]: any;\r\n  Acesso   : number = 0;\r\n  Apelido  : string = \"\";\r\n  Nome     : string = \"\";\r\n  id       : number = 0;\r\n  idEmpresa: number = 0;\r\n  \r\n  constructor(){}\r\n  \r\n  patch(token: Token | any): void{\r\n    for(let prop of Object.getOwnPropertyNames(token)){\r\n      if(Number((token[prop]))){\r\n        this[prop] = Number(token[prop]); \r\n        continue;\r\n      }\r\n      this[prop] = token[prop];\r\n    }\r\n  }\r\n}"]}
|
|
@@ -1384,9 +1384,6 @@ class AuthService {
|
|
|
1384
1384
|
if (this.isTokenValid(Token)) {
|
|
1385
1385
|
this.currentToken = await this.JWToken();
|
|
1386
1386
|
}
|
|
1387
|
-
else {
|
|
1388
|
-
return this.Loggout();
|
|
1389
|
-
}
|
|
1390
1387
|
if (TokenAdmin && this.isTokenValid(TokenAdmin)) {
|
|
1391
1388
|
this._isAdmin = true;
|
|
1392
1389
|
}
|