Skip to content

Commit b83ef7e

Browse files
committed
Cleanup
1 parent 17dd3ec commit b83ef7e

File tree

2 files changed

+2
-43
lines changed

2 files changed

+2
-43
lines changed

lib/clientStub.js

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,30 +65,8 @@ var DgraphClientStub = (function () {
6565
}
6666
DgraphClientStub.prototype.login = function (userid, password, refreshJwt, metadata, options) {
6767
return __awaiter(this, void 0, void 0, function () {
68-
var req, resp, jwtResponse;
6968
return __generator(this, function (_a) {
70-
switch (_a.label) {
71-
case 0:
72-
req = new messages.LoginRequest();
73-
if (userid !== undefined) {
74-
req.setUserid(userid);
75-
req.setPassword(password);
76-
req.setNamespace(0);
77-
}
78-
else if (refreshJwt !== undefined) {
79-
req.setRefreshToken(refreshJwt);
80-
}
81-
else {
82-
req.setRefreshToken(this.refreshJwt);
83-
}
84-
return [4, this.promisified.login(req, this.ensureMetadata(metadata), ensureCallOptions(options))];
85-
case 1:
86-
resp = _a.sent();
87-
jwtResponse = messages.Jwt.deserializeBinary(resp.getJson_asU8());
88-
this.accessJwt = jwtResponse.getAccessJwt();
89-
this.refreshJwt = jwtResponse.getRefreshJwt();
90-
return [2, jwtResponse];
91-
}
69+
return [2, this.loginIntoNamespace(userid, password, 0, refreshJwt, metadata, options)];
9270
});
9371
});
9472
};

src/clientStub.ts

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -88,26 +88,7 @@ export class DgraphClientStub {
8888
metadata?: grpc.Metadata,
8989
options?: grpc.CallOptions,
9090
): Promise<messages.Jwt> {
91-
const req = new messages.LoginRequest();
92-
if (userid !== undefined) {
93-
req.setUserid(userid);
94-
req.setPassword(password);
95-
req.setNamespace(0);
96-
} else if (refreshJwt !== undefined) {
97-
// Use the caller-supplied refreshJwt
98-
req.setRefreshToken(refreshJwt);
99-
} else {
100-
req.setRefreshToken(this.refreshJwt);
101-
}
102-
const resp = await this.promisified.login(
103-
req,
104-
this.ensureMetadata(metadata),
105-
ensureCallOptions(options),
106-
);
107-
const jwtResponse = messages.Jwt.deserializeBinary(resp.getJson_asU8());
108-
this.accessJwt = jwtResponse.getAccessJwt();
109-
this.refreshJwt = jwtResponse.getRefreshJwt();
110-
return jwtResponse;
91+
return this.loginIntoNamespace(userid, password, 0, refreshJwt, metadata, options);
11192
}
11293

11394
public async loginIntoNamespace(

0 commit comments

Comments
 (0)