From b8370765923f7a9bd1c32c4eb027a96751d9afed Mon Sep 17 00:00:00 2001
From: Joren l'Ami <joren@distinct.nl>
Date: Wed, 21 Feb 2018 14:51:54 +0100
Subject: [PATCH] no .db, but use getDb() everywhere

---
 addon/authenticators/pouch.js | 31 ++++++++++++++-----------------
 package.json                  |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/addon/authenticators/pouch.js b/addon/authenticators/pouch.js
index 26cec4d..2cc8e42 100644
--- a/addon/authenticators/pouch.js
+++ b/addon/authenticators/pouch.js
@@ -4,14 +4,10 @@ const { getOwner } = Ember;
 
 export default Base.extend({
   store: Ember.inject.service(),
-    
-  init() {
-    this._super(...arguments);
-
-    this.db = this.getDb();
-  },
   
   getDb() {
+    if (this.db) return this.db;
+    
   	let config = getOwner(this).resolveRegistration('config:environment');
 
     //let the user override the default adapter
@@ -21,16 +17,17 @@ export default Base.extend({
 
     Ember.assert('You must have an ember-pouch adapter setup for authentication', pouchAdapter);
     
-  	return pouchAdapter.db;
+  	this.db = pouchAdapter.db;
+  	
+  	return this.db;
   },
 
   restore(data) {
-  	let self = this;
-  	return this.db.getSession().then(function(resp) {
+  	return this.getDb().getSession().then((resp) => {
   		let result = null;
   		if (!Ember.isEmpty(data.name) && resp.userCtx.name === data.name) {
   			result = resp.userCtx;
-  			self.db.emit('loggedin');
+  			this.getDb().emit('loggedin');
   		}
   		else {
   			result = Ember.RSVP.reject("Not logged in or incorrect user in cookie");
@@ -41,17 +38,17 @@ export default Base.extend({
   },
 
   authenticate(username, password) {
-  	let self = this;
-    return this.db.login(username, password).then(function() {
-    	return self.db.getSession().then(function(resp) {
-    		self.db.emit('loggedin');
+  	return this.getDb().login(username, password)
+  	  .then(() => this.getDb().getSession())
+  	  .then((resp) => {
+    		this.getDb().emit('loggedin');
     		return resp.userCtx;
     	});
-	});
   },
 
   invalidate() {
-  	this.db.emit('loggedout');
-    return this.db.logout();
+    let result = this.getDb().logout();
+  	this.getDb().emit('loggedout');
+    return result;
   }
 });
diff --git a/package.json b/package.json
index f6d9c71..d4c8525 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-simple-auth-pouch",
-  "version": "0.1.0-beta.6",
+  "version": "0.1.0-beta.7",
   "description": "Ember Simple Auth Authenticator for Pouch.",
   "directories": {
     "doc": "doc",