grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed now-redundant credentials wrappings

This commit is contained in:
murgatroid99 2015-09-28 16:38:38 -07:00
parent 0e008b11f4
commit 49c1c52bb5
3 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ext/credentials.cc
View File

@ -78,21 +78,12 @@ void Credentials::Init(Local<Object> exports) {
tpl->InstanceTemplate()->SetInternalFieldCount(1); tpl->InstanceTemplate()->SetInternalFieldCount(1);
fun_tpl.Reset(tpl); fun_tpl.Reset(tpl);
Local<Function> ctr = Nan::GetFunction(tpl).ToLocalChecked(); Local<Function> ctr = Nan::GetFunction(tpl).ToLocalChecked();
Nan::Set(ctr, Nan::New("createDefault").ToLocalChecked(),
Nan::GetFunction(
Nan::New<FunctionTemplate>(CreateDefault)).ToLocalChecked());
Nan::Set(ctr, Nan::New("createSsl").ToLocalChecked(), Nan::Set(ctr, Nan::New("createSsl").ToLocalChecked(),
Nan::GetFunction( Nan::GetFunction(
Nan::New<FunctionTemplate>(CreateSsl)).ToLocalChecked()); Nan::New<FunctionTemplate>(CreateSsl)).ToLocalChecked());
Nan::Set(ctr, Nan::New("createComposite").ToLocalChecked(), Nan::Set(ctr, Nan::New("createComposite").ToLocalChecked(),
Nan::GetFunction( Nan::GetFunction(
Nan::New<FunctionTemplate>(CreateComposite)).ToLocalChecked()); Nan::New<FunctionTemplate>(CreateComposite)).ToLocalChecked());
Nan::Set(ctr, Nan::New("createGce").ToLocalChecked(),
Nan::GetFunction(
Nan::New<FunctionTemplate>(CreateGce)).ToLocalChecked());
Nan::Set(ctr, Nan::New("createIam").ToLocalChecked(),
Nan::GetFunction(
Nan::New<FunctionTemplate>(CreateIam)).ToLocalChecked());
Nan::Set(ctr, Nan::New("createInsecure").ToLocalChecked(), Nan::Set(ctr, Nan::New("createInsecure").ToLocalChecked(),
Nan::GetFunction( Nan::GetFunction(
Nan::New<FunctionTemplate>(CreateInsecure)).ToLocalChecked()); Nan::New<FunctionTemplate>(CreateInsecure)).ToLocalChecked());
@ -153,15 +144,6 @@ NAN_METHOD(Credentials::New) {
} }
} }
NAN_METHOD(Credentials::CreateDefault) {
grpc_credentials *creds = grpc_google_default_credentials_create();
if (creds == NULL) {
info.GetReturnValue().SetNull();
} else {
info.GetReturnValue().Set(WrapStruct(creds));
}
}
NAN_METHOD(Credentials::CreateSsl) { NAN_METHOD(Credentials::CreateSsl) {
char *root_certs = NULL; char *root_certs = NULL;
grpc_ssl_pem_key_cert_pair key_cert_pair = {NULL, NULL}; grpc_ssl_pem_key_cert_pair key_cert_pair = {NULL, NULL};
@ -222,34 +204,6 @@ NAN_METHOD(Credentials::CreateComposite) {
} }
} }
NAN_METHOD(Credentials::CreateGce) {
Nan::HandleScope scope;
grpc_credentials *creds = grpc_google_compute_engine_credentials_create(NULL);
if (creds == NULL) {
info.GetReturnValue().SetNull();
} else {
info.GetReturnValue().Set(WrapStruct(creds));
}
}
NAN_METHOD(Credentials::CreateIam) {
if (!info[0]->IsString()) {
return Nan::ThrowTypeError("createIam's first argument must be a string");
}
if (!info[1]->IsString()) {
return Nan::ThrowTypeError("createIam's second argument must be a string");
}
Utf8String auth_token(info[0]);
Utf8String auth_selector(info[1]);
grpc_credentials *creds =
grpc_google_iam_credentials_create(*auth_token, *auth_selector, NULL);
if (creds == NULL) {
info.GetReturnValue().SetNull();
} else {
info.GetReturnValue().Set(WrapStruct(creds));
}
}
NAN_METHOD(Credentials::CreateInsecure) { NAN_METHOD(Credentials::CreateInsecure) {
info.GetReturnValue().Set(WrapStruct(NULL)); info.GetReturnValue().Set(WrapStruct(NULL));
} }

4
ext/credentials.h
View File

@ -62,12 +62,8 @@ class Credentials : public Nan::ObjectWrap {
Credentials &operator=(const Credentials &); Credentials &operator=(const Credentials &);
static NAN_METHOD(New); static NAN_METHOD(New);
static NAN_METHOD(CreateDefault);
static NAN_METHOD(CreateSsl); static NAN_METHOD(CreateSsl);
static NAN_METHOD(CreateComposite); static NAN_METHOD(CreateComposite);
static NAN_METHOD(CreateGce);
static NAN_METHOD(CreateFake);
static NAN_METHOD(CreateIam);
static NAN_METHOD(CreateInsecure); static NAN_METHOD(CreateInsecure);
static NAN_METHOD(CreateFromPlugin); static NAN_METHOD(CreateFromPlugin);
static Nan::Callback *constructor; static Nan::Callback *constructor;

2
test/credentials_test.js
View File

@ -60,7 +60,7 @@ function multiDone(done, count) {
}; };
} }
describe.only('client credentials', function() { describe('client credentials', function() {
var Client; var Client;
var server; var server;
var port; var port;