From 8a668860816f1f9b644725dbe72385d45efdc101 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <berkeleytrue@users.noreply.github.com>
Date: Wed, 27 Dec 2017 12:15:36 -0800
Subject: [PATCH] fix(AccessToken): Move extensions to boot script

Loopback does not facilitate built in model extensions in the same way
as user defined models
---
 common/models/Access-Token.js     | 18 ------------------
 server/boot/a-extend-built-ins.js | 15 +++++++++++++++
 server/boot/a-extendEmail.js      |  6 ------
 3 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 common/models/Access-Token.js
 create mode 100644 server/boot/a-extend-built-ins.js
 delete mode 100644 server/boot/a-extendEmail.js

diff --git a/common/models/Access-Token.js b/common/models/Access-Token.js
deleted file mode 100644
index 049ec4fd12e..00000000000
--- a/common/models/Access-Token.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Observable } from 'rx';
-
-module.exports = AccessToken => {
-  // wait for datasource to attach before adding methods
-  // prevents loopback from unnecessarily
-  // adding watchers on startup
-  AccessToken.on('dataSourceAttached', () => {
-    AccessToken.findOne$ = Observable.fromNodeCallback(
-      AccessToken.findOne.bind(AccessToken)
-    );
-    AccessToken.prototype.validate$ = Observable.fromNodeCallback(
-      AccessToken.prototype.validate
-    );
-    AccessToken.prototype.destroy$ = Observable.fromNodeCallback(
-      AccessToken.prototype.destroy
-    );
-  });
-};
diff --git a/server/boot/a-extend-built-ins.js b/server/boot/a-extend-built-ins.js
new file mode 100644
index 00000000000..3466a9a8135
--- /dev/null
+++ b/server/boot/a-extend-built-ins.js
@@ -0,0 +1,15 @@
+import { Observable } from 'rx';
+
+export default function extendEmail(app) {
+  const { AccessToken, Email } = app.models;
+  Email.send$ = Observable.fromNodeCallback(Email.send, Email);
+  AccessToken.findOne$ = Observable.fromNodeCallback(
+    AccessToken.findOne.bind(AccessToken)
+  );
+  AccessToken.prototype.validate$ = Observable.fromNodeCallback(
+    AccessToken.prototype.validate
+  );
+  AccessToken.prototype.destroy$ = Observable.fromNodeCallback(
+    AccessToken.prototype.destroy
+  );
+}
diff --git a/server/boot/a-extendEmail.js b/server/boot/a-extendEmail.js
deleted file mode 100644
index fca44a011e0..00000000000
--- a/server/boot/a-extendEmail.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Observable } from 'rx';
-
-export default function extendEmail(app) {
-  const { Email } = app.models;
-  Email.send$ = Observable.fromNodeCallback(Email.send, Email);
-}