Apply new requirement for Admin endpoint

bosagora · Apr 18, 2022 · d412895 · d412895
1 parent 82a0d4d
commit d412895
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/source/agora/api/Admin.d b/source/agora/api/Admin.d
@@ -48,7 +48,7 @@ public interface NodeControlAPI
 
         Log in to the admin server
 
-        This is dummy endpoint for checking the username and password in
+        This is endpoint used only for checking the username and password in
         HTTP basic authentication. 
 
         API:
@@ -83,8 +83,8 @@ public interface NodeControlAPI
     @method(HTTPMethod.GET)
     @resultSerializer!(RawStringSerializer.serialize,
                        RawStringSerializer.deserialize,
-                       "image/svg+xml")()
-    public string loginQR (@viaHeader("Content-Type") out string contentType,
+                       "application/json")()
+    public string validator (@viaHeader("Content-Type") out string contentType,
                            @viaHeader("Vary") out string vary);
 
     /***************************************************************************
@@ -99,8 +99,8 @@ public interface NodeControlAPI
     @method(HTTPMethod.GET)
     @resultSerializer!(RawStringSerializer.serialize,
                        RawStringSerializer.deserialize,
-                       "image/svg+xml")()
-    public string encryptionKeyQR (string app, ulong height,
+                       "application/json")()
+    public string encryptionkey (string app, ulong height,
                                    @viaHeader("Content-Type") out string contentType,
                                    @viaHeader("Vary") out string vary);
 }
diff --git a/source/agora/node/admin/AdminInterface.d b/source/agora/node/admin/AdminInterface.d
@@ -143,7 +143,7 @@ public class AdminInterface : NodeControlAPI
 
     ***************************************************************************/
 
-    public override string loginQR (out string contentType, out string vary)
+    public override string validator (out string contentType, out string vary)
     {
         // The randomly generated temporary KeyPair
         KeyPair temp_kp = KeyPair.random();
@@ -162,9 +162,9 @@ public class AdminInterface : NodeControlAPI
         login_info.voter_card.signature =
             this.key_pair.sign(login_info.voter_card);
 
-        contentType = "image/svg+xml";
+        contentType = "application/json";
         vary = "Accept-Encoding";
-        return this.createQRcode(login_info);
+        return serializeToJsonString(login_info);
     }
 
     /***************************************************************************
@@ -176,7 +176,7 @@ public class AdminInterface : NodeControlAPI
 
     ***************************************************************************/
 
-    public override string encryptionKeyQR (
+    public override string encryptionkey (
         string app, ulong height, out string contentType, out string vary)
     {
         // Gets the pre-image of the requested height.
@@ -193,9 +193,9 @@ public class AdminInterface : NodeControlAPI
         );
         encryptionKey.signature = this.key_pair.secret.sign(encryptionKey);
 
-        contentType = "image/svg+xml";
+        contentType = "application/json";
         vary = "Accept-Encoding";
-        return this.createQRcode(encryptionKey);
+        return serializeToJsonString(encryptionKey);
     }
 
     /***************************************************************************