Updates for WKWebView edit

alexziskind1 · Mar 25, 2018 · 177741a · 177741a
1 parent 0722b80
commit 177741a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tns-oauth-webview-helper.ios.ts b/tns-oauth-webview-helper.ios.ts
@@ -45,6 +45,8 @@ export class TnsOAuthWebViewHelper extends NSObject implements WKNavigationDeleg
 
 
     public webViewDecidePolicyForNavigationActionDecisionHandler(webView, navigationAction, decisionHandler) {
+        //decisionHandler(WKNavigationActionPolicy.Allow);
+        this._checkCodeIntercept(webView, null);
         this._origDelegate.webViewDecidePolicyForNavigationActionDecisionHandler(webView, navigationAction, decisionHandler);
     }
 

diff --git a/tns-oauth.ts b/tns-oauth.ts
@@ -105,6 +105,8 @@ export function loginViaAuthorizationCodeFlow(credentials: TnsOAuthModule.ITnsOA
     return new Promise((resolve, reject) => {
         var navCount = 0;
 
+        let hasCode = false;
+
         let checkCodeIntercept = (webView, error, url): boolean => {
             var retStr = '';
             try {
@@ -134,7 +136,8 @@ export function loginViaAuthorizationCodeFlow(credentials: TnsOAuthModule.ITnsOA
                     let qsObj = querystring.parse(parsedRetStr.query);
                     let codeStr = qsObj['code'] ? qsObj['code'] : qsObj['xsrfsign'];
                     let errSubCode = qsObj['error_subcode'];
-                    if (codeStr) {
+                    if (codeStr && !hasCode) {
+                        hasCode = true;
                         try {
                             getTokenFromCode(credentials, codeStr)
                                 .then((response: TnsOAuthModule.ITnsOAuthTokenResult) => {