Skip to content

Commit a6f8c0e

Browse files
kadikramankadikraman
authored
Merge pull request #131 from hakonk/fix/podspec-missing-homepage
[fix] podspec and making use of UIApplicationDelegate
2 parents 7a3fdc6 + d9b64bf commit a6f8c0e

22 files changed

+2918
-535
lines changed

‎Example/ios/AppAuthExample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
1515
00E356F31AD99517003FC87E /* AppAuthExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* AppAuthExampleTests.m */; };
1616
023462D02023CC800011ECB8 /* libAppAuth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 023462D12023CC800011ECB8 /* libAppAuth.a */; };
17-
023462D22023CC800011ECB8 /* libRNAppAuth.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832A92C61FC8329C00BC4A59 /* libRNAppAuth.a */; };
17+
11485D49838E00288F6BB9FE /* libPods-AppAuthExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 023462D42023D0050011ECB8 /* libPods-AppAuthExample.a */; };
1818
133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
1919
139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
2020
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
@@ -294,13 +294,6 @@
294294
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
295295
remoteInfo = "fishhook-tvOS";
296296
};
297-
832A92C51FC8329C00BC4A59 /* PBXContainerItemProxy */ = {
298-
isa = PBXContainerItemProxy;
299-
containerPortal = 600D1784631B41CEAF6511D7 /* RNAppAuth.xcodeproj */;
300-
proxyType = 2;
301-
remoteGlobalIDString = 134814201AA4EA6300B7C361;
302-
remoteInfo = RNAppAuth;
303-
};
304297
ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
305298
isa = PBXContainerItemProxy;
306299
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
@@ -337,7 +330,6 @@
337330
2D02E4901E0B4A5D006451C7 /* AppAuthExample-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AppAuthExample-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
338331
4AE57E2273E969D08142891C /* libPods-AppAuthExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AppAuthExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
339332
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
340-
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>"; };
341333
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
342334
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
343335
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>"; };
@@ -372,7 +364,7 @@
372364
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
373365
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
374366
023462D02023CC800011ECB8 /* libAppAuth.a in Frameworks */,
375-
023462D22023CC800011ECB8 /* libRNAppAuth.a in Frameworks */,
367+
11485D49838E00288F6BB9FE /* libPods-AppAuthExample.a in Frameworks */,
376368
);
377369
runOnlyForDeploymentPostprocessing = 0;
378370
};
@@ -557,7 +549,6 @@
557549
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
558550
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
559551
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
560-
600D1784631B41CEAF6511D7 /* RNAppAuth.xcodeproj */,
561552
);
562553
name = Libraries;
563554
sourceTree = "<group>";
@@ -579,14 +570,6 @@
579570
name = "Recovered References";
580571
sourceTree = "<group>";
581572
};
582-
832A92C21FC8329C00BC4A59 /* Products */ = {
583-
isa = PBXGroup;
584-
children = (
585-
832A92C61FC8329C00BC4A59 /* libRNAppAuth.a */,
586-
);
587-
name = Products;
588-
sourceTree = "<group>";
589-
};
590573
83CBB9F61A601CBA00E9B192 = {
591574
isa = PBXGroup;
592575
children = (
@@ -663,8 +646,6 @@
663646
13B07F8C1A680F5B00A75B9A /* Frameworks */,
664647
13B07F8E1A680F5B00A75B9A /* Resources */,
665648
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
666-
DB670367BD7444086E34EEA3 /* [CP] Embed Pods Frameworks */,
667-
EC57E8DA5E0483531AA0F68A /* [CP] Copy Pods Resources */,
668649
);
669650
buildRules = (
670651
);
@@ -798,10 +779,6 @@
798779
ProductGroup = 146834001AC3E56700842450 /* Products */;
799780
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
800781
},
801-
{
802-
ProductGroup = 832A92C21FC8329C00BC4A59 /* Products */;
803-
ProjectRef = 600D1784631B41CEAF6511D7 /* RNAppAuth.xcodeproj */;
804-
},
805782
);
806783
projectRoot = "";
807784
targets = (
@@ -1052,13 +1029,6 @@
10521029
remoteRef = 832A92C01FC8329B00BC4A59 /* PBXContainerItemProxy */;
10531030
sourceTree = BUILT_PRODUCTS_DIR;
10541031
};
1055-
832A92C61FC8329C00BC4A59 /* libRNAppAuth.a */ = {
1056-
isa = PBXReferenceProxy;
1057-
fileType = archive.ar;
1058-
path = libRNAppAuth.a;
1059-
remoteRef = 832A92C51FC8329C00BC4A59 /* PBXContainerItemProxy */;
1060-
sourceTree = BUILT_PRODUCTS_DIR;
1061-
};
10621032
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {
10631033
isa = PBXReferenceProxy;
10641034
fileType = archive.ar;
@@ -1149,36 +1119,6 @@
11491119
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";
11501120
showEnvVarsInLog = 0;
11511121
};
1152-
DB670367BD7444086E34EEA3 /* [CP] Embed Pods Frameworks */ = {
1153-
isa = PBXShellScriptBuildPhase;
1154-
buildActionMask = 2147483647;
1155-
files = (
1156-
);
1157-
inputPaths = (
1158-
);
1159-
name = "[CP] Embed Pods Frameworks";
1160-
outputPaths = (
1161-
);
1162-
runOnlyForDeploymentPostprocessing = 0;
1163-
shellPath = /bin/sh;
1164-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppAuthExample/Pods-AppAuthExample-frameworks.sh\"\n";
1165-
showEnvVarsInLog = 0;
1166-
};
1167-
EC57E8DA5E0483531AA0F68A /* [CP] Copy Pods Resources */ = {
1168-
isa = PBXShellScriptBuildPhase;
1169-
buildActionMask = 2147483647;
1170-
files = (
1171-
);
1172-
inputPaths = (
1173-
);
1174-
name = "[CP] Copy Pods Resources";
1175-
outputPaths = (
1176-
);
1177-
runOnlyForDeploymentPostprocessing = 0;
1178-
shellPath = /bin/sh;
1179-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppAuthExample/Pods-AppAuthExample-resources.sh\"\n";
1180-
showEnvVarsInLog = 0;
1181-
};
11821122
/* End PBXShellScriptBuildPhase section */
11831123

11841124
/* Begin PBXSourcesBuildPhase section */

‎Example/ios/AppAuthExample/AppDelegate.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99

1010
#import <UIKit/UIKit.h>
1111

12-
@protocol OIDAuthorizationFlowSession;
13-
1412
@interface AppDelegate : UIResponder <UIApplicationDelegate>
15-
@property(nonatomic, strong, nullable) id<OIDAuthorizationFlowSession> currentAuthorizationFlow;
1613
@property (nonatomic, strong, nullable) UIWindow *window;
17-
1814
@end
1915

‎Example/ios/AppAuthExample/AppDelegate.m

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,22 @@
88
*/
99

1010
#import "AppDelegate.h"
11-
1211
#import <React/RCTBundleURLProvider.h>
1312
#import <React/RCTRootView.h>
1413
#import <AppAuth/AppAuth.h>
14+
#import <RNAppAuth/RNAppAuthAuthorizationFlowManager.h>
15+
16+
@interface AppDelegate()<RNAppAuthAuthorizationFlowManager> {
17+
id <OIDAuthorizationFlowSession> _currentSession;
18+
}
19+
@end
1520

1621
@implementation AppDelegate
1722

23+
-(void)setCurrentAuthorizationFlowSession:(id<OIDAuthorizationFlowSession>)session {
24+
_currentSession = session;
25+
}
26+
1827
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
1928
{
2029
NSURL *jsCodeLocation;
@@ -35,14 +44,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
3544
return YES;
3645
}
3746

38-
- (BOOL)application:(UIApplication *)app
39-
openURL:(NSURL *)url
40-
options:(NSDictionary<NSString *, id> *)options {
41-
if ([_currentAuthorizationFlow resumeAuthorizationFlowWithURL:url]) {
42-
_currentAuthorizationFlow = nil;
43-
return YES;
44-
}
45-
return NO;
47+
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *, id> *)options {
48+
BOOL shouldOpenUrl = [_currentSession resumeAuthorizationFlowWithURL:url];
49+
_currentSession = nil;
50+
return shouldOpenUrl;
4651
}
4752

4853
@end

‎Example/ios/Podfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22
platform :ios, '11.0'
33

44
target 'AppAuthExample' do
5-
pod 'AppAuth', '>= 0.91'
5+
pod 'React', :path => '../node_modules/react-native'
6+
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
7+
pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
8+
pod 'GLog', :podspec => '../node_modules/react-native/third-party-podspecs/GLog.podspec'
9+
pod 'RNAppAuth', :path => '../../ios/'
610
end

‎Example/ios/Podfile.lock

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,47 @@
11
PODS:
2-
- AppAuth (0.91.0)
2+
- AppAuth (0.92.0)
3+
- DoubleConversion (1.1.5)
4+
- GLog (0.3.4)
5+
- React (0.50.3):
6+
- React/Core (= 0.50.3)
7+
- React/Core (0.50.3):
8+
- yoga (= 0.50.3.React)
9+
- RNAppAuth (1.0.0):
10+
- AppAuth
11+
- React
12+
- yoga (0.50.3.React)
313

414
DEPENDENCIES:
5-
- AppAuth (>= 0.91)
15+
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
16+
- GLog (from `../node_modules/react-native/third-party-podspecs/GLog.podspec`)
17+
- React (from `../node_modules/react-native`)
18+
- RNAppAuth (from `../../ios/`)
19+
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)
20+
21+
SPEC REPOS:
22+
https://github.com/cocoapods/specs.git:
23+
- AppAuth
24+
25+
EXTERNAL SOURCES:
26+
DoubleConversion:
27+
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
28+
GLog:
29+
:podspec: "../node_modules/react-native/third-party-podspecs/GLog.podspec"
30+
React:
31+
:path: "../node_modules/react-native"
32+
RNAppAuth:
33+
:path: "../../ios/"
34+
yoga:
35+
:path: "../node_modules/react-native/ReactCommon/yoga"
636

737
SPEC CHECKSUMS:
8-
AppAuth: 3e0dc9c00ef333dc62064e4830aa89b597ae8d2f
38+
AppAuth: 3f4f1d6d85ad631d0bbf15ffcdc10c447face97a
39+
DoubleConversion: ebb6747c5b66026ad4f97b789c3ceac6f18e57a6
40+
GLog: 3e4e4ae9746ce6bf6e9420c7fc1e08ad59c8ba1a
41+
React: 541ba768b9855e10cdc76f55427a5cd0653ca806
42+
RNAppAuth: f1c597df5c085dc72bff3e09d5d1ebff1086fedb
43+
yoga: c89ebefb37b7fe8a1e3fdf4e303e1eee8e1a7171
944

10-
PODFILE CHECKSUM: 75f03f73647b3259b1c2e1783cebbdba24019136
45+
PODFILE CHECKSUM: 043bf6735e162e9db323ca3a8b5196501e89fc64
1146

12-
COCOAPODS: 1.3.1
47+
COCOAPODS: 1.5.3

‎Example/ios/Pods/AppAuth/Source/AppAuth.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/ios/Pods/AppAuth/Source/OIDAuthorizationService.m

Lines changed: 19 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/ios/Pods/Manifest.lock

Lines changed: 40 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)