refactor(expo): change accepted plugin parameters

BREAKING CHANGE: expo config plugin parameters have changed

Author: josmithua

example/app.json

@@ -8,7 +8,7 @@
     "sdkVersion": "42.0.0",
     "version": "1.0.0",
     "platforms": ["ios", "android", "web"],
-    "plugins": [["../app.plugin.js", { "signatureHash": "Xo8WBi6jzSxKDVR4drqm84yr9iU=" }]],
+    "plugins": [["../app.plugin.js", { "android": { "packageSignatureHash": "Xo8WBi6jzSxKDVR4drqm84yr9iU=" } }]],
     "android": {
       "package": "com.example"
     },

example/ios/example.xcodeproj/project.pbxproj

@@ -316,7 +316,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "example-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -345,7 +345,7 @@
 				PRODUCT_NAME = example;
 				SWIFT_OBJC_BRIDGING_HEADER = "example-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

example/ios/example/Info.plist

@@ -31,7 +31,7 @@
       <dict>
         <key>CFBundleURLSchemes</key>
         <array>
-          <string>msauth.com.example</string>
+          <string>msauth.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
         </array>
       </dict>
     </array>

plugin/build/withAndroidReactNativeMSAL.d.ts

@@ -1,4 +1,4 @@
 import { ConfigPlugin } from '@expo/config-plugins';
 export declare const withAndroidReactNativeMSAL: ConfigPlugin<{
-    signatureHash: string;
+    packageSignatureHash: string;
 }>;

plugin/build/withAndroidReactNativeMSAL.js

@@ -60,7 +60,7 @@ function setGradleMaven(buildGradle) {
     }
     return buildGradle + `\n${gradleMaven}\n`;
 }
-const withAndroidReactNativeMSAL = (config, { signatureHash }) => {
-    return config_plugins_1.withPlugins(config, [[withAndroidActivity, signatureHash], withAndroidMSALGradle]);
+const withAndroidReactNativeMSAL = (config, { packageSignatureHash }) => {
+    return config_plugins_1.withPlugins(config, [[withAndroidActivity, packageSignatureHash], withAndroidMSALGradle]);
 };
 exports.withAndroidReactNativeMSAL = withAndroidReactNativeMSAL;

plugin/build/withIosReactNativeMSAL.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withIosReactNativeMSAL = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const withIosUrlScheme = (config) => {
-    var _a;
     const QUERY_SCHEMES = ['msauthv2', 'msauthv3'];
-    const URL_SCHEME = { CFBundleURLSchemes: [`msauth.${(_a = config.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier}`] };
+    const URL_SCHEME = { CFBundleURLSchemes: ['msauth.$(PRODUCT_BUNDLE_IDENTIFIER)'] };
     return config_plugins_1.withInfoPlist(config, (mod) => {
         var _a;
         mod.modResults.CFBundleURLTypes = [...(mod.modResults.CFBundleURLTypes || []), URL_SCHEME];

plugin/build/withReactNativeMSAL.d.ts

@@ -1,5 +1,7 @@
 import { ConfigPlugin } from '@expo/config-plugins';
 declare const withReactNativeMSAL: ConfigPlugin<{
-    signatureHash: string;
+    android: {
+        signatureHash: string;
+    };
 }>;
 export default withReactNativeMSAL;

plugin/build/withReactNativeMSAL.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
 const withAndroidReactNativeMSAL_1 = require("./withAndroidReactNativeMSAL");
 const withIosReactNativeMSAL_1 = require("./withIosReactNativeMSAL");
-const withReactNativeMSAL = (config, { signatureHash }) => {
-    return config_plugins_1.withPlugins(config, [[withAndroidReactNativeMSAL_1.withAndroidReactNativeMSAL, { signatureHash }], withIosReactNativeMSAL_1.withIosReactNativeMSAL]);
+const withReactNativeMSAL = (config, { android }) => {
+    return config_plugins_1.withPlugins(config, [[withAndroidReactNativeMSAL_1.withAndroidReactNativeMSAL, android], withIosReactNativeMSAL_1.withIosReactNativeMSAL]);
 };
 exports.default = withReactNativeMSAL;

plugin/src/withAndroidReactNativeMSAL.ts

@@ -78,6 +78,9 @@ function setGradleMaven(buildGradle: string) {
   return buildGradle + `\n${gradleMaven}\n`;
 }
 
-export const withAndroidReactNativeMSAL: ConfigPlugin<{ signatureHash: string }> = (config, { signatureHash }) => {
-  return withPlugins(config, [[withAndroidActivity, signatureHash], withAndroidMSALGradle]);
+export const withAndroidReactNativeMSAL: ConfigPlugin<{ packageSignatureHash: string }> = (
+  config,
+  { packageSignatureHash }
+) => {
+  return withPlugins(config, [[withAndroidActivity, packageSignatureHash], withAndroidMSALGradle]);
 };

plugin/src/withIosReactNativeMSAL.ts

@@ -2,7 +2,7 @@ import { ConfigPlugin, withInfoPlist, withEntitlementsPlist, withPlugins, withAp
 
 const withIosUrlScheme: ConfigPlugin = (config) => {
   const QUERY_SCHEMES = ['msauthv2', 'msauthv3'];
-  const URL_SCHEME = { CFBundleURLSchemes: [`msauth.${config.ios?.bundleIdentifier}`] };
+  const URL_SCHEME = { CFBundleURLSchemes: ['msauth.$(PRODUCT_BUNDLE_IDENTIFIER)'] };
 
   return withInfoPlist(config, (mod) => {
     mod.modResults.CFBundleURLTypes = [...(mod.modResults.CFBundleURLTypes || []), URL_SCHEME];