✨ feat: add auth-user-pass

Author: ccnnde

android/src/main/java/com/norcod/rnovpn/RNSimpleOpenvpnModule.java

@@ -238,24 +238,24 @@ private void startVpn(Promise promise) {
     ConfigParser cp = new ConfigParser();
 
     try {
+      String username = ovpnOptions.getOrDefault("username", "").toString();
+      String password = ovpnOptions.getOrDefault("password", "").toString();
       String notificationTitle = ovpnOptions.getOrDefault("notificationTitle", "OpenVPN").toString();
       int compatMode = ovpnOptions.get("compatMode") != null ? ((Double)ovpnOptions.get("compatMode")).intValue()
                                                              : CompatMode.MODERN_DEFAULTS.ordinal();
       boolean useLegacyProvider = (boolean)ovpnOptions.getOrDefault("useLegacyProvider", false);
       boolean useCustomConfig = (boolean)ovpnOptions.getOrDefault("useCustomConfig", false);
       String customConfigOptions = ovpnOptions.getOrDefault("customConfigOptions", "").toString();
-      // String username = ovpnOptions.getOrDefault("username", "").toString();
-      // String password = ovpnOptions.getOrDefault("password", "").toString();
 
       cp.parseConfig(new StringReader(config));
       vpnProfile = cp.convertProfile();
+      vpnProfile.mUsername = username;
+      vpnProfile.mPassword = password;
       vpnProfile.mName = notificationTitle;
       vpnProfile.mCompatMode = Utils.mapCompatMode(compatMode);
       vpnProfile.mUseLegacyProvider = useLegacyProvider;
       vpnProfile.mUseCustomConfig = useCustomConfig;
       vpnProfile.mCustomConfigOptions = customConfigOptions;
-      // vpnProfile.mUsername = username;
-      // vpnProfile.mPassword = password;
 
       if (vpnProfile.checkProfile(reactContext) != R.string.no_error_found) {
         throw new RemoteException(reactContext.getString(vpnProfile.checkProfile(reactContext)));

index.d.ts

@@ -21,6 +21,8 @@ interface VpnOptions {
   remoteAddress?: string;
   ovpnString?: string;
   ovpnFileName?: string;
+  username?: string;
+  password?: string;
   assetsPath?: string;
   notificationTitle?: string;
   compatMode?: RNSimpleOpenvpn.CompatMode;

ios/RNSimpleOpenvpn.m

@@ -137,10 +137,12 @@ - (void)startVpn:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock
         reject(@"E_LOAD_PREFERENCE_ERROR", @"Provider Manager load preferences failed", error);
       } else {
         NSError *error = nil;
+        NSString *const username = self.ovpnOptions[@"username"] ? self.ovpnOptions[@"username"] : @"";
+        NSString *const password = self.ovpnOptions[@"password"] ? self.ovpnOptions[@"password"] : @"";
         NSString *const remoteAddress = self.ovpnOptions[@"remoteAddress"] ? self.ovpnOptions[@"remoteAddress"] : @"";
 
         [self.providerManager.connection
-            startVPNTunnelWithOptions:@{@"username" : @"", @"password" : @"", @"remote" : remoteAddress}
+            startVPNTunnelWithOptions:@{@"username" : username, @"password" : password, @"remote" : remoteAddress}
                        andReturnError:&error];
 
         if (error) {