Added address Verification

.prettierignore

@@ -0,0 +1,2 @@
+# Ignore artifacts:
+dist

.prettierrc.json

@@ -0,0 +1 @@
+{}

dist/browser.js.LICENSE.txt

@@ -0,0 +1,10 @@
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/*! https://mths.be/base64 v1.0.0 by @mathias | MIT license */
+
+/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

package.json

@@ -1,12 +1,13 @@
 {
   "name": "web3-cardano-token",
-  "version": "0.0.12",
+  "version": "0.2.1",
   "private": false,
   "description": "Web3 Token is a new way to authenticate users in hybrid dApps using signed messages.",
   "author": "pyropy",
   "scripts": {
     "build": "webpack --mode=production --progress"
   },
+  "types": "src/lib.d.ts",
   "module": "src/lib.js",
   "main": "dist/web3-cardano-token.js",
   "dependencies": {

src/browser.d.ts

@@ -0,0 +1,25 @@
+type COSESign1 = {
+  signature: string;
+  key: string;
+}
+
+type Signer = (msg: string) => PromiseLike<COSESign1>;
+
+export function sign(
+  signer: Signer,
+  expires_in?: string | number,
+  body?: Object
+): PromiseLike<string>;
+
+export function verify(token: string): {
+  address: string;
+  body: Object;
+};
+
+declare const Web3Token: {
+  sign: typeof sign;
+  verify: typeof verify;
+};
+
+export default Web3Token;
+

src/lib.d.ts

@@ -1,20 +1,24 @@
-type Signer = (msg: string) => PromiseLike<string>
+type COSESign1 = {
+  signature: string;
+  key: string;
+}
+
+type Signer = (msg: string) => PromiseLike<COSESign1>;
 
 export function sign(
-    signer: Signer,
-    expires_in?: string | number,
-    body?: Object): PromiseLike<string>
+  signer: Signer,
+  expires_in?: string | number,
+  body?: Object
+): PromiseLike<string>;
 
-export function verify(
-    token: string
-): {
-    address: string,
-    body: Object
-}
+export function verify(token: string): {
+  address: string;
+  body: Object;
+};
 
 declare const Web3Token: {
-    sign: typeof sign,
-    verify: typeof verify
-}
+  sign: typeof sign;
+  verify: typeof verify;
+};
 
-export default Web3Token
+export default Web3Token;

src/lib/sign.js

@@ -1,71 +1,80 @@
-import Base64 from 'base-64';
-import { timeSpan } from './timespan';
+import Base64 from "base-64";
+import { timeSpan } from "./timespan";
 
 /**
- * 
+ *
  * @param {function} signer - The signer function, must return Promise<string>
  * @param {any} body - Body to add to the sign
  */
-export const sign = async (signer, expires_in = '1d', body = {}) => {
-
+export const sign = async (signer, expires_in = "1d", body = {}) => {
   const expires_in_date = timeSpan(expires_in);
 
   validateInput(body);
 
   const data = {
-    'Web3-Token-Version': 1,
-    'Expire-Date': expires_in_date,
+    "Web3-Token-Version": 1,
+    "Expire-Date": expires_in_date,
     ...body,
   };
 
   const msg = buildMessage(data);
-  
-  if(typeof signer === 'function') {
-    var signature = await signer(msg);
+
+  if (typeof signer === "function") {
+    var COSESign1Message = await signer(msg);
   } else {
-    throw new Error('"signer" argument should be a function that returns a signature eg: "msg => web3.eth.personal.sign(msg, <YOUR_ADDRESS>)"')
+    throw new Error(
+      '"signer" argument should be a function that returns a signature eg: "msg => web3.eth.personal.sign(msg, <YOUR_ADDRESS>)"'
+    );
   }
-
-  if (typeof(signature) === "object") {
-    signature = signature.signature
+
+  let signature, key;
+
+  if (typeof COSESign1Message === "string") {
+    signature = COSESign1Message;
+  } else {
+    signature = COSESign1Message.signature;
+    key = COSESign1Message.key;
   }
 
-  if(typeof signature !== 'string') {
-    throw new Error('"signer" argument should be a function that returns a signature string (Promise<string>)')
+  if (typeof signature !== "string") {
+    throw new Error(
+      '"signature" argument should be a function that returns a signature string (Promise<string>)'
+    );
   }
 
-  const token = Base64.encode(JSON.stringify({
-    signature,
-    body: msg,
-  }))
+  const token = Base64.encode(
+    JSON.stringify({
+      signature,
+      key,
+      body: msg,
+    })
+  );
 
   return token;
-}
-
+};
 
-const validateInput = body => {
+const validateInput = (body) => {
   for (const key in body) {
+    const field = body[key];
 
-    const field = body[key]
-
-    if(key === 'Expire-Date') {
+    if (key === "Expire-Date") {
       throw new Error('Please do not rewrite "Expire-Date" field');
     }
 
-    if(key === 'Web3-Token-Version') {
+    if (key === "Web3-Token-Version") {
       throw new Error('Please do not rewrite "Web3-Token-Version" field');
     }
 
-    if(typeof field !== 'string') {
-      throw new Error('Body can only contain string values');
+    if (typeof field !== "string") {
+      throw new Error("Body can only contain string values");
     }
   }
 };
 
-const buildMessage = data => {
+const buildMessage = (data) => {
   const message = [];
   for (const key in data) {
-    message.push(`${key}: ${data[key]}`)
+    message.push(`${key}: ${data[key]}`);
   }
-  return message.join('\n');
+  return message.join("\n");
 };