update demo app auth0 acct (#1007)

FormidableLabs · Aug 1, 2024 · 52432e8 · 52432e8
1 parent 438d512
commit 52432e8
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 26 deletions.
diff --git a/.changeset/polite-pants-swim.md b/.changeset/polite-pants-swim.md
@@ -0,0 +1,5 @@
+---
+'rnaa-demo': patch
+---
+
+demo app with new auth0
diff --git a/docs/docs/introduction.md b/docs/docs/introduction.md
@@ -218,7 +218,7 @@ Steps:
 // etc...
 ```
 
-2. `AppDelegate.swift` should implement the `RNAppAuthorizationFlowManager` protocol and have a handler for url deep linking. The result should look something like this:
+2. `AppDelegate.swift` should implement the `RNAppAuthAuthorizationFlowManager` protocol and have a handler for url deep linking. The result should look something like this:
 
 ```swift
 @UIApplicationMain

diff --git a/examples/demo/App.js b/examples/demo/App.js
@@ -31,12 +31,11 @@ const configs = {
     // }
   },
   auth0: {
-    // From https://openidconnect.net/
-    issuer: 'https://samples.auth0.com',
-    clientId: 'kbyuFDidLLm280LIwVFiazOqjO3ty8KH',
-    redirectUrl: 'https://openidconnect.net/callback',
+    issuer: 'https://rnaa-demo.eu.auth0.com',
+    clientId: 'VtXdAoGFcYzZ3IJaNy4UIS5RNHhdbKbU',
+    redirectUrl: 'rnaa-demo://oauthredirect',
     additionalParameters: {},
-    scopes: ['openid', 'profile', 'email', 'phone', 'address'],
+    scopes: ['openid', 'profile', 'email', 'offline_access'],
 
     // serviceConfiguration: {
     //   authorizationEndpoint: 'https://samples.auth0.com/authorize',

diff --git a/examples/demo/android/app/build.gradle b/examples/demo/android/app/build.gradle
@@ -80,9 +80,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        manifestPlaceholders = [
-          appAuthRedirectScheme: 'io.identityserver.demo'
-        ]
     }
     signingConfigs {
         debug {

diff --git a/examples/demo/android/app/src/main/AndroidManifest.xml b/examples/demo/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -21,5 +21,24 @@
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
       </activity>
+      <!-- In order to support multiple possible android redirects: https://github.com/FormidableLabs/react-native-app-auth/issues/495#issuecomment-650797187 -->
+      <!-- https://github.com/openid/AppAuth-Android/blob/27b62d5da94023941db545b70036a742a52b7070/README.md#capturing-the-authorization-redirect -->
+      <activity
+          android:exported="true"
+          android:name="net.openid.appauth.RedirectUriReceiverActivity"
+          tools:node="replace">
+          <intent-filter>
+              <action android:name="android.intent.action.VIEW"/>
+              <category android:name="android.intent.category.DEFAULT"/>
+              <category android:name="android.intent.category.BROWSABLE"/>
+              <data android:scheme="io.identityserver.demo"/>
+          </intent-filter>
+          <intent-filter>
+              <action android:name="android.intent.action.VIEW"/>
+              <category android:name="android.intent.category.DEFAULT"/>
+              <category android:name="android.intent.category.BROWSABLE"/>
+              <data android:scheme="rnaa-demo"/>
+          </intent-filter>
+      </activity>
     </application>
 </manifest>
diff --git a/examples/demo/components/Page.js b/examples/demo/components/Page.js
@@ -1,11 +1,10 @@
 import React from 'react';
-import { ImageBackground, StyleSheet, SafeAreaView } from 'react-native';
+import {ImageBackground, StyleSheet, SafeAreaView} from 'react-native';
 
-const Page = ({ children }) => (
+const Page = ({children}) => (
   <ImageBackground
     source={require('../assets/background.jpg')}
-    style={[styles.background, { width: '100%', height: '100%' }]}
-  >
+    style={[styles.background, {}]}>
     <SafeAreaView style={styles.safe}>{children}</SafeAreaView>
   </ImageBackground>
 );
@@ -17,10 +16,12 @@ const styles = StyleSheet.create({
     paddingTop: 40,
     paddingHorizontal: 10,
     paddingBottom: 10,
+    width: '100%',
+    height: '100%',
   },
   safe: {
     flex: 1,
-  }
+  },
 });
 
 export default Page;
diff --git a/examples/demo/ios/Example/Info.plist b/examples/demo/ios/Example/Info.plist
@@ -20,6 +20,27 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.your.app.identifier</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>io.identityserver.demo</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>com.your.app.identifier</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>rnaa-demo</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -51,16 +72,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>CFBundleURLTypes</key>
-	<array>
-	  <dict>
-	    <key>CFBundleURLName</key>
-	    <string>com.your.app.identifier</string>
-	    <key>CFBundleURLSchemes</key>
-	    <array>
-	      <string>io.identityserver.demo</string>
-	    </array>
-	  </dict>
-	</array>
 </dict>
 </plist>