Support old login method

Author: vardhanapoorv

lib/client.d.ts

@@ -12,6 +12,7 @@ export declare class DgraphClient {
     setAlphaAuthToken(authToken: string): void;
     setSlashApiKey(apiKey: string): void;
     login(userid: string, password: string): Promise<boolean>;
+    loginIntoNamespace(userid: string, password: string, namespace?: number): Promise<boolean>;
     logout(): void;
     newTxn(options?: TxnOptions): Txn;
     setDebugMode(mode?: boolean): void;

lib/client.js

@@ -88,6 +88,16 @@ var DgraphClient = (function () {
             });
         });
     };
+    DgraphClient.prototype.loginIntoNamespace = function (userid, password, namespace) {
+        return __awaiter(this, void 0, void 0, function () {
+            var c;
+            return __generator(this, function (_a) {
+                this.debug("Login request:\nuserid: " + userid);
+                c = this.anyClient();
+                return [2, c.loginIntoNamespace(userid, password, namespace)];
+            });
+        });
+    };
     DgraphClient.prototype.logout = function () {
         this.debug("Logout");
         this.clients.forEach(function (c) { return c.logout(); });

lib/clientStub.js

@@ -261,8 +261,35 @@ var DgraphClientStub = (function () {
     };
     DgraphClientStub.prototype.login = function (userid, password, refreshToken) {
         return __awaiter(this, void 0, void 0, function () {
+            var body, res;
             return __generator(this, function (_a) {
-                return [2, this.loginIntoNamespace(userid, password, 0, refreshToken)];
+                switch (_a.label) {
+                    case 0:
+                        if (this.legacyApi) {
+                            throw new Error("Pre v1.1 clients do not support Login methods");
+                        }
+                        body = {};
+                        if (userid === undefined &&
+                            refreshToken === undefined &&
+                            this.refreshToken === undefined) {
+                            throw new Error("Cannot find login details: neither userid/password nor refresh token are specified");
+                        }
+                        if (userid === undefined) {
+                            body.refresh_token =
+                                refreshToken !== undefined ? refreshToken : this.refreshToken;
+                        }
+                        else {
+                            body.userid = userid;
+                            body.password = password;
+                        }
+                        return [4, this.callAPI("login", __assign(__assign({}, this.options), { method: "POST", body: JSON.stringify(body) }))];
+                    case 1:
+                        res = _a.sent();
+                        this.accessToken = res.data.accessJWT;
+                        this.refreshToken = res.data.refreshJWT;
+                        this.maybeStartRefreshTimer(this.accessToken);
+                        return [2, true];
+                }
             });
         });
     };

src/client.ts

@@ -73,6 +73,20 @@ export class DgraphClient {
         return c.login(userid, password); // tslint:disable-line no-unsafe-any
     }
 
+    /**
+     * loginIntoNamespace obtains access tokens from Dgraph Server for the particular userid & namespace
+     */
+    public async loginIntoNamespace(
+        userid: string,
+        password: string,
+        namespace?: number,
+    ): Promise<boolean> {
+        this.debug(`Login request:\nuserid: ${userid}`);
+
+        const c = this.anyClient();
+        return c.loginIntoNamespace(userid, password, namespace); // tslint:disable-line no-unsafe-any
+    }
+
     /**
      * logout - forget all access tokens.
      */

src/clientStub.ts

@@ -296,7 +296,38 @@ export class DgraphClientStub {
         password?: string,
         refreshToken?: string,
     ): Promise<boolean> {
-        return this.loginIntoNamespace(userid, password, 0, refreshToken);
+         if (this.legacyApi) {
+             throw new Error("Pre v1.1 clients do not support Login methods");
+         }
+
+         const body: { [k: string]: string | number } = {};
+         if (
+             userid === undefined &&
+             refreshToken === undefined &&
+             this.refreshToken === undefined
+         ) {
+             throw new Error(
+                 "Cannot find login details: neither userid/password nor refresh token are specified",
+             );
+         }
+         if (userid === undefined) {
+             body.refresh_token =
+                 refreshToken !== undefined ? refreshToken : this.refreshToken;
+         } else {
+             body.userid = userid;
+             body.password = password;
+         }
+
+         const res: LoginResponse = await this.callAPI("login", {
+             ...this.options,
+             method: "POST",
+             body: JSON.stringify(body),
+         });
+         this.accessToken = res.data.accessJWT;
+         this.refreshToken = res.data.refreshJWT;
+
+         this.maybeStartRefreshTimer(this.accessToken);
+         return true;
     }
 
     public async loginIntoNamespace(

tests/helper.ts

@@ -2,6 +2,7 @@ import * as dgraph from "../src";
 
 export const SERVER_ADDR = "http://localhost:8080"; // tslint:disable-line no-http-string
 export const USE_LEGACY_API = false;
+export const DEFAULT_NAMESPACE = 0;
 
 export function createClient(): dgraph.DgraphClient {
     return new dgraph.DgraphClient(
@@ -27,9 +28,9 @@ export async function setup(
     const c = createClient();
     if (!USE_LEGACY_API) {
         if (userid === undefined) {
-            await c.login("groot", "password");
+            await c.loginIntoNamespace("groot", "password", DEFAULT_NAMESPACE);
         } else {
-            await c.login(userid, password);
+            await c.loginIntoNamespace(userid, password, DEFAULT_NAMESPACE);
         }
     }
     await dropAll(c);

tests/integration/acl.spec.ts

@@ -1,6 +1,7 @@
 import { setSchema, setup, USE_LEGACY_API } from "../helper";
 
 const data = ["200", "300", "400"];
+const DEFAULT_NAMESPACE = 0;
 
 describe("ACL Login", () => {
     it("should login and use JWT tokens", async () => {
@@ -11,17 +12,21 @@ describe("ACL Login", () => {
 
         const client = await setup("groot", "password");
 
-        await client.login("groot", "password");
+        await client.loginIntoNamespace("groot", "password", DEFAULT_NAMESPACE);
 
         try {
-            await client.login("groot", "12345678");
+            await client.loginIntoNamespace(
+                "groot",
+                "12345678",
+                DEFAULT_NAMESPACE,
+            );
             throw new Error("Server should not accept wrong password");
         } catch (e) {
           // Expected to throw an error for wrong password.
         }
 
         try {
-            await client.login("Groot", "password");
+            await client.loginIntoNamespace("Groot", "password", DEFAULT_NAMESPACE);
             throw new Error("Server should not accept wrong userid");
         } catch (e) {
           // Expected to throw an error for wrong password.