apple login

This commit is contained in:
2025-10-30 14:29:11 +08:00
parent f58bf61500
commit 85a3694e35
7 changed files with 388 additions and 6 deletions

View File

@@ -34,6 +34,8 @@
04FC95DD2EB202A3007BD342 /* KBGuideVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC95DC2EB202A3007BD342 /* KBGuideVC.m */; };
04FC95E52EB220B5007BD342 /* UIColor+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC95E42EB220B5007BD342 /* UIColor+Extension.m */; };
04FC95E92EB23B67007BD342 /* KBNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC95E72EB23B67007BD342 /* KBNetworkManager.m */; };
04FC95F12EB339A7007BD342 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC95F02EB339A7007BD342 /* LoginViewController.m */; };
04FC95F42EB339C1007BD342 /* AppleSignInManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC95F32EB339C1007BD342 /* AppleSignInManager.m */; };
04FC97002EB30A00007BD342 /* KBGuideTopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC96FF2EB30A00007BD342 /* KBGuideTopCell.m */; };
04FC97032EB30A00007BD342 /* KBGuideKFCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC97022EB30A00007BD342 /* KBGuideKFCell.m */; };
04FC97062EB30A00007BD342 /* KBGuideUserCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04FC97052EB30A00007BD342 /* KBGuideUserCell.m */; };
@@ -124,6 +126,11 @@
04FC95E42EB220B5007BD342 /* UIColor+Extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Extension.m"; sourceTree = "<group>"; };
04FC95E62EB23B67007BD342 /* KBNetworkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KBNetworkManager.h; sourceTree = "<group>"; };
04FC95E72EB23B67007BD342 /* KBNetworkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KBNetworkManager.m; sourceTree = "<group>"; };
04FC95EF2EB339A7007BD342 /* LoginViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
04FC95F02EB339A7007BD342 /* LoginViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
04FC95F22EB339C1007BD342 /* AppleSignInManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleSignInManager.h; sourceTree = "<group>"; };
04FC95F32EB339C1007BD342 /* AppleSignInManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppleSignInManager.m; sourceTree = "<group>"; };
04FC95F52EB33B52007BD342 /* keyBoard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = keyBoard.entitlements; sourceTree = "<group>"; };
04FC96FE2EB30A00007BD342 /* KBGuideTopCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KBGuideTopCell.h; sourceTree = "<group>"; };
04FC96FF2EB30A00007BD342 /* KBGuideTopCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KBGuideTopCell.m; sourceTree = "<group>"; };
04FC97012EB30A00007BD342 /* KBGuideKFCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KBGuideKFCell.h; sourceTree = "<group>"; };
@@ -172,6 +179,7 @@
04C6EAB92EAF86530089C901 /* keyBoard */ = {
isa = PBXGroup;
children = (
04FC95F52EB33B52007BD342 /* keyBoard.entitlements */,
04FC95BF2EB1E3B1007BD342 /* Class */,
04C6EAE32EAF942E0089C901 /* VC */,
04C6EAAC2EAF86530089C901 /* AppDelegate.h */,
@@ -347,6 +355,7 @@
04FC95BF2EB1E3B1007BD342 /* Class */ = {
isa = PBXGroup;
children = (
04FC95EE2EB3399D007BD342 /* Manager */,
04FC95ED2EB33611007BD342 /* Login */,
04FC95E82EB23B67007BD342 /* Network */,
04FC95E22EB2208F007BD342 /* Categories */,
@@ -476,6 +485,8 @@
04FC95EC2EB33611007BD342 /* VC */ = {
isa = PBXGroup;
children = (
04FC95EF2EB339A7007BD342 /* LoginViewController.h */,
04FC95F02EB339A7007BD342 /* LoginViewController.m */,
);
path = VC;
sourceTree = "<group>";
@@ -490,6 +501,15 @@
path = Login;
sourceTree = "<group>";
};
04FC95EE2EB3399D007BD342 /* Manager */ = {
isa = PBXGroup;
children = (
04FC95F22EB339C1007BD342 /* AppleSignInManager.h */,
04FC95F32EB339C1007BD342 /* AppleSignInManager.m */,
);
path = Manager;
sourceTree = "<group>";
};
2C53A0856097DCFBE7B55649 /* Pods */ = {
isa = PBXGroup;
children = (
@@ -735,6 +755,7 @@
04FC95D22EB1E7AE007BD342 /* MyVC.m in Sources */,
043FBCD22EAF97630036AFE1 /* KBPermissionViewController.m in Sources */,
04C6EABE2EAF86530089C901 /* AppDelegate.m in Sources */,
04FC95F12EB339A7007BD342 /* LoginViewController.m in Sources */,
04FC95D72EB1EA16007BD342 /* BaseTableView.m in Sources */,
04FC95D82EB1EA16007BD342 /* BaseCell.m in Sources */,
04FC95C92EB1E4C9007BD342 /* BaseNavigationController.m in Sources */,
@@ -749,6 +770,7 @@
04FC95CF2EB1E7A1007BD342 /* HomeVC.m in Sources */,
04C6EABF2EAF86530089C901 /* main.m in Sources */,
04FC95CC2EB1E780007BD342 /* BaseTabBarController.m in Sources */,
04FC95F42EB339C1007BD342 /* AppleSignInManager.m in Sources */,
04C6EAC12EAF86530089C901 /* ViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -803,7 +825,7 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoard.CustomKeyboard;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoardst.CustomKeyboard;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -831,7 +853,7 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoard.CustomKeyboard;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoardst.CustomKeyboard;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -845,6 +867,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = keyBoard/keyBoard.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = TN6HHV45BB;
@@ -863,7 +886,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoard;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoardst;
PRODUCT_NAME = "$(TARGET_NAME)";
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -877,6 +900,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = keyBoard/keyBoard.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = TN6HHV45BB;
@@ -895,7 +919,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoard;
PRODUCT_BUNDLE_IDENTIFIER = com.keyBoardst;
PRODUCT_NAME = "$(TARGET_NAME)";
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_EMIT_LOC_STRINGS = YES;

View File

@@ -6,11 +6,11 @@
//
#import "AppDelegate.h"
#import "ViewController.h"
#import "KBPermissionViewController.h"
#import <AFNetworking/AFNetworking.h>
#import <Bugly/Bugly.h>
#import "BaseTabBarController.h"
#import "LoginViewController.h"
static NSString * const kKBKeyboardExtensionBundleId = @"com.keyBoard.CustomKeyboard";
@@ -41,7 +41,7 @@ static NSString * const kKBKeyboardExtensionBundleId = @"com.keyBoard.CustomKeyb
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
self.window.backgroundColor = [UIColor whiteColor];
[self.window makeKeyAndVisible];
BaseTabBarController *vc = [[BaseTabBarController alloc] init];
LoginViewController *vc = [[LoginViewController alloc] init];
self.window.rootViewController = vc;
}

View File

@@ -0,0 +1,18 @@
// LoginViewController.h
// 仅包含“Apple 登录”的登录页
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface LoginViewController : UIViewController
/// Apple 登录成功回调。包含 userIdentifier首次授权可能包含 email/fullName。
@property (nonatomic, copy, nullable) void (^onLoginSuccess)(NSDictionary *userInfo);
/// 登录失败或取消时回调(返回错误)。
@property (nonatomic, copy, nullable) void (^onLoginFailure)(NSError *error);
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,154 @@
// LoginViewController.m
#import "LoginViewController.h"
#import "AppleSignInManager.h"
#import <AuthenticationServices/AuthenticationServices.h>
#import <Masonry/Masonry.h>
@interface LoginViewController ()
//
@property (nonatomic, strong) UIView *contentView;
//
@property (nonatomic, strong) UILabel *titleLabel;
// Apple
@property (nonatomic, strong) UIView *appleContainer;
// iOS13+ Apple
@property (nonatomic, strong) ASAuthorizationAppleIDButton *appleButton API_AVAILABLE(ios(13.0));
// iOS13
@property (nonatomic, strong) UIButton *compatHintButton;
@end
@implementation LoginViewController
- (void)viewDidLoad {
[super viewDidLoad];
if (@available(iOS 13.0, *)) {
self.view.backgroundColor = [UIColor systemBackgroundColor];
} else {
self.view.backgroundColor = [UIColor whiteColor];
}
[self setupUI]; //
}
- (void)setupUI {
// contentView
[self.view addSubview:self.contentView];
[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.equalTo(self.view);
make.left.equalTo(self.view).offset(24);
make.right.equalTo(self.view).offset(-24);
}];
// titleLabel
[self.contentView addSubview:self.titleLabel];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.left.right.equalTo(self.contentView);
}];
// appleContainer
[self.contentView addSubview:self.appleContainer];
[self.appleContainer mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.titleLabel.mas_bottom).offset(24);
make.left.right.equalTo(self.contentView);
make.height.mas_equalTo(50);
make.bottom.equalTo(self.contentView);
}];
}
//
- (UIView *)contentView {
if (!_contentView) {
_contentView = [UIView new];
}
return _contentView;
}
//
- (UILabel *)titleLabel {
if (!_titleLabel) {
_titleLabel = [UILabel new];
_titleLabel.text = @"登录";
_titleLabel.font = [UIFont boldSystemFontOfSize:24];
_titleLabel.textAlignment = NSTextAlignmentCenter;
}
return _titleLabel;
}
// Apple
- (UIView *)appleContainer {
if (!_appleContainer) {
_appleContainer = [UIView new];
if (@available(iOS 13.0, *)) {
[_appleContainer addSubview:self.appleButton];
[self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(_appleContainer);
}];
} else {
[_appleContainer addSubview:self.compatHintButton];
[self.compatHintButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(_appleContainer);
}];
}
}
return _appleContainer;
}
// Apple iOS13+
- (ASAuthorizationAppleIDButton *)appleButton API_AVAILABLE(ios(13.0)) {
if (!_appleButton) {
_appleButton = [ASAuthorizationAppleIDButton new];
[_appleButton addTarget:self action:@selector(handleAppleIDButtonPress) forControlEvents:UIControlEventTouchUpInside];
}
return _appleButton;
}
// iOS13
- (UIButton *)compatHintButton {
if (!_compatHintButton) {
_compatHintButton = [UIButton buttonWithType:UIButtonTypeSystem];
[_compatHintButton setTitle:@"需要 iOS13+ 才能使用 Apple 登录" forState:UIControlStateNormal];
_compatHintButton.enabled = NO;
}
return _compatHintButton;
}
- (void)handleAppleIDButtonPress API_AVAILABLE(ios(13.0)) {
__weak typeof(self) weakSelf = self;
[[AppleSignInManager shared] signInFromViewController:self completion:^(ASAuthorizationAppleIDCredential * _Nullable credential, NSError * _Nullable error) {
__strong typeof(weakSelf) selfStrong = weakSelf;
if (error) {
if (selfStrong.onLoginFailure) selfStrong.onLoginFailure(error);
return;
}
if (!credential) return;
NSString *userID = credential.user ?: @"";
NSString *email = credential.email ?: @""; //
NSPersonNameComponents *name = credential.fullName; //
NSString *givenName = name.givenName ?: @"";
NSString *familyName = name.familyName ?: @"";
NSMutableDictionary *info = [@{ @"userIdentifier": userID } mutableCopy];
if (email.length) info[@"email"] = email;
if (givenName.length || familyName.length) {
info[@"givenName"] = givenName;
info[@"familyName"] = familyName;
}
// identityToken / authorizationCode
NSData *tokenData = credential.identityToken;
if (tokenData) {
NSString *token = [[NSString alloc] initWithData:tokenData encoding:NSUTF8StringEncoding] ?: @"";
if (token.length) info[@"identityToken"] = token;
}
NSData *codeData = credential.authorizationCode;
if (codeData) {
NSString *code = [[NSString alloc] initWithData:codeData encoding:NSUTF8StringEncoding] ?: @"";
if (code.length) info[@"authorizationCode"] = code;
}
if (selfStrong.onLoginSuccess) selfStrong.onLoginSuccess(info);
}];
}
@end

View File

@@ -0,0 +1,37 @@
// AppleSignInManager.h
// 封装“用 Apple 登录”逻辑
#import <Foundation/Foundation.h>
#import <AuthenticationServices/AuthenticationServices.h>
@class UIViewController;
NS_ASSUME_NONNULL_BEGIN
/// Apple 登录回调结果
typedef void (^KBAppleSignInCompletion)(ASAuthorizationAppleIDCredential * _Nullable credential, NSError * _Nullable error);
/// AppleSignInManager 集中管理 Apple 登录流程与代理回调
@interface AppleSignInManager : NSObject <ASAuthorizationControllerDelegate, ASAuthorizationControllerPresentationContextProviding>
/// 单例便捷访问
+ (instancetype)shared;
/// 发起 Apple 登录
/// - 参数说明:
/// - presenting: 用于呈现授权界面的控制器
/// - completion: 主线程回调,返回凭证或错误
- (void)signInFromViewController:(UIViewController *)presenting completion:(KBAppleSignInCompletion)completion;
/// 根据已存储的 userIdentifier 检查凭证状态
/// 返回ASAuthorizationAppleIDProviderCredentialAuthorized/Revoked/NotFound
- (void)checkCredentialStateWithCompletion:(void(^)(ASAuthorizationAppleIDProviderCredentialState state))completion;
/// 最近一次成功登录的 userIdentifier已持久化
@property (nonatomic, readonly, nullable) NSString *storedUserIdentifier;
/// 本地登出:清除已存储的 userIdentifier不会向苹果撤销授权
- (void)signOut;
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,139 @@
// AppleSignInManager.m
// Apple
#import "AppleSignInManager.h"
#import <UIKit/UIKit.h>
#import <Security/Security.h>
static NSString * const kKBAppleUserIdentifierKey = @"com.company.keyboard.apple.user"; //
@interface AppleSignInManager ()
@property (nonatomic, weak) UIViewController *presentingVC;
@property (nonatomic, copy) KBAppleSignInCompletion completion;
@end
@implementation AppleSignInManager
+ (instancetype)shared {
static AppleSignInManager *instance;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ instance = [AppleSignInManager new]; });
return instance;
}
- (NSString *)storedUserIdentifier {
return [self.class keychainLoad:kKBAppleUserIdentifierKey];
}
- (void)signInFromViewController:(UIViewController *)presenting completion:(KBAppleSignInCompletion)completion {
if (@available(iOS 13.0, *)) {
self.presentingVC = presenting;
self.completion = completion;
ASAuthorizationAppleIDProvider *provider = [ASAuthorizationAppleIDProvider new];
ASAuthorizationAppleIDRequest *request = provider.createRequest;
request.requestedScopes = @[ASAuthorizationScopeFullName, ASAuthorizationScopeEmail];
ASAuthorizationController *controller = [[ASAuthorizationController alloc] initWithAuthorizationRequests:@[request]];
controller.delegate = self;
controller.presentationContextProvider = self;
[controller performRequests];
} else {
if (completion) {
NSError *err = [NSError errorWithDomain:@"AppleSignIn" code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Apple 登录需要 iOS 13 及以上版本"}];
completion(nil, err);
}
}
}
- (void)checkCredentialStateWithCompletion:(void(^)(ASAuthorizationAppleIDProviderCredentialState state))completion {
if (!completion) return;
if (@available(iOS 13.0, *)) {
NSString *userID = self.storedUserIdentifier;
if (!userID) {
completion(ASAuthorizationAppleIDProviderCredentialNotFound);
return;
}
ASAuthorizationAppleIDProvider *provider = [ASAuthorizationAppleIDProvider new];
[provider getCredentialStateForUserID:userID completion:^(ASAuthorizationAppleIDProviderCredentialState credentialState, NSError * _Nullable error) {
dispatch_async(dispatch_get_main_queue(), ^{ completion(credentialState); });
}];
} else {
completion(ASAuthorizationAppleIDProviderCredentialNotFound);
}
}
#pragma mark - (ASAuthorizationControllerDelegate)
- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithAuthorization:(ASAuthorization *)authorization API_AVAILABLE(ios(13.0)) {
if (@available(iOS 13.0, *)) {
ASAuthorizationAppleIDCredential *credential = authorization.credential;
// userIdentifier便
NSString *userID = credential.user;
[self.class keychainSave:kKBAppleUserIdentifierKey value:userID];
if (self.completion) {
self.completion(credential, nil);
}
}
self.completion = nil;
self.presentingVC = nil;
}
- (void)authorizationController:(ASAuthorizationController *)controller didCompleteWithError:(NSError *)error API_AVAILABLE(ios(13.0)) {
if (self.completion) {
self.completion(nil, error);
}
self.completion = nil;
self.presentingVC = nil;
}
#pragma mark - (ASAuthorizationControllerPresentationContextProviding)
- (ASPresentationAnchor)presentationAnchorForAuthorizationController:(ASAuthorizationController *)controller API_AVAILABLE(ios(13.0)) {
return self.presentingVC.view.window ?: UIApplication.sharedApplication.keyWindow;
}
#pragma mark - Keychain
// userIdentifier使 App
- (void)signOut {
NSDictionary *query = @{(__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword,
(__bridge id)kSecAttrService: kKBAppleUserIdentifierKey,
(__bridge id)kSecAttrAccount: kKBAppleUserIdentifierKey};
SecItemDelete((__bridge CFDictionaryRef)query);
}
+ (BOOL)keychainSave:(NSString *)key value:(NSString *)value {
if (!key) return NO;
NSData *data = [value dataUsingEncoding:NSUTF8StringEncoding];
NSDictionary *query = @{(__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword,
(__bridge id)kSecAttrService: key,
(__bridge id)kSecAttrAccount: key};
SecItemDelete((__bridge CFDictionaryRef)query);
NSMutableDictionary *attributes = [query mutableCopy];
attributes[(__bridge id)kSecValueData] = data ?: [NSData data];
OSStatus status = SecItemAdd((__bridge CFDictionaryRef)attributes, NULL);
return (status == errSecSuccess);
}
+ (NSString *)keychainLoad:(NSString *)key {
if (!key) return nil;
NSDictionary *query = @{(__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword,
(__bridge id)kSecAttrService: key,
(__bridge id)kSecAttrAccount: key,
(__bridge id)kSecReturnData: @YES,
(__bridge id)kSecMatchLimit: (__bridge id)kSecMatchLimitOne};
CFTypeRef dataRef = NULL;
OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)query, &dataRef);
if (status != errSecSuccess || !dataRef) return nil;
NSData *data = (__bridge_transfer NSData *)dataRef;
return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
}
@end

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.developer.applesignin</key>
<array>
<string>Default</string>
</array>
</dict>
</plist>