instapaper-ts 1.1.1 → 1.1.3

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import OAuth from 'oauth-1.0a';
+
 type User = {
     type: "user";
     user_id: number;
@@ -85,11 +87,20 @@ declare class Instapaper {
     private username?;
     private password?;
     private token?;
-    constructor(consumerKey: string, consumerSecret: string);
-    setCredentials: (username: string, password: string) => void;
+    constructor({ consumerKey, consumerSecret, username, password, token, }: {
+        consumerKey: string;
+        consumerSecret: string;
+        username?: string;
+        password?: string;
+        token?: OAuth.Token;
+    });
     private makeRequest;
-    private getAccessToken;
+    fetchToken: () => Promise<OAuth.Token>;
     private request;
+    setCredentials: (username: string, password: string) => void;
+    withCredentials: (username: string, password: string) => this;
+    withToken: (token: OAuth.Token) => this;
+    verifyCredentials: () => Promise<[User]>;
     bookmarks: {
         list: (params?: ListParams) => Promise<(Bookmark | Folder | User | Error | Meta)[]>;
         updateReadProgress: (params: UpdateReadProgressParams) => Promise<[Bookmark]>;

package/dist/index.js

@@ -9,7 +9,13 @@ var Instapaper = class {
   username;
   password;
   token;
-  constructor(consumerKey, consumerSecret) {
+  constructor({
+    consumerKey,
+    consumerSecret,
+    username,
+    password,
+    token
+  }) {
     this.oauth = new OAuth({
       consumer: {
         key: consumerKey,
@@ -18,12 +24,11 @@ var Instapaper = class {
       signature_method: "HMAC-SHA1",
       hash_function: (base_string, key) => crypto.createHmac("sha1", key).update(base_string).digest("base64")
     });
-  }
-  setCredentials = (username, password) => {
     this.username = username;
     this.password = password;
-  };
-  makeRequest = async (url, method = "POST", params = {}, token) => {
+    this.token = token;
+  }
+  makeRequest = async (url, params = {}, token) => {
     const form = new URLSearchParams();
     for (const [key, val] of Object.entries(params)) {
       form.append(key, String(val));
@@ -32,14 +37,14 @@ var Instapaper = class {
       this.oauth.authorize(
         {
           url,
-          method,
+          method: "POST",
           data: params
         },
         token
       )
     );
     const response = await fetch(url, {
-      method,
+      method: "POST",
       headers: new Headers({ ...headers }),
       body: form
     });
@@ -54,7 +59,7 @@ var Instapaper = class {
       return response.text();
     }
   };
-  getAccessToken = async () => {
+  fetchToken = async () => {
     assert(
       this.username && this.password,
       "Please set username and password with setCredentials()."
@@ -64,11 +69,7 @@ var Instapaper = class {
       x_auth_password: this.password,
       x_auth_mode: "client_auth"
     };
-    const responseText = await this.makeRequest(
-      this.authUrl,
-      "POST",
-      params
-    );
+    const responseText = await this.makeRequest(this.authUrl, params);
     const data = new URLSearchParams(responseText);
     const key = data.get("oauth_token");
     const secret = data.get("oauth_token_secret");
@@ -76,16 +77,28 @@ var Instapaper = class {
       key && secret,
       "There was an error fetching the token. One or both of key and secret is null."
     );
-    this.token = { key, secret };
-    return this.token;
+    return { key, secret };
   };
   request = async (endpoint, params = {}) => {
     if (!this.token) {
-      this.token = await this.getAccessToken();
+      this.token = await this.fetchToken();
     }
     const url = this.baseUrl + endpoint;
-    return this.makeRequest(url, "POST", params, this.token);
+    return this.makeRequest(url, params, this.token);
+  };
+  setCredentials = (username, password) => {
+    this.username = username;
+    this.password = password;
+  };
+  withCredentials = (username, password) => {
+    this.setCredentials(username, password);
+    return this;
+  };
+  withToken = (token) => {
+    this.token = token;
+    return this;
   };
+  verifyCredentials = () => this.request("/1/account/verify_credentials");
   bookmarks = {
     list: (params = {}) => this.request(
       "/1/bookmarks/list",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instapaper-ts",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "type": "module",
   "description": "A type-safe API client for Instapaper.",
   "main": "dist/index.js",