@iebh/tera-fy 1.0.19 → 1.0.20

package/lib/terafy.server.js

@@ -417,8 +417,16 @@ export default class TeraFyServer {
 
 						// Create a listener for the message from the downstream window to resolve the promise
 						let listenMessages = ({data}) => {
-							if (data.TERA && data.action == 'noop' && data.isLoggedIn) { // Signal sent from landing page - we're logged in, yey!
-								this.debug('Received ok message from popup window');
+							if (data.TERA && data.action == 'popupUserState' && data.user) { // Signal sent from landing page - we're logged in, yey!
+								let $auth = app.service('$auth');
+
+								// Accept user polyfill from opener
+								$auth.state = 'user';
+								$auth.ready = true;
+								$auth.isLoggedIn = true;
+								$auth.user = data.user;
+
+								this.debug('Received user auth from popup window', {'$auth.user': $auth.user});
 								waitOnWindowAuth.resolve();
 							}
 						};
@@ -444,15 +452,6 @@ export default class TeraFyServer {
 						// Disable overlay content
 						this.uiSplat(false);
 
-						// Tell $auth to forcibly refresh its user data
-						await app.service('$auth').restoreLogin();
-
-						// Sanity Check against the login that should have been restored
-						if (!app.service('$auth').isLoggedIn) {
-							console.warn('Expecting tera-server to have restored $auth.user - but its still not logged in!');
-							debugger;
-						}
-
 						// ... then refresh the project list as we're likely going to need it
 						await app.service('$projects').refresh();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iebh/tera-fy",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "TERA website worker",
   "scripts": {
     "dev": "esbuild --platform=browser --format=esm --bundle lib/terafy.client.js --outfile=dist/terafy.js --minify --serve --servedir=.",