feat(code): #13: remove authorizationCodeOnly feature

capacitor-community · Feb 8, 2019 · 27f8e84 · 27f8e84
1 parent 6060296
commit 27f8e84
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -34,9 +34,6 @@ For security reasons this plugin does not support the authorization code flow wi
 That would include storing your **client secret** in client code which is highly insecure and not recommended.
 That flow should only be used on the backend (server).
 
-But it is possible to use this plugin as part of that server side implementation
-by using `authorizationCodeOnly=true` and `responseType="code"`, so you get the authorization code for the server side steps.
-
 ## Installation
 
 `npm i -E @byteowls/capacitor-oauth2`

diff --git a/...owls/capacitor-oauth2/src/main/java/com/byteowls/capacitor/oauth2/OAuth2ClientPlugin.java b/...owls/capacitor-oauth2/src/main/java/com/byteowls/capacitor/oauth2/OAuth2ClientPlugin.java
@@ -40,7 +40,7 @@ public class OAuth2ClientPlugin extends Plugin {
     private static final String PARAM_RESOURCE_URL = "resourceUrl";
     private static final String RESPONSE_TYPE_CODE = "code";
     private static final String RESPONSE_TYPE_TOKEN = "token";
-    private static final String PARAM_AUTHORIZATION_CODE_ONLY = "authorizationCodeOnly";
+//    private static final String PARAM_AUTHORIZATION_CODE_ONLY = "authorizationCodeOnly";
 
     private OAuth2Options oauth2Options;
     private AuthorizationService authService;
@@ -193,13 +193,13 @@ protected OAuth2Options buildOptions(PluginCall call) {
         if (o.getState() == null || o.getState().trim().length() == 0) {
             o.setState(ConfigUtils.getRandomString(20));
         }
-        o.setAuthorizationCodeOnly(ConfigUtils.getCallParam(Boolean.class, call, OAuth2ClientPlugin.PARAM_AUTHORIZATION_CODE_ONLY, false));
-        if (o.isAuthorizationCodeOnly()) {
-            if (!RESPONSE_TYPE_CODE.equals(o.getResponseType())) {
-                Log.w(getLogTag(), "'" + PARAM_AUTHORIZATION_CODE_ONLY + "' is 'true' so '" + PARAM_RESPONSE_TYPE + "' must be 'code'! We fix that for you.");
-            }
-            o.setResponseType(RESPONSE_TYPE_CODE);
-        }
+//        o.setAuthorizationCodeOnly(ConfigUtils.getCallParam(Boolean.class, call, OAuth2ClientPlugin.PARAM_AUTHORIZATION_CODE_ONLY, false));
+//        if (o.isAuthorizationCodeOnly()) {
+//            if (!RESPONSE_TYPE_CODE.equals(o.getResponseType())) {
+//                Log.w(getLogTag(), "'" + PARAM_AUTHORIZATION_CODE_ONLY + "' is 'true' so '" + PARAM_RESPONSE_TYPE + "' must be 'code'! We fix that for you.");
+//            }
+//            o.setResponseType(RESPONSE_TYPE_CODE);
+//        }
 
         if (o.getResponseType() == null || o.getResponseType().length() == 0) {
             // fallback to token

diff --git a/...@byteowls/capacitor-oauth2/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Options.java b/...@byteowls/capacitor-oauth2/src/main/java/com/byteowls/capacitor/oauth2/OAuth2Options.java
@@ -12,7 +12,7 @@ public class OAuth2Options {
     private String responseType;
     private String scope;
     private String state;
-    private boolean authorizationCodeOnly;
+//    private boolean authorizationCodeOnly;
     private String redirectUrl;
     private String customHandlerClass;
 
@@ -72,13 +72,13 @@ public void setState(String state) {
         this.state = state;
     }
 
-    public boolean isAuthorizationCodeOnly() {
-        return authorizationCodeOnly;
-    }
-
-    public void setAuthorizationCodeOnly(boolean authorizationCodeOnly) {
-        this.authorizationCodeOnly = authorizationCodeOnly;
-    }
+//    public boolean isAuthorizationCodeOnly() {
+//        return authorizationCodeOnly;
+//    }
+//
+//    public void setAuthorizationCodeOnly(boolean authorizationCodeOnly) {
+//        this.authorizationCodeOnly = authorizationCodeOnly;
+//    }
 
     public String getRedirectUrl() {
         return redirectUrl;

diff --git a/ios/ByteowlsCapacitorOauth2/Source/ByteowlsCapacitorOauth2.swift b/ios/ByteowlsCapacitorOauth2/Source/ByteowlsCapacitorOauth2.swift
@@ -19,7 +19,7 @@ public class OAuth2ClientPlugin: CAPPlugin {
     let PARAM_RESOURCE_URL = "resourceUrl"
     let RESPONSE_TYPE_CODE = "code"
     let RESPONSE_TYPE_TOKEN = "token"
-    let PARAM_AUTHORIZATION_CODE_ONLY = "authorizationCodeOnly"
+    // let PARAM_AUTHORIZATION_CODE_ONLY = "authorizationCodeOnly"
 
     var oauthSwift: OAuth2Swift?
     var handlerClasses = [String: OAuth2CustomHandler.Type]()

diff --git a/src/definitions.ts b/src/definitions.ts
@@ -56,12 +56,12 @@ export interface OAuth2AuthenticateOptions {
      */
     state?: string;
 
-    /**
-     * Force the lib to only return the authorization code in the result.
-     * If true we use the code flow and the requestType is always "code".
-     * This becomes handy if you want to use it as part of a server side authorization code flow.
-     */
-    authorizationCodeOnly?: boolean;
+    // /**
+    //  * Force the lib to only return the authorization code in the result.
+    //  * If true we use the code flow and the requestType is always "code".
+    //  * This becomes handy if you want to use it as part of a server side authorization code flow.
+    //  */
+    // authorizationCodeOnly?: boolean;
     /**
      * Custom options for the platform "web"
      */

diff --git a/src/web.ts b/src/web.ts
@@ -81,15 +81,14 @@ export class OAuth2ClientPluginWeb extends WebPlugin implements OAuth2ClientPlug
                                         // code flow
                                         let authorizationCode = urlParamObj.code;
                                         if (authorizationCode) {
-                                            if (options.authorizationCodeOnly) {
-                                                let resp = {
-                                                    authorization_code: authorizationCode,
-                                                };
-                                                resolve(resp);
-                                            } else {
-                                                // TODO PKCE
-
-                                            }
+                                            // if (options.authorizationCodeOnly) {
+                                            //     let resp = {
+                                            //         authorization_code: authorizationCode,
+                                            //     };
+                                            //     resolve(resp);
+                                            // } else {
+                                            //     // TODO PKCE
+                                            // }
                                         } else {
                                             reject(new Error("No authorization code found!"));
                                         }