Staging -> main for beta.1 release

.github/workflows/npm-publish.yml

@@ -21,8 +21,8 @@ jobs:
       run: yarn bootstrap
     - name: Authenticate with Registry
       run: |
-        echo "@adobe:registry=http://registry.npmjs.org/" > .npmrc
-        echo "registry=http://registry.npmjs.org/" >> .npmrc
+        echo "@adobe:registry=https://registry.npmjs.org/" > .npmrc
+        echo "registry=https://registry.npmjs.org/" >> .npmrc
         echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
         npm whoami        
       env: # More info about the environment variables in the README

README.md

@@ -18,8 +18,9 @@ This repository is a monorepo. It contains a collection of Adobe Experience Plat
 |  [@adobe/react-native-aepuserprofile](./packages/userprofile)    |   [![npm version](https://badge.fury.io/js/%40adobe%2Freact-native-aepuserprofile.svg)](https://www.npmjs.com/package/@adobe/react-native-aepuserprofile) [![npm downloads](https://img.shields.io/npm/dm/@adobe/react-native-aepuserprofile)](https://www.npmjs.com/package/@adobe/react-native-aepuserprofile)   
 |  [@adobe/react-native-aepedge](./packages/edge)    |   [![npm version](https://badge.fury.io/js/%40adobe%2Freact-native-aepedge.svg)](https://www.npmjs.com/package/@adobe/react-native-aepedge) [![npm downloads](https://img.shields.io/npm/dm/@adobe/react-native-aepedge)](https://www.npmjs.com/package/@adobe/react-native-aepedge) |
 |  [@adobe/react-native-aepedgeidentity](./packages/edgeidentity)    |   [![npm version](https://badge.fury.io/js/%40adobe%2Freact-native-aepedgeidentity.svg)](https://www.npmjs.com/package/@adobe/react-native-aepedgeidentity) [![npm downloads](https://img.shields.io/npm/dm/@adobe/react-native-aepedgeidentity)](https://www.npmjs.com/package/@adobe/react-native-aepedgeidentity) |
+|  [@adobe/react-native-aepedgeconsent](./packages/edgeconsent)    |   [![npm version](https://badge.fury.io/js/%40adobe%2Freact-native-aepedgeconsent.svg)](https://www.npmjs.com/package/@adobe/react-native-aepedgeconsent) [![npm downloads](https://img.shields.io/npm/dm/@adobe/react-native-aepedgeconsent)](https://www.npmjs.com/package/@adobe/react-native-aepedgeconsent) |
 |  [@adobe/react-native-aepmessaging](./packages/messaging)  |  [![npm version](https://badge.fury.io/js/%40adobe%2Freact-native-aepmessaging.svg)](https://www.npmjs.com/package/@adobe/react-native-aepmessaging) [![npm downloads](https://img.shields.io/npm/dm/@adobe/react-native-aepmessaging)](https://www.npmjs.com/package/@adobe/react-native-aepmessaging)  |
-|  [@adobe/react-native-aepassurance (3.0.0-alpha.1)](./packages/assurance)    |  [![npm version](https://img.shields.io/npm/v/@adobe/react-native-aepassurance/alpha?color=green&label=npm%20package)](https://www.npmjs.com/package/@adobe/react-native-aepassurance/v/3.0.0-alpha.1) [![npm downloads](https://img.shields.io/npm/dm/@adobe/react-native-aepassurance)](https://www.npmjs.com/package/@adobe/react-native-aepassurance/v/3.0.0-alpha.1)  |
+|  [@adobe/react-native-aepassurance](./packages/assurance)    |  [![npm version](https://badge.fury.io/js/%40adobe%2Freact-native-aepassurance.svg)](https://www.npmjs.com/package/@adobe/react-native-aepassurance) [![npm downloads](https://img.shields.io/npm/dm/@adobe/react-native-aepassurance)](https://www.npmjs.com/package/@adobe/react-native-aepassurance)  |
 
 `@adobe/react-native-aep{extension}` is a wrapper around the iOS and Android [AEP SDK](https://aep-sdks.gitbook.io/docs/) to allow for integration with React Native applications.
 
@@ -65,15 +66,28 @@ Initializing the SDK should be done in native code inside your `AppDelegate` (iO
 @import AEPServices;
 @import AEPSignal;
 @import AEPLifecycle;
-@import AEPIdentity;
-@import AEPUserProfile;
+@import AEPEdge;
+@import AEPEdgeIdentity;
+@import AEPEdgeConsent;
+//@import AEPMessaging;
+//@import AEPUserProfile;
+//@import AEPAssurance;
+//@import AEPIdentity;
 ...
 @implementation AppDelegate
 -(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   [AEPMobileCore setLogLevel: AEPLogLevelDebug];
   [AEPMobileCore configureWithAppId:@"yourAppID"];
-  [AEPMobileCore registerExtensions: @[AEPMobileIdentity.class, AEPMobileLifecycle.class, AEPMobileSignal.class, AEPMobileUserProfile.class
-    // register other extensions here
+  [AEPMobileCore registerExtensions: @[
+      AEPMobileLifecycle.class,
+      AEPMobileSignal.class,
+      AEPMobileEdge.class,
+      AEPMobileEdgeIdentity.class,
+      AEPMobileEdgeConsent.class,
+      //AEPMobileIdentity.class,
+      //AEPMobileUserProfile.class,
+      //AEPMobileMessaging.class,
+      //AEPMobileAssurance.class,
     ] completion:^{
     [AEPMobileCore lifecycleStart:@{@"contextDataKey": @"contextDataVal"}];
   }
@@ -93,13 +107,16 @@ Initializing the SDK should be done in native code inside your `AppDelegate` (iO
 ###### **Android:**
 ```java
 import com.adobe.marketing.mobile.AdobeCallback;
-import com.adobe.marketing.mobile.Identity;
 import com.adobe.marketing.mobile.InvalidInitException;
-import com.adobe.marketing.mobile.Lifecycle;
 import com.adobe.marketing.mobile.LoggingMode;
-import com.adobe.marketing.mobile.MobileCore;
+import com.adobe.marketing.mobile.Lifecycle;
 import com.adobe.marketing.mobile.Signal;
-import com.adobe.marketing.mobile.UserProfile;
+import com.adobe.marketing.mobile.MobileCore;
+import com.adobe.marketing.mobile.Edge;
+import com.adobe.marketing.mobile.edge.consent.Consent;
+//import com.adobe.marketing.mobile.Messaging;
+//import com.adobe.marketing.mobile.UserProfile;
+//import com.adobe.marketing.mobile.Assurance;
 ...
 import android.app.Application;
 ...
@@ -111,14 +128,16 @@ public class MainApplication extends Application implements ReactApplication {
     ...
     MobileCore.setApplication(this);
     MobileCore.setLogLevel(LoggingMode.DEBUG);
-    MobileCore.setWrapperType(WrapperType.REACT_NATIVE);
-
     try {
-      UserProfile.registerExtension();
-      Identity.registerExtension();
-      Lifecycle.registerExtension();
-      Signal.registerExtension();
-      // register other extensions here
+          Lifecycle.registerExtension();
+          Signal.registerExtension();
+          com.adobe.marketing.mobile.edge.identity.Identity.registerExtension();
+          Edge.registerExtension();
+          Consent.registerExtension();
+          //Messaging.registerExtension();
+          //Assurance.registerExtension();
+          //UserProfile.registerExtension();
+          //com.adobe.marketing.mobile.Identity.registerExtension();
       MobileCore.configureWithAppID("yourAppID");
       MobileCore.start(new AdobeCallback() {
         @Override
@@ -138,6 +157,9 @@ public class MainApplication extends Application implements ReactApplication {
 
 See [development.md](./docs/development.md) for development docs.
 
+## Frequently Asked Questions (FAQ)
+
+
 ## Contributing
 See [CONTRIBUTING](CONTRIBUTING.md)
 

apps/AEPSampleApp/App.js

@@ -2,42 +2,47 @@ import * as React from 'react';
 import { Button, View, Text } from 'react-native';
 import { createDrawerNavigator } from '@react-navigation/drawer';
 import { NavigationContainer } from '@react-navigation/native';
-import Profile from './extensions/Profile';
-import Core from './extensions/Core';
-import Identity from './extensions/Identity';
-import Messaging from './extensions/Messaging';
-import EdgeIdentity from './extensions/EdgeIdentity';
-import Edge from './extensions/Edge';
-import Assurance from './extensions/Assurance';
+import ProfileView from './extensions/ProfileView';
+import MessagingView from './extensions/MessagingView';
+import CoreView from './extensions/CoreView';
+import IdentityView from './extensions/IdentityView';
+import EdgeIdentity from './extensions/EdgeIdentityView';
+import ConsentView from './extensions/ConsentView';
+import EdgeView from './extensions/EdgeView';
+import AssuranceView from './extensions/AssuranceView';
 
 function HomeScreen({ navigation }) {
   return (
     <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
       <Button
-        onPress={() => navigation.navigate('Core')}
+        onPress={() => navigation.navigate('CoreView')}
         title="Core/Lifecycle/Signal"
       />
       <Button
-        onPress={() => navigation.navigate('Profile')}
+        onPress={() => navigation.navigate('ProfileView')}
         title="UserProfile"
       />
       <Button
-        onPress={() => navigation.navigate('Identity')}
+        onPress={() => navigation.navigate('IdentityView')}
         title="Identity"
       />
       <Button
-        onPress={() => navigation.navigate('Messaging')}
-        title="Messaging"/>
+        onPress={() => navigation.navigate('MessagingView')}
+        title="Messaging" />
       <Button
-        onPress={() => navigation.navigate('Edge')}
+        onPress={() => navigation.navigate('EdgeView')}
         title="Edge"
       />
       <Button
-        onPress={() => navigation.navigate('EdgeIdentity')}
+        onPress={() => navigation.navigate('EdgeIdentityView')}
         title="EdgeIdentity"
       />
       <Button
-        onPress={() => navigation.navigate('Assurance')}
+        onPress={() => navigation.navigate('ConsentView')}
+        title="Consent"
+      />
+      <Button
+        onPress={() => navigation.navigate('AssuranceView')}
         title="Assurance"
       />
     </View>
@@ -51,14 +56,15 @@ export default function App() {
     <NavigationContainer>
       <Drawer.Navigator initialRouteName="Home">
         <Drawer.Screen name="Home" component={HomeScreen} />
-        <Drawer.Screen name="Core" component={Core} />
-        <Drawer.Screen name="Profile" component={Profile} />
-        <Drawer.Screen name="Identity" component={Identity} />
-        <Drawer.Screen name="Messaging" component={Messaging}/>
-        <Drawer.Screen name="EdgeIdentity" component={EdgeIdentity} />
-        <Drawer.Screen name="Edge" component={Edge} />
-        <Drawer.Screen name="Assurance" component={Assurance} />
-      </Drawer.Navigator>
-    </NavigationContainer>
+        <Drawer.Screen name="CoreView" component={CoreView} />
+        <Drawer.Screen name="ProfileView" component={ProfileView} />
+        <Drawer.Screen name="IdentityView" component={IdentityView} />
+        <Drawer.Screen name="MessagingView" component={MessagingView} />
+        <Drawer.Screen name="EdgeView" component={EdgeView} />
+        <Drawer.Screen name="EdgeIdentityView" component={EdgeIdentityView} />
+        <Drawer.Screen name="ConsentView" component={ConsentView} />
+        <Drawer.Screen name="AssuranceView" component={AssuranceView} />
+      </Drawer.Navigator >
+    </NavigationContainer >
   );
 }

apps/AEPSampleApp/android/app/src/main/java/com/aepsampleapp/MainApplication.java

@@ -17,13 +17,13 @@
 
 import com.adobe.marketing.mobile.AdobeCallback;
 import com.adobe.marketing.mobile.Assurance;
-import com.adobe.marketing.mobile.Identity;
 import com.adobe.marketing.mobile.InvalidInitException;
 import com.adobe.marketing.mobile.Lifecycle;
 import com.adobe.marketing.mobile.LoggingMode;
 import com.adobe.marketing.mobile.Messaging;
 import com.adobe.marketing.mobile.MobileCore;
 import com.adobe.marketing.mobile.Edge;
+import com.adobe.marketing.mobile.edge.consent.Consent;
 import com.adobe.marketing.mobile.Signal;
 import com.adobe.marketing.mobile.UserProfile;
 import com.facebook.react.PackageList;
@@ -77,20 +77,22 @@ public void onCreate() {
           com.adobe.marketing.mobile.Identity.registerExtension();
           com.adobe.marketing.mobile.edge.identity.Identity.registerExtension();
           Lifecycle.registerExtension();
-          Signal.registerExtension();          
+          Signal.registerExtension();
           Edge.registerExtension();
+          Consent.registerExtension();
           Messaging.registerExtension();
           Assurance.registerExtension();
-          MobileCore.configureWithAppID("your-app-ID");
-          MobileCore.start(new AdobeCallback() {
-              @Override
-              public void call(Object o) {
-                  MobileCore.lifecycleStart(null);
-              }
-          });
       } catch (InvalidInitException e) {
           e.printStackTrace();
       }
+
+      MobileCore.configureWithAppID("your-app-ID");
+      MobileCore.start(new AdobeCallback() {
+          @Override
+          public void call(Object o) {
+              MobileCore.lifecycleStart(null);
+          }
+      });
   }
 
   /**

apps/AEPSampleApp/android/build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath("com.android.tools.build:gradle:4.1.0")
@@ -32,8 +32,8 @@ allprojects {
         }
 
         google()
-        jcenter()
         maven { url 'https://www.jitpack.io' }
         mavenCentral()
+        jcenter()
     }
 }

apps/AEPSampleApp/babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:metro-react-native-babel-preset']
 };

apps/AEPSampleApp/extensions/Assurance.js → apps/AEPSampleApp/extensions/AssuranceView.js

@@ -15,13 +15,13 @@ governing permissions and limitations under the License.
 
 import React, {useState,Component} from 'react';
 import {Button, StyleSheet, Text, View, TextInput, ScrollView} from 'react-native';
-import {AEPAssurance} from '@adobe/react-native-aepassurance';
+import {Assurance} from '@adobe/react-native-aepassurance';
 
-export default Assurance = ({ navigation }) => {
+export default AssuranceView = ({ navigation }) => {
  const [version, setVersion] = useState('');
  const [sessionURL, setsessionURL] = useState('your-assurance-url');
 
- AEPAssurance.extensionVersion().then(version => {
+ Assurance.extensionVersion().then(version => {
    setVersion(version)
  });
 
@@ -41,7 +41,7 @@ export default Assurance = ({ navigation }) => {
   )
 
   function startSessionClicked() {
-    AEPAssurance.startSession(sessionURL)
+    Assurance.startSession(sessionURL)
   }
 
 }

apps/AEPSampleApp/extensions/ConsentView.js

@@ -0,0 +1,66 @@
+/*
+Copyright 2021 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+
+@flow
+@format
+*/
+
+import React, {useState, Component} from 'react';
+import {Button, StyleSheet, Text, View, ScrollView} from 'react-native';
+import {Consent} from '@adobe/react-native-aepedgeconsent';
+import {MobileCore} from '@adobe/react-native-aepcore';
+import styles from '../styles/styles';
+
+export default ConsentView = ({ navigation }) => {
+  const [version, setVersion] = useState('');
+  const [consents, setConsents] = useState('');
+  Consent.extensionVersion().then(version => setVersion(version));
+
+  function getConsents() {
+    var consents  = {"consents" : {"collect" : {"val": "n"}}};
+    Consent.getConsents().then(currentConsents => {
+      let consentsStr = JSON.stringify(currentConsents);
+      setConsents(consentsStr);
+      console.log("AdobeExperienceSDK: Consent.getConsents returned current consent preferences:  " + consentsStr);
+    }).catch((error) => {
+      console.warn("AdobeExperienceSDK: Consent.getConsents returned error: ", error);
+    });
+  }
+
+  return (
+    <View style={styles.container}>
+        <ScrollView contentContainerStyle={{ marginTop: 75 }}>
+        <Button onPress={() => navigation.goBack()} title="Go to main page" />
+        <Text style={styles.welcome}>Consent v{version}</Text>
+        <Button title="Set Default Consent - Yes" onPress={() => setDefaultConsent(true)}/>
+        <Button title="Set Collect Consent - Yes" onPress={() => updateCollectConsent(true)}/>
+        <Button title="Set Collect Consent - No" onPress={() => updateCollectConsent(false)}/>
+        <Button title="Get Consents" onPress={getConsents}/>
+        <View style={styles.breakLine}/>
+        <Text style={styles.text}>{consents}</Text>
+        </ScrollView>
+      </View>
+  )
+}
+
+function updateCollectConsent(allowed: boolean) {
+  var collectConsentStatus = allowed ? {"val": "y"} : {"val": "n"};
+
+  var consents: {[keys: string]: any} = {"consents" : {"collect" : collectConsentStatus}};
+  Consent.update(consents);
+  console.log("AdobeExperienceSDK: Consent.update called with:  " + JSON.stringify(consents));
+}
+
+function setDefaultConsent(allowed: boolean) {
+  var collectConsentStatus = allowed ? {"val": "y"} : {"val": "n"};
+  var defaultConsents: {[keys: string]: any} = {"consent.default": {"consents" : {"collect" : collectConsentStatus}}};
+  MobileCore.updateConfiguration(defaultConsents);
+}