Changes for v2.2.0

Author: manish2788

README.md

@@ -1,4 +1,4 @@
-# cordova-plugin-oracle-idm-auth 2.1.1
+# cordova-plugin-oracle-idm-auth 2.2.0
 
 ## About the cordova-plugin-oracle-idm-auth
 The plugin provides authentication and authorization functionality for cordova based mobile applications,

RELEASENOTES.md

@@ -1,4 +1,6 @@
 # Release Notes
+## 2.2.0 (29 July, 2024)
+* cordova-ios 7.0.3 related upgrade
 ## 2.1.1 (13 March, 2024)
 * Documentation update
 ## 2.1.0 (25 July, 2023)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-oracle-idm-auth",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Provides authentication and authorization functionality using the Oracle IDM SDK, supporting standard protocols like Basic Auth, OAUTH, OpenID Connect and WebSSO.",
   "cordova": {
     "id": "cordova-plugin-oracle-idm-auth",

plugin.xml

@@ -6,7 +6,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-oracle-idm-auth"
-        version="2.1.1">
+        version="2.2.0">
   <name>cordova-plugin-oracle-idm-auth</name>
   <description>Provides authentication and authorization functionality using the Oracle IDM SDK, supporting standard protocols like Basic Auth, OAUTH, OpenID Connect and WebSSO</description>
   <keywords>cordova,idm,authentication,auth</keywords>

src/ios/src/IdmAuthentication.h

@@ -3,7 +3,7 @@
  * The Universal Permissive License (UPL), Version 1.0
  */
 #import <Foundation/Foundation.h>
-#import <Cordova/CDVCommandDelegateImpl.h>
+#import <Cordova/CDVCommandDelegate.h>
 #import <Cordova/CDVPlugin.h>
 
 #import "IDMMobileSDKv2Library.h"
@@ -19,26 +19,26 @@ NS_ASSUME_NONNULL_BEGIN
 -(nullable instancetype) initWithProperties:(NSDictionary<NSString *, NSObject *> *) properties
                          baseViewController:(nonnull UIViewController *)baseVc
                                    callback:(void(^)(IdmAuthentication* authFlow, NSError* error))setupCompletion;
-- (void) startLogin: (CDVCommandDelegateImpl*) commandDelegate
+- (void) startLogin: (id<CDVCommandDelegate>) commandDelegate
      withCallbackId: (NSString*) callbackId;
-- (void) cancelLogin: (CDVCommandDelegateImpl*) commandDelegate
+- (void) cancelLogin: (id<CDVCommandDelegate>) commandDelegate
      withCallbackId: (NSString*) callbackId;
-- (void) finishLogin: (CDVCommandDelegateImpl*) commandDelegate
+- (void) finishLogin: (id<CDVCommandDelegate>) commandDelegate
       withCallbackId: (NSString*) callbackId
      challengeResult: (NSDictionary*) challengeFields;
-- (void) isAuthenticated: (CDVCommandDelegateImpl*) commandDelegate
+- (void) isAuthenticated: (id<CDVCommandDelegate>) commandDelegate
           withCallbackId: (NSString*) callbackId
           withProperties: (NSDictionary*) properties;
-- (void) getHeaders: (CDVCommandDelegateImpl*) commandDelegate
+- (void) getHeaders: (id<CDVCommandDelegate>) commandDelegate
      withCallbackId: (NSString*) callbackId
 withFedAuthSecuredUrl: (NSString*) fedAuthSecuredUrl
     withOauthScopes: (NSSet*) scopes;
-- (void) logout: (CDVCommandDelegateImpl*) commandDelegate
+- (void) logout: (id<CDVCommandDelegate>) commandDelegate
  withCallbackId: (NSString*) callbackId
  withForgetOption:(BOOL) forget;
-- (void) addTimeoutCallback: (CDVCommandDelegateImpl*) commandDelegate
+- (void) addTimeoutCallback: (id<CDVCommandDelegate>) commandDelegate
              withCallbackId: (NSString*) callbackId;
-- (void) resetIdleTimeout: (CDVCommandDelegateImpl*) commandDelegate
+- (void) resetIdleTimeout: (id<CDVCommandDelegate>) commandDelegate
            withCallbackId: (NSString*) callbackId;
 - (void) submitExternalBrowserChallengeResponse: (NSURL*) incomingUrl;
 @end

src/ios/src/IdmAuthentication.m

@@ -50,13 +50,13 @@ @interface IdmAuthentication()<SFSafariViewControllerDelegate>
 /**
  * Callback details for returning the result for login or logout to javascript layer.
  */
-@property (nonatomic, strong, nullable) CDVCommandDelegateImpl*    loginLogoutCommandDelegate;
+@property (nonatomic, strong, nullable) id<CDVCommandDelegate>    loginLogoutCommandDelegate;
 @property (nonatomic, copy, nullable) NSString*                    loginLogoutCallbackId;
 
 /**
  * Callback details for returning the result for timeout to javascript layer.
  */
-@property (nonatomic, strong, nullable) CDVCommandDelegateImpl*    timeoutCommandDelegate;
+@property (nonatomic, strong, nullable) id<CDVCommandDelegate>    timeoutCommandDelegate;
 @property (nonatomic, copy, nullable) NSString*                    timeoutCallbackId;
 
 /**
@@ -157,7 +157,7 @@ -(nullable instancetype) initWithProperties:(NSDictionary<NSString *, NSObject *
  * @param commandDelegate: callback
  * @param callbackId: callback id
  */
--(void) startLogin:(CDVCommandDelegateImpl*) commandDelegate
+-(void) startLogin:(id<CDVCommandDelegate>) commandDelegate
         withCallbackId: (NSString*) callbackId {
   IdmLog(@"startLogin invoked");
   NSError* error = [self.ommss startAuthenticationProcess:nil];
@@ -186,7 +186,7 @@ -(void) startLogin:(CDVCommandDelegateImpl*) commandDelegate
  * @param commandDelegate: callback
  * @param callbackId: callback id
  */
--(void) cancelLogin:(CDVCommandDelegateImpl*) commandDelegate
+-(void) cancelLogin:(id<CDVCommandDelegate>) commandDelegate
         withCallbackId: (NSString*) callbackId {
   IdmLog(@"cancelLogin invoked");
   self.loginLogoutCommandDelegate = commandDelegate;
@@ -203,7 +203,7 @@ -(void) cancelLogin:(CDVCommandDelegateImpl*) commandDelegate
  * @param callbackId: callback id
  * @param challengeFields: The filled up challenge fields map.
  */
--(void) finishLogin:(CDVCommandDelegateImpl *)commandDelegate
+-(void) finishLogin:(id<CDVCommandDelegate>)commandDelegate
         withCallbackId:(NSString *)callbackId
         challengeResult: (NSDictionary*) challengeFields {
   IdmLog(@"Finish login received %@", challengeFields);
@@ -228,7 +228,7 @@ -(void) finishLogin:(CDVCommandDelegateImpl *)commandDelegate
  * @param callbackId: callback id
  * @param properties: extra properties if any
  */
-- (void) isAuthenticated: (CDVCommandDelegateImpl*) commandDelegate
+- (void) isAuthenticated: (id<CDVCommandDelegate>) commandDelegate
          withCallbackId: (NSString*) callbackId
          withProperties: (NSDictionary*) properties {
   IdmLog(@"isAuthenticated invoked");
@@ -277,7 +277,7 @@ - (BOOL) checkIsValidForOauth: (OMAuthenticationContext*) context
  * @param callbackId: callback id
  * @param fedAuthSecuredUrl: The secured URL for which cookies and headers have to be retrieved. Applicable only for Federated Auth usecase.
  */
-- (void) getHeaders: (CDVCommandDelegateImpl*) commandDelegate
+- (void) getHeaders: (id<CDVCommandDelegate>) commandDelegate
      withCallbackId: (NSString*) callbackId
 withFedAuthSecuredUrl: (NSString*) fedAuthSecuredUrl
     withOauthScopes: (NSSet*) scopes{
@@ -318,7 +318,7 @@ - (void) getHeaders: (CDVCommandDelegateImpl*) commandDelegate
  * @param commandDelegate: callback
  * @param callbackId: callback id
  */
--(void) logout:(CDVCommandDelegateImpl *)commandDelegate
+-(void) logout:(id<CDVCommandDelegate>)commandDelegate
 withCallbackId:(NSString *)callbackId
 withForgetOption:(BOOL) forget {
   IdmLog(@"logout invoked with forget %@", forget ? @"YES": @"NO");
@@ -337,7 +337,7 @@ -(void) logout:(CDVCommandDelegateImpl *)commandDelegate
  * @param commandDelegate: callback
  * @param callbackId: callback id
  */
-- (void) addTimeoutCallback: (CDVCommandDelegateImpl*) commandDelegate
+- (void) addTimeoutCallback: (id<CDVCommandDelegate>) commandDelegate
          withCallbackId: (NSString*) callbackId {
   IdmLog(@"addTimeoutCallback invoked");
   self.timeoutCommandDelegate = commandDelegate;
@@ -352,7 +352,7 @@ - (void) addTimeoutCallback: (CDVCommandDelegateImpl*) commandDelegate
  * @param commandDelegate: callback
  * @param callbackId: callback id
  */
-- (void) resetIdleTimeout: (CDVCommandDelegateImpl*) commandDelegate
+- (void) resetIdleTimeout: (id<CDVCommandDelegate>) commandDelegate
          withCallbackId: (NSString*) callbackId {
   IdmLog(@"resetIdleTimeout invoked");
   OMAuthenticationContext* context = [self.ommss authenticationContext];

src/ios/src/IdmAuthenticationPlugin.m

@@ -105,7 +105,7 @@ - (void) setup:(CDVInvokedUrlCommand *) command {
     return;
   }
 
-  __weak CDVCommandDelegateImpl* delegate = self.commandDelegate;
+  __weak id<CDVCommandDelegate> delegate = self.commandDelegate;
 
   self.setupCompletionCallback = ^(IdmAuthentication * authFlow, NSError * error) {
     if (error != nil) {

src/ios/src/LocalAuthenticator.h

@@ -4,20 +4,20 @@
  */
 #import <Foundation/Foundation.h>
 #import "IDMMobileSDKv2Library.h"
-#import <Cordova/CDVCommandDelegateImpl.h>
+#import <Cordova/CDVCommandDelegate.h>
 #import <Cordova/CDVPluginResult.h>
 
 @interface LocalAuthenticator : NSObject
 
 +(LocalAuthenticator*) sharedInstance;
 
--(void) enabledLocalAuthsPrimaryFirst:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) enable:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) disable:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) authenticateBiometric:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) authenticatePin:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) changePin:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) getLocalAuthSupportInfo:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) getPreference:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
--(void) setPreference:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate;
+-(void) enabledLocalAuthsPrimaryFirst:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) enable:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) disable:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) authenticateBiometric:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) authenticatePin:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) changePin:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) getLocalAuthSupportInfo:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) getPreference:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
+-(void) setPreference:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate;
 @end

src/ios/src/LocalAuthenticator.m

@@ -53,7 +53,7 @@ @interface LocalAuthenticator()<OMBiometricFallbackDelegate>
 
 @property (nonatomic, strong) OMFallbackAuthenticationCompletionBlock fallbackHandler;
 
-@property (nonatomic, strong, nullable) CDVCommandDelegateImpl* biometricAuthDelegate;
+@property (nonatomic, strong, nullable) id<CDVCommandDelegate> biometricAuthDelegate;
 @property (nonatomic, copy, nullable) NSString* biometricAuthCallbackId;
 
 @end
@@ -72,7 +72,7 @@ +(LocalAuthenticator*) sharedInstance {
   return shared;
 }
 
--(void) enabledLocalAuthsPrimaryFirst:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate {
+-(void) enabledLocalAuthsPrimaryFirst:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate {
   NSString* authId = command.arguments[0];
   CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
                                                messageAsArray:[self getEnabled:authId]];
@@ -110,7 +110,7 @@ - (BOOL) enableDefaultAuthenticator {
   return YES;
 }
 
--(void) enable:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate {
+-(void) enable:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate {
   NSError* enableError = nil;
   NSString* authId = command.arguments[0];
   NSString* authenticatorName = command.arguments[1];
@@ -179,7 +179,7 @@ -(void) enable:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*)
   [commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK] callbackId:command.callbackId];
 }
 
--(void) disable:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate {
+-(void) disable:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate {
   NSError* disableError = nil;
   NSString* authId = command.arguments[0];
   NSString* authenticatorName = command.arguments[1];
@@ -219,7 +219,7 @@ -(void) disable:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*
                          callbackId:command.callbackId];
 }
 
--(void) getPreference:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate {
+-(void) getPreference:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate {
     NSString* authId = command.arguments[0];
     NSString* key = command.arguments[1];
     NSString* result;
@@ -242,7 +242,7 @@ -(void) getPreference:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegat
     [commandDelegate sendPluginResult:[CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:result] callbackId:command.callbackId];
 }
 
--(void) setPreference:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegateImpl*) commandDelegate {
+-(void) setPreference:(CDVInvokedUrlCommand*)command delegate:(id<CDVCommandDelegate>) commandDelegate {
     NSString* authId = command.arguments[0];
     NSString* key = command.arguments[1];
     NSString* value = command.arguments[2];
@@ -300,7 +300,7 @@ -(void) setPreference:(CDVInvokedUrlCommand*)command delegate:(CDVCommandDelegat
 }
 
 -(void) authenticateBiometric:(CDVInvokedUrlCommand*)command
-            delegate:(CDVCommandDelegateImpl*)commandDelegate {
+            delegate:(id<CDVCommandDelegate>)commandDelegate {
   NSString* authId = command.arguments[0];
   NSString* authType = command.arguments[1];
   NSDictionary* localizedStrings = command.arguments[2];
@@ -351,7 +351,7 @@ -(void) authenticateBiometric:(CDVInvokedUrlCommand*)command
 }
 
 -(void) authenticatePin:(CDVInvokedUrlCommand*)command
-            delegate:(CDVCommandDelegateImpl*)commandDelegate {
+            delegate:(id<CDVCommandDelegate>)commandDelegate {
   NSError *authError = nil;
   NSString* authId = command.arguments[0];
   NSString* pin = command.arguments[1];
@@ -387,7 +387,7 @@ -(void) authenticatePin:(CDVInvokedUrlCommand*)command
 }
 
 -(void) changePin:(CDVInvokedUrlCommand*)command
-         delegate:(CDVCommandDelegateImpl*)commandDelegate {
+         delegate:(id<CDVCommandDelegate>)commandDelegate {
   NSError* changePinError;
   NSString* authId = command.arguments[0];
   OMPinAuthenticator* pinAuthenticator = [self getPinAuthenticator:authId];
@@ -421,7 +421,7 @@ -(void) changePin:(CDVInvokedUrlCommand*)command
 }
 
 -(void) getLocalAuthSupportInfo:(CDVInvokedUrlCommand*)command
-                       delegate:(CDVCommandDelegateImpl*)commandDelegate {
+                       delegate:(id<CDVCommandDelegate>)commandDelegate {
   NSMutableDictionary* auths = [[NSMutableDictionary alloc] init];
   auths[LOCAL_AUTH_PIN] = ENROLLED;
   auths[LOCAL_AUTH_FINGERPRINT] = [self getFingerprintSupportOnDevice];