remove2

Author: mtrezza

.github/workflows/ci.yml

@@ -20,8 +20,6 @@ jobs:
         script:
           - test:ios
           - test:macos
-          - test:facebook_utils:ios
-          - test:twitter_utils:ios
           - test:parseui:all
           - test:parse_live_query:all
           - build:starters

.gitignore

@@ -37,7 +37,6 @@ docs/
 
 ## AppCode
 .idea/
-ParseFacebookUtils/Vendor
 ParseUI/Vendor
 
 # VSC

CONTRIBUTING.md

@@ -12,10 +12,8 @@
 For analyzing bugs, creating bug fixes and features we recommend to clone this repository locally and add it as a local package to your Xcode project. This way you can edit and inspect the Parse SDK while running your app. You can find step-by-step instructions for how do that in the [Xcode docs](https://developer.apple.com/documentation/xcode/editing-a-package-dependency-as-a-local-package).
 
 1. Fork the repository and create a new branch.
-2. Add unit tests for any new code you add.
+2. Add unit tests for any new code you add:
    - Core Module - [/Parse/Tests/Unit/](/Parse/Tests/Unit/)
-   - Facebook Utils - [/ParseFacebookUtils/Tests/Unit/](/ParseFacebookUtils/Tests/Unit/)
-   - Twitter Utils - [/ParseTwitterUtils/Tests/Unit/](/ParseTwitterUtils/Tests/Unit/)
 3. If you've changed APIs, update the documentation and the [iOS Guide](https://github.com/parse-community/docs/tree/gh-pages/_includes/ios).
 4. Ensure the test suite passes.
    You can run the tests in the command line with rake.

Package.resolved

@@ -32,10 +32,10 @@ NS_ASSUME_NONNULL_BEGIN
  Data associated with the anonymous user is retained.
  - logIn switches users without converting the anonymous user.
  Data associated with the anonymous user will be lost.
- - Service logIn (e.g. Facebook, Twitter) will attempt to convert
+ - Authentication service logIn will attempt to convert
  the anonymous user into a standard user by linking it to the service.
  If a user already exists that is linked to the service, it will instead switch to the existing user.
- - Service linking (e.g. Facebook, Twitter) will convert the anonymous user
+ - Authentication service linking will convert the anonymous user
  into a standard user by linking it to the service.
  */
 @interface PFAnonymousUtils : NSObject

Parse/Parse/Source/PFAnonymousUtils.h

@@ -320,10 +320,6 @@ typedef NS_ENUM(NSInteger, PFErrorCode) {
      Users can only be created through sign up.
      */
     kPFErrorUserCanOnlyBeCreatedThroughSignUp = 207,
-    /**
-     An existing Facebook account already linked to another user.
-     */
-    kPFErrorFacebookAccountAlreadyLinked = 208,
     /**
      An existing account already linked to another user.
      */
@@ -333,18 +329,10 @@ typedef NS_ENUM(NSInteger, PFErrorCode) {
      */
     kPFErrorInvalidSessionToken = 209,
     kPFErrorUserIdMismatch = 209,
-    /**
-     Facebook id missing from request.
-     */
-    kPFErrorFacebookIdMissing = 250,
     /**
      Linked id missing from request.
      */
     kPFErrorLinkedIdMissing = 250,
-    /**
-     Invalid Facebook session.
-     */
-    kPFErrorFacebookInvalidSession = 251,
     /**
      Invalid linked session.
      */

Parse/Parse/Source/PFConstants.h

@@ -31,9 +31,6 @@ typedef void(^PFUserLogoutResultBlock)(NSError *_Nullable error);
  The `PFUser` class is a local representation of a user persisted to the Parse Data.
  This class is a subclass of a `PFObject`, and retains the same functionality of a `PFObject`,
  but also extends it with various user specific methods, like authentication, signing up, and validation uniqueness.
-
- Many APIs responsible for linking a `PFUser` with Facebook or Twitter have been deprecated in favor of dedicated
- utilities for each social network. See `PFFacebookUtils`, `PFTwitterUtils` and `PFAnonymousUtils` for more information.
  */
 
 @interface PFUser : PFObject <PFSubclassing>
@@ -65,8 +62,6 @@ typedef void(^PFUserLogoutResultBlock)(NSError *_Nullable error);
 
 /**
  Whether the `PFUser` was just created from a request.
-
- This is only set after a Facebook or Twitter login.
  */
 @property (nonatomic, assign, readonly) BOOL isNew;
 

Parse/Parse/Source/PFUser.h

@@ -223,7 +223,7 @@ - (nullable PFRESTCommand *)_currentSignUpCommandForChanges:(PFOperationSet *)ch
 #pragma mark - Service Login
 ///--------------------------------------
 
-// Constructs the command for user_signup_or_login. This is used for Facebook, Twitter, and other linking services.
+// Constructs the command for user_signup_or_login. This is used for authentication services.
 - (PFRESTCommand *)_currentServiceLoginCommandForChanges:(PFOperationSet *)changes error:(NSError **)error {
     @synchronized([self lock]) {
         NSDictionary *parameters = [self _convertToDictionaryForSaving:changes
@@ -342,15 +342,13 @@ - (PFObject *)mergeFromObject:(PFUser *)other {
 /*
  Merges custom fields from JSON associated with a PFUser:
  {
- "session_token": string,
- "is_new": boolean,
- "auth_data": {
- "facebook": {
- "id": string,
- "access_token": string,
- "expiration_date": string (represents date)
- }
- }
+    "session_token": string,
+    "is_new": boolean,
+    "auth_data": {
+        "<auth_service_name>": {
+            ...
+        }
+    }
  }
  */
 - (void)_mergeFromServerWithResult:(NSDictionary *)result decoder:(PFDecoder *)decoder completeData:(BOOL)completeData {

Parse/Parse/Source/PFUser.m

@@ -33,8 +33,6 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
-	<key>FacebookAppID</key>
-	<string>fake_id</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

Parse/Tests/Resources/ParseUnitTests-OSX-Info.plist

@@ -33,8 +33,6 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
-	<key>FacebookAppID</key>
-	<string>fake_id</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

Parse/Tests/Resources/ParseUnitTests-iOS-Info.plist

@@ -44,13 +44,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         }
         Parse.initialize(with: configuration)
 
-        // ****************************************************************************
-        // If you are using Facebook, uncomment and add your FacebookAppID to your bundle's plist as
-        // described here: https://developers.facebook.com/docs/getting-started/facebook-sdk-for-ios/
-        // Uncomment the line inside ParseStartProject-Bridging-Header and the following line here:
-        // PFFacebookUtils.initializeFacebook()
-        // ****************************************************************************
-
         PFUser.enableAutomaticUser()
 
         let defaultACL = PFACL()
@@ -133,15 +126,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     //         PFAnalytics.trackAppOpenedWithRemoteNotificationPayload(userInfo)
     //     }
     // }
-
-    //--------------------------------------
-    // MARK: Facebook SDK Integration
-    //--------------------------------------
-
-    ///////////////////////////////////////////////////////////
-    // Uncomment this method if you are using Facebook
-    ///////////////////////////////////////////////////////////
-    // func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject?) -> Bool {
-    //     return FBAppCall.handleOpenURL(url, sourceApplication:sourceApplication, session:PFFacebookUtils.session())
-    // }
 }

ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift

@@ -12,9 +12,6 @@
 // If you want to use any of the UI components, uncomment this line
 // #import <ParseUI/ParseUI.h>
 
-// If you are using Facebook, uncomment this line
-// #import <ParseFacebookUtils/PFFacebookUtils.h>
-
 #import "ParseStarterProjectAppDelegate.h"
 #import "ParseStarterProjectViewController.h"
 
@@ -43,12 +40,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         configuration.localDatastoreEnabled = YES;
     }]];
 
-    // ****************************************************************************
-    // If you are using Facebook, uncomment and add your FacebookAppID to your bundle's plist as
-    // described here: https://developers.facebook.com/docs/getting-started/facebook-sdk-for-ios/
-    // [PFFacebookUtils initializeFacebook];
-    // ****************************************************************************
-
     [PFUser enableAutomaticUser];
 
     PFACL *defaultACL = [PFACL ACL];
@@ -133,16 +124,4 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
 //    }
 //}
 
-#pragma mark Facebook SDK Integration
-
-///////////////////////////////////////////////////////////
-// Uncomment this method if you are using Facebook
-///////////////////////////////////////////////////////////
-//- (BOOL)application:(UIApplication *)application
-//            openURL:(NSURL *)url
-//  sourceApplication:(NSString *)sourceApplication
-//         annotation:(id)annotation {
-//    return [PFFacebookUtils handleOpenURL:url];
-//}
-
 @end

ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject/ParseStarterProjectAppDelegate.m

@@ -121,15 +121,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     //         PFAnalytics.trackAppOpenedWithRemoteNotificationPayload(userInfo)
     //     }
     // }
-
-    //--------------------------------------
-    // MARK: Facebook SDK Integration
-    //--------------------------------------
-
-    ///////////////////////////////////////////////////////////
-    // Uncomment this method if you are using Facebook
-    ///////////////////////////////////////////////////////////
-    // func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject?) -> Bool {
-    //     return FBAppCall.handleOpenURL(url, sourceApplication:sourceApplication, session:PFFacebookUtils.session())
-    // }
 }

ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarterProject/AppDelegate.swift

@@ -7,14 +7,12 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		39452DEA2AD8FB9A0066C2AE /* ParseTwitterUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DE92AD8FB9A0066C2AE /* ParseTwitterUtils */; };
 		39452DEC2AD8FC110066C2AE /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DEB2AD8FC110066C2AE /* ParseObjC */; };
 		39452DF82AD9121D0066C2AE /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DF72AD9121D0066C2AE /* ParseObjC */; };
 		39452DFA2AD9121D0066C2AE /* ParseUI in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DF92AD9121D0066C2AE /* ParseUI */; };
 		39452DFD2AD914110066C2AE /* BoltsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 39452DFC2AD914110066C2AE /* BoltsSwift */; };
 		39E22AD72AD0676700D9AE5C /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 39E22AD62AD0676700D9AE5C /* OCMock */; };
 		39E249A52AD1DD2E0014357C /* ParseObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 39E249A42AD1DD2E0014357C /* ParseObjC */; };
-		39E249AB2AD1DE8F0014357C /* ParseFacebookUtilsiOS in Frameworks */ = {isa = PBXBuildFile; productRef = 39E249AA2AD1DE8F0014357C /* ParseFacebookUtilsiOS */; };
 		7C77D109292A509000C4D90E /* PFPurchaseTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77D0C9292A507500C4D90E /* PFPurchaseTableViewCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7C77D10A292A509000C4D90E /* PFTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77D0CB292A507500C4D90E /* PFTextField.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		7C77D10B292A509000C4D90E /* PFQueryTableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C77D0CD292A507500C4D90E /* PFQueryTableViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -222,18 +220,12 @@
 		4A9A948F200D02CE005D8F4B /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		4A9A9490200D02CE005D8F4B /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		4A9A9491200D02CE005D8F4B /* ParseUI-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseUI-iOS-Dynamic.xcconfig"; sourceTree = "<group>"; };
-		7C77D0B3292A507500C4D90E /* twitter_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "twitter_icon@3x.png"; sourceTree = "<group>"; };
 		7C77D0B4292A507500C4D90E /* apple_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "apple_icon@3x.png"; sourceTree = "<group>"; };
-		7C77D0B5292A507500C4D90E /* facebook_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "facebook_icon@2x.png"; sourceTree = "<group>"; };
 		7C77D0B6292A507500C4D90E /* parse_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = parse_logo.png; sourceTree = "<group>"; };
-		7C77D0B7292A507500C4D90E /* facebook_icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "facebook_icon@3x.png"; sourceTree = "<group>"; };
 		7C77D0B8292A507500C4D90E /* apple_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "apple_icon@2x.png"; sourceTree = "<group>"; };
-		7C77D0B9292A507500C4D90E /* twitter_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "twitter_icon@2x.png"; sourceTree = "<group>"; };
 		7C77D0BA292A507500C4D90E /* parse_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "parse_logo@2x.png"; sourceTree = "<group>"; };
 		7C77D0BB292A507500C4D90E /* parse_logo@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "parse_logo@3x.png"; sourceTree = "<group>"; };
 		7C77D0BC292A507500C4D90E /* apple_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = apple_icon.png; sourceTree = "<group>"; };
-		7C77D0BD292A507500C4D90E /* facebook_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = facebook_icon.png; sourceTree = "<group>"; };
-		7C77D0BE292A507500C4D90E /* twitter_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = twitter_icon.png; sourceTree = "<group>"; };
 		7C77D0BF292A507500C4D90E /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
 		7C77D0C2292A507500C4D90E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/ParseUI.strings; sourceTree = "<group>"; };
 		7C77D0C3292A507500C4D90E /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/ParseUI.strings; sourceTree = "<group>"; };
@@ -404,8 +396,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				39452DEA2AD8FB9A0066C2AE /* ParseTwitterUtils in Frameworks */,
-				39E249AB2AD1DE8F0014357C /* ParseFacebookUtilsiOS in Frameworks */,
 				7C77D222292A580800C4D90E /* Social.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -549,18 +539,12 @@
 		7C77D0B2292A507500C4D90E /* Images */ = {
 			isa = PBXGroup;
 			children = (
-				7C77D0B3292A507500C4D90E /* twitter_icon@3x.png */,
 				7C77D0B4292A507500C4D90E /* apple_icon@3x.png */,
-				7C77D0B5292A507500C4D90E /* facebook_icon@2x.png */,
 				7C77D0B6292A507500C4D90E /* parse_logo.png */,
-				7C77D0B7292A507500C4D90E /* facebook_icon@3x.png */,
 				7C77D0B8292A507500C4D90E /* apple_icon@2x.png */,
-				7C77D0B9292A507500C4D90E /* twitter_icon@2x.png */,
 				7C77D0BA292A507500C4D90E /* parse_logo@2x.png */,
 				7C77D0BB292A507500C4D90E /* parse_logo@3x.png */,
 				7C77D0BC292A507500C4D90E /* apple_icon.png */,
-				7C77D0BD292A507500C4D90E /* facebook_icon.png */,
-				7C77D0BE292A507500C4D90E /* twitter_icon.png */,
 			);
 			path = Images;
 			sourceTree = "<group>";
@@ -1054,10 +1038,6 @@
 				39452DF62AD911740066C2AE /* PBXTargetDependency */,
 			);
 			name = ParseUIDemo;
-			packageProductDependencies = (
-				39E249AA2AD1DE8F0014357C /* ParseFacebookUtilsiOS */,
-				39452DE92AD8FB9A0066C2AE /* ParseTwitterUtils */,
-			);
 			productName = ParseUIDemo;
 			productReference = 7C77D21F292A56F600C4D90E /* ParseUIDemo.app */;
 			productType = "com.apple.product-type.application";
@@ -2081,10 +2061,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		39452DE92AD8FB9A0066C2AE /* ParseTwitterUtils */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = ParseTwitterUtils;
-		};
 		39452DEB2AD8FC110066C2AE /* ParseObjC */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = ParseObjC;
@@ -2111,10 +2087,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = ParseObjC;
 		};
-		39E249AA2AD1DE8F0014357C /* ParseFacebookUtilsiOS */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = ParseFacebookUtilsiOS;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;

ParseUI/ParseUI.xcodeproj/project.pbxproj

@@ -44,8 +44,6 @@
 
 + (UIColor *)loginButtonBackgroundColor;
 + (UIColor *)signupButtonBackgroundColor;
-+ (UIColor *)facebookButtonBackgroundColor;
-+ (UIColor *)twitterButtonBackgroundColor;
 + (UIColor *)appleButtonBackgroundColor;
 
 @end

ParseUI/ParseUI/Internal/Extensions/PFColor.h

@@ -69,20 +69,6 @@ + (UIColor *)signupButtonBackgroundColor {
                            alpha:1.0f];
 }
 
-+ (UIColor *)facebookButtonBackgroundColor {
-    return [UIColor colorWithRed:58.0f/255.0f
-                           green:89.0f/255.0f
-                            blue:152.0f/255.0f
-                           alpha:1.0f];
-}
-
-+ (UIColor *)twitterButtonBackgroundColor {
-    return [UIColor colorWithRed:45.0f/255.0f
-                           green:170.0f/255.0f
-                            blue:1.0f
-                           alpha:1.0f];
-}
-
 + (UIColor *)appleButtonBackgroundColor {
     return [UIColor blackColor];
 }

ParseUI/ParseUI/Internal/Extensions/PFColor.m

@@ -22,9 +22,6 @@
 /* Error occurred during deletion */
 "Error occurred during deletion" = "Fehler beim Löschen";
 
-/* Facebook */
-"Facebook" = "Facebook";
-
 /* Forgot Password? */
 "Forgot Password?" = "Passwort vergessen?";
 
@@ -40,12 +37,6 @@
 /* Log In */
 "Log In" = "Einloggen";
 
-/* Log In with Facebook */
-"Log In with Facebook" = "Einloggen mit Facebook";
-
-/* Log In with Twitter */
-"Log In with Twitter" = "Einloggen mit Twitter";
-
 /* Login failed alert title in PFLogInViewController */
 "Login Failed" = "Anmeldung fehlgeschlagen";
 
@@ -103,8 +94,5 @@
 /* Invalid login credentials alert message in PFLogInViewController */
 "The username and password you entered don't match" = "Der Benutzername und das eingegebene Passwort stimmen nicht überein";
 
-/* Twitter */
-"Twitter" = "Twitter";
-
 /* Username */
 "Username" = "Benutzername";