sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: Evaluate AuthenticationWebView - TypeScript (#4158)

This commit is contained in:
Reinaldo Neto 2022-05-11 13:59:57 -03:00 committed by GitHub
parent 390516a5b4
commit fb11932d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/definitions/ICredentials.ts
View File

@ -18,4 +18,7 @@ export interface ICredentials {
fullName?: AppleAuthenticationFullName | null; fullName?: AppleAuthenticationFullName | null;
email?: string | null; email?: string | null;
identityToken?: string | null; identityToken?: string | null;
credentialToken?: string;
saml?: boolean;
cas?: { credentialToken?: string };
} }

13
app/views/AuthenticationWebView.tsx
View File

@ -14,6 +14,7 @@ import { TSupportedThemes, withTheme } from '../theme';
import debounce from '../utils/debounce'; import debounce from '../utils/debounce';
import * as HeaderButton from '../containers/HeaderButton'; import * as HeaderButton from '../containers/HeaderButton';
import { Services } from '../lib/services'; import { Services } from '../lib/services';
import { IApplicationState, ICredentials } from '../definitions';
const userAgent = isIOS const userAgent = isIOS
? 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1' ? 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1'
@ -93,7 +94,7 @@ class AuthenticationWebView extends React.PureComponent<IAuthenticationWebView,
navigation.pop(); navigation.pop();
}; };
login = (params: any) => { login = (params: ICredentials) => {
const { logging } = this.state; const { logging } = this.state;
if (logging) { if (logging) {
return; return;
@ -111,7 +112,7 @@ class AuthenticationWebView extends React.PureComponent<IAuthenticationWebView,
}; };
// Force 3s delay so the server has time to evaluate the token // Force 3s delay so the server has time to evaluate the token
debouncedLogin = debounce((params: any) => this.login(params), 3000); debouncedLogin = debounce((params: ICredentials) => this.login(params), 3000);
tryLogin = debounce( tryLogin = debounce(
async () => { async () => {
@ -135,7 +136,7 @@ class AuthenticationWebView extends React.PureComponent<IAuthenticationWebView,
const parsedUrl = parse(url, true); const parsedUrl = parse(url, true);
// ticket -> cas / validate & saml_idp_credentialToken -> saml // ticket -> cas / validate & saml_idp_credentialToken -> saml
if (parsedUrl.pathname?.includes('validate') || parsedUrl.query?.ticket || parsedUrl.query?.saml_idp_credentialToken) { if (parsedUrl.pathname?.includes('validate') || parsedUrl.query?.ticket || parsedUrl.query?.saml_idp_credentialToken) {
let payload; let payload: ICredentials;
if (authType === 'saml') { if (authType === 'saml') {
const token = parsedUrl.query?.saml_idp_credentialToken || ssoToken; const token = parsedUrl.query?.saml_idp_credentialToken || ssoToken;
const credentialToken = { credentialToken: token }; const credentialToken = { credentialToken: token };
@ -202,10 +203,10 @@ class AuthenticationWebView extends React.PureComponent<IAuthenticationWebView,
} }
} }
const mapStateToProps = (state: any) => ({ const mapStateToProps = (state: IApplicationState) => ({
server: state.server.server, server: state.server.server,
Accounts_Iframe_api_url: state.settings.Accounts_Iframe_api_url, Accounts_Iframe_api_url: state.settings.Accounts_Iframe_api_url as string,
Accounts_Iframe_api_method: state.settings.Accounts_Iframe_api_method Accounts_Iframe_api_method: state.settings.Accounts_Iframe_api_method as string
}); });
export default connect(mapStateToProps)(withTheme(AuthenticationWebView)); export default connect(mapStateToProps)(withTheme(AuthenticationWebView));