处理网络请求token为空的问题
This commit is contained in:
@@ -44,7 +44,6 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
|
||||
_timeout = 10.0;
|
||||
|
||||
NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: KBLanguageCodeEnglish;
|
||||
NSString *token = [KBUserSessionManager shared].accessToken ? [KBUserSessionManager shared].accessToken : @"";
|
||||
|
||||
// 如果还有 query 参数也塞进来
|
||||
// signParams[@"lang"] = @"zh";
|
||||
@@ -54,7 +53,6 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
|
||||
_defaultHeaders = @{
|
||||
@"Accept": @"*/*",
|
||||
@"Accept-Language": lang,
|
||||
@"auth-token" : token,
|
||||
};
|
||||
// 设置基础域名,路径可相对该地址拼接
|
||||
_baseURL = [NSURL URLWithString:KB_BASE_URL];
|
||||
@@ -357,6 +355,12 @@ autoShowBusinessError:YES
|
||||
- (void)applyHeaders:(NSDictionary<NSString *,NSString *> *)headers toMutableRequest:(NSMutableURLRequest *)req contentType:(NSString *)contentType {
|
||||
// 合并默认头与局部头,并注入授权头(若可用)。局部覆盖优先。
|
||||
NSMutableDictionary *all = [self.defaultHeaders mutableCopy] ?: [NSMutableDictionary new];
|
||||
NSString *token = [KBAuthManager shared].current.accessToken;
|
||||
if (token.length > 0) {
|
||||
all[@"auth-token"] = token;
|
||||
} else {
|
||||
[all removeObjectForKey:@"auth-token"];
|
||||
}
|
||||
NSDictionary *auth = [[KBAuthManager shared] authorizationHeader];
|
||||
[auth enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) { all[key] = obj; }];
|
||||
if (contentType) all[@"Content-Type"] = contentType;
|
||||
|
||||
Reference in New Issue
Block a user