Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: update scopes #144

Merged
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
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,15 @@ ex: `Xo8WBi6jzSxKDVR4drqm84yr9iU=`

#### Methods (callback is optional)

| Func | Param | Return | Description |
| :--------- | :--------------------------------------: | :-------------: | :--------------- |
| login | `callback? (err: Error, result: Object)` | Promise{Object} | 로그인 |
| getProfile | `callback? (err: Error, result: Object)` | Promise{Object} | 프로필 불러오기 |
| logout | `callback? (err: Error, result: String)` | Promise{String} | 로그아웃 |
| unlink | `callback? (err: Error, result: String)` | Promise{String} | 연결끊기 |

#### params in result when `login`
| Func | Param | Return | Description |
| :--------- | :--------------------------------------: | :-------------: | :--------------- |
| login | `callback? (err: Error, result: Object)` | Promise{Object} | 로그인 |
| getProfile | `callback? (err: Error, result: Object)` | Promise{Object} | 프로필 불러오기 |
| logout | `callback? (err: Error, result: String)` | Promise{String} | 로그아웃 |
| unlink | `callback? (err: Error, result: String)` | Promise{String} | 연결끊기 |
| updateScopes| `callback? (err: Error, result: String)` | Promise{Object} | 추가 권한 요청 |

#### params in result when `login` and `updateScopes`

- version > 1.3.8

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import com.kakao.auth.AuthType;
import com.kakao.auth.ISessionCallback;
import com.kakao.auth.AccessTokenCallback;
import com.kakao.auth.KakaoSDK;
import com.kakao.auth.Session;
import com.kakao.network.ErrorResult;
Expand Down Expand Up @@ -351,6 +352,35 @@ public void onSuccess(Long result) {
}
});
}

@ReactMethod
private void updateScopes(final ReadableArray scopes, final Promise promise) {
List<String> targetScopes = new ArrayList<String>();
for (Object scopeObj : scopes.toArrayList()) {
String scope = scopeObj.toString();
targetScopes.add(scope);
}

Session.getCurrentSession().updateScopes(reactContext.getCurrentActivity(), targetScopes, new AccessTokenCallback() {
@Override
public void onAccessTokenReceived(AccessToken accessToken) {
WritableMap result = Arguments.createMap();
SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

result.putString("accessToken", Session.getCurrentSession().getTokenInfo().getAccessToken());
result.putString("refreshToken", Session.getCurrentSession().getTokenInfo().getRefreshToken());
result.putString("accessTokenExpiresAt", transFormat.format(Session.getCurrentSession().getTokenInfo().accessTokenExpiresAt()));
result.putString("refreshTokenExpiresAt", transFormat.format(Session.getCurrentSession().getTokenInfo().refreshTokenExpiresAt()));

promise.resolve(result);
}

@Override
public void onAccessTokenFailure(ErrorResult errorResult) {
promise.reject(String.valueOf(errorResult.getErrorCode()), errorResult.getErrorMessage(), errorResult.getException());
}
});
}


public static class SessionCallback implements ISessionCallback {
Expand Down
25 changes: 25 additions & 0 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,36 @@ export function unlink(callback?: ICallback<string>): Promise<string> {
});
}

/**
* updateScopes
* @param {Array<string>} scopes request scopes
* @param {ICallback<ITokenInfo>} [callback] callback function
* @returns {Promise<ITokenInfo>}
*/
export function updateScopes(scopes: Array<string>, callback?: ICallback<ITokenInfo>): Promise<ITokenInfo> {
return RNKakaoLogins.updateScopes(scopes)
.then((result) => {
if (isFunction(callback)) {
callback(null, result);
}

return result;
})
.catch((error) => {
if (isFunction(callback)) {
callback(error, null);
}

throw error;
});
}

const KakaoLogins = {
login,
logout,
getProfile,
unlink,
updateScopes
};

export default KakaoLogins;
31 changes: 31 additions & 0 deletions ios/RNKakaoLogins/RNKakaoLogins.m
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,35 @@ - (dispatch_queue_t)methodQueue
}];
}

RCT_EXPORT_METHOD(updateScopes:(NSArray<NSString *>*) scopes
resolver:(RCTPromiseResolveBlock) resolve
rejecter:(RCTPromiseRejectBlock) reject)
{
KOSession* session = [KOSession sharedSession];

[session updateScopes: scopes
completionHandler: ^(NSError *error) {
if (error) {
RCTLogInfo(@"Error=%@", error);
reject(getErrorCode(error), error.localizedDescription, error);
} else {
[session openWithCompletionHandler:^(NSError *error) {
if ([session isOpen]) {
NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
[formatter setDateFormat:@"yyyy-MM-dd hh:mm:ss"];

resolve(@{@"accessToken": session.token.accessToken,
@"refreshToken": session.token.refreshToken,
@"accessTokenExpiresAt": [formatter stringFromDate: session.token.accessTokenExpiresAt],
@"refreshTokenExpiresAt": [formatter stringFromDate: session.token.refreshTokenExpiresAt],
@"scopes": session.token.scopes});
} else {
RCTLogInfo(@"Error=%@", error);
reject(getErrorCode(error), error.localizedDescription, error);
}
}];
}
}];
}

@end