feat(code): #13: authorizationCodeOnly from master

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

Hide file tree

Showing 7 changed files with 4 additions and 43 deletions.
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,6 @@ 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 OAuth2Options oauth2Options;
     private AuthorizationService authService;
@@ -193,13 +192,6 @@ 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);
-//        }
 
         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,6 @@ public class OAuth2Options {
     private String responseType;
     private String scope;
     private String state;
-//    private boolean authorizationCodeOnly;
     private String redirectUrl;
     private String customHandlerClass;
 
@@ -72,14 +71,6 @@ public void setState(String state) {
         this.state = state;
     }
 
-//    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,6 @@ 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"
 
     var oauthSwift: OAuth2Swift?
     var handlerClasses = [String: OAuth2CustomHandler.Type]()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@byteowls/capacitor-oauth2",
-    "version": "1.0.0-alpha.28",
+    "version": "1.0.0-beta.1",
     "description": "Simple Capacitor OAuth 2 client plugin",
     "author": "Michael Oberwasserlechner",
     "homepage": "https://github.com/moberwasserlechner/capacitor-oauth2",

diff --git a/src/definitions.ts b/src/definitions.ts
@@ -39,9 +39,9 @@ export interface OAuth2AuthenticateOptions {
      */
     resourceUrl?: string;
     /**
-     * Defaults to 'token' aka implicit flow if emtpy and not used with @authorizationCodeOnly.
+     * Defaults to 'token' aka implicit flow if emtpy.
      *
-     * Be aware that this plugin does not support code flow with client secrets because of security reason.
+     * Be aware that this plugin does not support authorization code flow with client secrets because of security reason.
      *
      * However code + PKCE will be supported in future. Please see github issue #4
      */
@@ -55,13 +55,6 @@ export interface OAuth2AuthenticateOptions {
      * and sends it as using state is recommended.
      */
     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;
     /**
      * Custom options for the platform "web"
      */

diff --git a/src/web-utils.ts b/src/web-utils.ts
@@ -19,13 +19,6 @@ export class WebUtils {
         let appId = this.getAppId(options);
         let url = options.authorizationBaseUrl + "?client_id=" + appId;
 
-        if (options.authorizationCodeOnly) {
-            if (options.responseType !== "code") {
-                console.warn("'authorizationCodeOnly' is 'true' so 'responseType' must be 'code'! We fix that for you.");
-            }
-            options.responseType = "code";
-        }
-
         if (!options.responseType) {
             options.responseType = "token";
         }

diff --git a/src/web.ts b/src/web.ts
@@ -81,14 +81,7 @@ 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
-                                            // }
+                                            // TODO PKCE
                                         } else {
                                             reject(new Error("No authorization code found!"));
                                         }