Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 2 additions & 62 deletions Example/ios/AppAuthExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
00E356F31AD99517003FC87E /* AppAuthExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* AppAuthExampleTests.m */; };
023462D02023CC800011ECB8 /* libAppAuth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 023462D12023CC800011ECB8 /* libAppAuth.a */; };
023462D22023CC800011ECB8 /* libRNAppAuth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832A92C61FC8329C00BC4A59 /* libRNAppAuth.a */; };
11485D49838E00288F6BB9FE /* libPods-AppAuthExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 023462D42023D0050011ECB8 /* libPods-AppAuthExample.a */; };
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
Expand Down Expand Up @@ -294,13 +294,6 @@
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
remoteInfo = "fishhook-tvOS";
};
832A92C51FC8329C00BC4A59 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 600D1784631B41CEAF6511D7 /* RNAppAuth.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RNAppAuth;
};
ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
Expand Down Expand Up @@ -337,7 +330,6 @@
2D02E4901E0B4A5D006451C7 /* AppAuthExample-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AppAuthExample-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
4AE57E2273E969D08142891C /* libPods-AppAuthExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AppAuthExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
600D1784631B41CEAF6511D7 /* RNAppAuth.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNAppAuth.xcodeproj; path = "../node_modules/react-native-app-auth/ios/RNAppAuth.xcodeproj"; sourceTree = "<group>"; };
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
A42EF03E46F0E60A8482AEA9 /* Pods-AppAuthExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AppAuthExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-AppAuthExample/Pods-AppAuthExample.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -372,7 +364,7 @@
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
023462D02023CC800011ECB8 /* libAppAuth.a in Frameworks */,
023462D22023CC800011ECB8 /* libRNAppAuth.a in Frameworks */,
11485D49838E00288F6BB9FE /* libPods-AppAuthExample.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -557,7 +549,6 @@
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
600D1784631B41CEAF6511D7 /* RNAppAuth.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
Expand All @@ -579,14 +570,6 @@
name = "Recovered References";
sourceTree = "<group>";
};
832A92C21FC8329C00BC4A59 /* Products */ = {
isa = PBXGroup;
children = (
832A92C61FC8329C00BC4A59 /* libRNAppAuth.a */,
);
name = Products;
sourceTree = "<group>";
};
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -663,8 +646,6 @@
13B07F8C1A680F5B00A75B9A /* Frameworks */,
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
DB670367BD7444086E34EEA3 /* [CP] Embed Pods Frameworks */,
EC57E8DA5E0483531AA0F68A /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -798,10 +779,6 @@
ProductGroup = 146834001AC3E56700842450 /* Products */;
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
},
{
ProductGroup = 832A92C21FC8329C00BC4A59 /* Products */;
ProjectRef = 600D1784631B41CEAF6511D7 /* RNAppAuth.xcodeproj */;
},
);
projectRoot = "";
targets = (
Expand Down Expand Up @@ -1052,13 +1029,6 @@
remoteRef = 832A92C01FC8329B00BC4A59 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
832A92C61FC8329C00BC4A59 /* libRNAppAuth.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNAppAuth.a;
remoteRef = 832A92C51FC8329C00BC4A59 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -1149,36 +1119,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
DB670367BD7444086E34EEA3 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppAuthExample/Pods-AppAuthExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
EC57E8DA5E0483531AA0F68A /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppAuthExample/Pods-AppAuthExample-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
4 changes: 0 additions & 4 deletions Example/ios/AppAuthExample/AppDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

#import <UIKit/UIKit.h>

@protocol OIDAuthorizationFlowSession;

@interface AppDelegate : UIResponder <UIApplicationDelegate>
@property(nonatomic, strong, nullable) id<OIDAuthorizationFlowSession> currentAuthorizationFlow;
@property (nonatomic, strong, nullable) UIWindow *window;

@end

23 changes: 14 additions & 9 deletions Example/ios/AppAuthExample/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,22 @@
*/

#import "AppDelegate.h"

#import <React/RCTBundleURLProvider.h>
#import <React/RCTRootView.h>
#import <AppAuth/AppAuth.h>
#import <RNAppAuth/RNAppAuthAuthorizationFlowManager.h>

@interface AppDelegate()<RNAppAuthAuthorizationFlowManager> {
id <OIDAuthorizationFlowSession> _currentSession;
}
@end

@implementation AppDelegate

-(void)setCurrentAuthorizationFlowSession:(id<OIDAuthorizationFlowSession>)session {
_currentSession = session;
}

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
NSURL *jsCodeLocation;
Expand All @@ -35,14 +44,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
return YES;
}

- (BOOL)application:(UIApplication *)app
openURL:(NSURL *)url
options:(NSDictionary<NSString *, id> *)options {
if ([_currentAuthorizationFlow resumeAuthorizationFlowWithURL:url]) {
_currentAuthorizationFlow = nil;
return YES;
}
return NO;
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *, id> *)options {
BOOL shouldOpenUrl = [_currentSession resumeAuthorizationFlowWithURL:url];
_currentSession = nil;
return shouldOpenUrl;
}

@end
6 changes: 5 additions & 1 deletion Example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
platform :ios, '11.0'

target 'AppAuthExample' do
pod 'AppAuth', '>= 0.91'
pod 'React', :path => '../node_modules/react-native'
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
pod 'GLog', :podspec => '../node_modules/react-native/third-party-podspecs/GLog.podspec'
pod 'RNAppAuth', :path => '../../ios/'
end
45 changes: 40 additions & 5 deletions Example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,47 @@
PODS:
- AppAuth (0.91.0)
- AppAuth (0.92.0)
- DoubleConversion (1.1.5)
- GLog (0.3.4)
- React (0.50.3):
- React/Core (= 0.50.3)
- React/Core (0.50.3):
- yoga (= 0.50.3.React)
- RNAppAuth (1.0.0):
- AppAuth
- React
- yoga (0.50.3.React)

DEPENDENCIES:
- AppAuth (>= 0.91)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- GLog (from `../node_modules/react-native/third-party-podspecs/GLog.podspec`)
- React (from `../node_modules/react-native`)
- RNAppAuth (from `../../ios/`)
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- AppAuth

EXTERNAL SOURCES:
DoubleConversion:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
GLog:
:podspec: "../node_modules/react-native/third-party-podspecs/GLog.podspec"
React:
:path: "../node_modules/react-native"
RNAppAuth:
:path: "../../ios/"
yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AppAuth: 3e0dc9c00ef333dc62064e4830aa89b597ae8d2f
AppAuth: 3f4f1d6d85ad631d0bbf15ffcdc10c447face97a
DoubleConversion: ebb6747c5b66026ad4f97b789c3ceac6f18e57a6
GLog: 3e4e4ae9746ce6bf6e9420c7fc1e08ad59c8ba1a
React: 541ba768b9855e10cdc76f55427a5cd0653ca806
RNAppAuth: f1c597df5c085dc72bff3e09d5d1ebff1086fedb
yoga: c89ebefb37b7fe8a1e3fdf4e303e1eee8e1a7171

PODFILE CHECKSUM: 75f03f73647b3259b1c2e1783cebbdba24019136
PODFILE CHECKSUM: 043bf6735e162e9db323ca3a8b5196501e89fc64

COCOAPODS: 1.3.1
COCOAPODS: 1.5.3
1 change: 1 addition & 0 deletions Example/ios/Pods/AppAuth/Source/AppAuth.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 19 additions & 21 deletions Example/ios/Pods/AppAuth/Source/OIDAuthorizationService.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 40 additions & 5 deletions Example/ios/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading