@slicemachine/init 1.0.2-alpha.33 → 1.0.2-alpha.37

package/build/index.js

@@ -6,6 +6,7 @@ const tracker_1 = require("./utils/tracker");
 const steps_1 = require("./steps");
 const utils_1 = require("./utils");
 async function init() {
+    var _a;
     const cwd = (0, utils_1.findArgument)(process.argv, "cwd") || process.cwd();
     const base = (0, utils_1.findArgument)(process.argv, "base") || core_1.Utils.CONSTS.DEFAULT_BASE;
     const lib = (0, utils_1.findArgument)(process.argv, "library");
@@ -22,9 +23,11 @@ async function init() {
     if (!existing) {
         await (0, steps_1.createRepository)(name, frameworkResult.value, config);
     }
-    const tracker = tracker_1.Tracker.build("JfTfmHaATChc4xueS7RcCBsixI71dJIJ", name, {
-        userId: user.userId,
-    }, isTrackingAvailable);
+    const tracker = ((_a = user.profile) === null || _a === void 0 ? void 0 : _a.shortId)
+        ? tracker_1.Tracker.build("JfTfmHaATChc4xueS7RcCBsixI71dJIJ", name, {
+            userId: user.profile.shortId,
+        }, isTrackingAvailable)
+        : undefined;
     await (0, steps_1.installRequiredDependencies)(cwd, frameworkResult.value);
     const sliceLibPath = lib
         ? await (0, steps_1.installLib)(tracker, cwd, lib, branch)
@@ -41,4 +44,4 @@ catch (error) {
     else
         console.error(error);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsNkNBQXVEO0FBQ3ZELDZDQUEwQztBQUMxQyxtQ0FVaUI7QUFDakIsbUNBQXVDO0FBRXZDLEtBQUssVUFBVSxJQUFJO0lBQ2pCLE1BQU0sR0FBRyxHQUFHLElBQUEsb0JBQVksRUFBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUMvRCxNQUFNLElBQUksR0FBRyxJQUFBLG9CQUFZLEVBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxZQUFLLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQztJQUM3RSxNQUFNLEdBQUcsR0FBdUIsSUFBQSxvQkFBWSxFQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDdEUsTUFBTSxNQUFNLEdBQXVCLElBQUEsb0JBQVksRUFBQyxPQUFPLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQ3hFLE1BQU0sbUJBQW1CLEdBQ3ZCLElBQUEsb0JBQVksRUFBQyxPQUFPLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxLQUFLLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFFcEUsT0FBTyxDQUFDLEdBQUcsQ0FDVCxZQUFLLENBQUMsTUFBTSxDQUNWLG9FQUFvRSxDQUNyRSxDQUNGLENBQUM7SUFHRixJQUFBLG1CQUFXLEVBQUMsR0FBRyxDQUFDLENBQUM7SUFHakIsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFBLHFCQUFhLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDdkMsSUFBSSxDQUFDLElBQUk7UUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLCtCQUErQixDQUFDLENBQUM7SUFHNUQsTUFBTSxNQUFNLEdBQUcsaUJBQVUsQ0FBQywwQkFBMEIsQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUczRCxNQUFNLGVBQWUsR0FBRyxNQUFNLElBQUEsdUJBQWUsRUFBQyxHQUFHLENBQUMsQ0FBQztJQUduRCxNQUFNLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxHQUFHLE1BQU0sSUFBQSx5QkFBaUIsRUFDaEQsTUFBTSxDQUFDLE9BQU8sRUFDZCxHQUFHLEVBQ0gsTUFBTSxDQUFDLElBQUksQ0FDWixDQUFDO0lBRUYsSUFBSSxDQUFDLFFBQVEsRUFBRTtRQUNiLE1BQU0sSUFBQSx3QkFBZ0IsRUFBQyxJQUFJLEVBQUUsZUFBZSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztLQUM3RDtJQUVELE1BQU0sT0FBTyxHQUFHLGlCQUFPLENBQUMsS0FBSyxDQUMzQixrQ0FBa0MsRUFDbEMsSUFBSSxFQUNKO1FBQ0UsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO0tBQ3BCLEVBQ0QsbUJBQW1CLENBQ3BCLENBQUM7SUFHRixNQUFNLElBQUEsbUNBQTJCLEVBQUMsR0FBRyxFQUFFLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUU5RCxNQUFNLFlBQVksR0FBRyxHQUFHO1FBQ3RCLENBQUMsQ0FBQyxNQUFNLElBQUEsa0JBQVUsRUFBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxNQUFNLENBQUM7UUFDN0MsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUdkLElBQUEsd0JBQWdCLEVBQ2QsR0FBRyxFQUNILElBQUksRUFDSixJQUFJLEVBQ0osZUFBZSxFQUNmLFlBQVksRUFDWixtQkFBbUIsQ0FDcEIsQ0FBQztJQUdGLElBQUEsMkJBQW1CLEVBQUMsR0FBRyxDQUFDLENBQUM7QUFDM0IsQ0FBQztBQUVELElBQUk7SUFDRixLQUFLLElBQUksRUFBRSxDQUFDO0NBQ2I7QUFBQyxPQUFPLEtBQUssRUFBRTtJQUNkLElBQUksS0FBSyxZQUFZLEtBQUs7UUFBRSxZQUFLLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQzs7UUFDdkQsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztDQUMzQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsNkNBQXVEO0FBQ3ZELDZDQUEwQztBQUMxQyxtQ0FVaUI7QUFDakIsbUNBQXVDO0FBRXZDLEtBQUssVUFBVSxJQUFJOztJQUNqQixNQUFNLEdBQUcsR0FBRyxJQUFBLG9CQUFZLEVBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDL0QsTUFBTSxJQUFJLEdBQUcsSUFBQSxvQkFBWSxFQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksWUFBSyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUM7SUFDN0UsTUFBTSxHQUFHLEdBQXVCLElBQUEsb0JBQVksRUFBQyxPQUFPLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3RFLE1BQU0sTUFBTSxHQUF1QixJQUFBLG9CQUFZLEVBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUN4RSxNQUFNLG1CQUFtQixHQUN2QixJQUFBLG9CQUFZLEVBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBRXBFLE9BQU8sQ0FBQyxHQUFHLENBQ1QsWUFBSyxDQUFDLE1BQU0sQ0FDVixvRUFBb0UsQ0FDckUsQ0FDRixDQUFDO0lBR0YsSUFBQSxtQkFBVyxFQUFDLEdBQUcsQ0FBQyxDQUFDO0lBR2pCLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBQSxxQkFBYSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLElBQUksQ0FBQyxJQUFJO1FBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQywrQkFBK0IsQ0FBQyxDQUFDO0lBRzVELE1BQU0sTUFBTSxHQUFHLGlCQUFVLENBQUMsMEJBQTBCLENBQUMsR0FBRyxFQUFFLENBQUM7SUFHM0QsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFBLHVCQUFlLEVBQUMsR0FBRyxDQUFDLENBQUM7SUFHbkQsTUFBTSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsR0FBRyxNQUFNLElBQUEseUJBQWlCLEVBQ2hELE1BQU0sQ0FBQyxPQUFPLEVBQ2QsR0FBRyxFQUNILE1BQU0sQ0FBQyxJQUFJLENBQ1osQ0FBQztJQUVGLElBQUksQ0FBQyxRQUFRLEVBQUU7UUFDYixNQUFNLElBQUEsd0JBQWdCLEVBQUMsSUFBSSxFQUFFLGVBQWUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxDQUFDLENBQUM7S0FDN0Q7SUFFRCxNQUFNLE9BQU8sR0FBRyxDQUFBLE1BQUEsSUFBSSxDQUFDLE9BQU8sMENBQUUsT0FBTztRQUNuQyxDQUFDLENBQUMsaUJBQU8sQ0FBQyxLQUFLLENBQ1gsa0NBQWtDLEVBQ2xDLElBQUksRUFDSjtZQUNFLE1BQU0sRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU87U0FDN0IsRUFDRCxtQkFBbUIsQ0FDcEI7UUFDSCxDQUFDLENBQUMsU0FBUyxDQUFDO0lBR2QsTUFBTSxJQUFBLG1DQUEyQixFQUFDLEdBQUcsRUFBRSxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUM7SUFFOUQsTUFBTSxZQUFZLEdBQUcsR0FBRztRQUN0QixDQUFDLENBQUMsTUFBTSxJQUFBLGtCQUFVLEVBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFDO1FBQzdDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFHZCxJQUFBLHdCQUFnQixFQUNkLEdBQUcsRUFDSCxJQUFJLEVBQ0osSUFBSSxFQUNKLGVBQWUsRUFDZixZQUFZLEVBQ1osbUJBQW1CLENBQ3BCLENBQUM7SUFHRixJQUFBLDJCQUFtQixFQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQzNCLENBQUM7QUFFRCxJQUFJO0lBQ0YsS0FBSyxJQUFJLEVBQUUsQ0FBQztDQUNiO0FBQUMsT0FBTyxLQUFLLEVBQUU7SUFDZCxJQUFJLEtBQUssWUFBWSxLQUFLO1FBQUUsWUFBSyxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7O1FBQ3ZELE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7Q0FDM0IifQ==

package/build/steps/loginOrBypass.js

@@ -2,17 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loginOrBypass = void 0;
 const core_1 = require("@slicemachine/core");
+const communication_1 = require("../utils/communication");
 async function loginOrBypass(base) {
-    const user = await core_1.Auth.validateSession(base);
+    const user = await (0, communication_1.validateSessionAndGetProfile)(base).catch((err) => console.log(err));
     if (user) {
-        core_1.Utils.writeCheck(`Logged in as ${core_1.Utils.bold(user.email)}`);
+        const email = user.info.email;
+        core_1.Utils.writeCheck(`Logged in as ${core_1.Utils.bold(email)}`);
         return user;
     }
     else {
         await core_1.Auth.login(base);
-        const user = await core_1.Auth.validateSession(base);
+        const user = await (0, communication_1.validateSessionAndGetProfile)(base);
         return user;
     }
 }
 exports.loginOrBypass = loginOrBypass;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW5PckJ5cGFzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGVwcy9sb2dpbk9yQnlwYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUFpRDtBQUcxQyxLQUFLLFVBQVUsYUFBYSxDQUFDLElBQVk7SUFDOUMsTUFBTSxJQUFJLEdBQUcsTUFBTSxXQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzlDLElBQUksSUFBSSxFQUFFO1FBQ1IsWUFBSyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsWUFBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQzNELE9BQU8sSUFBSSxDQUFDO0tBQ2I7U0FBTTtRQUNMLE1BQU0sV0FBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN2QixNQUFNLElBQUksR0FBRyxNQUFNLFdBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDOUMsT0FBTyxJQUFJLENBQUM7S0FDYjtBQUNILENBQUM7QUFWRCxzQ0FVQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW5PckJ5cGFzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGVwcy9sb2dpbk9yQnlwYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUFnRTtBQUNoRSwwREFHZ0M7QUFFekIsS0FBSyxVQUFVLGFBQWEsQ0FBQyxJQUFZO0lBSTlDLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBQSw0Q0FBNEIsRUFBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNsRSxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUNqQixDQUFDO0lBQ0YsSUFBSSxJQUFJLEVBQUU7UUFDUixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUM5QixZQUFLLENBQUMsVUFBVSxDQUFDLGdCQUFnQixZQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0RCxPQUFPLElBQUksQ0FBQztLQUNiO1NBQU07UUFDTCxNQUFNLFdBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdkIsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFBLDRDQUE0QixFQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RELE9BQU8sSUFBSSxDQUFDO0tBQ2I7QUFDSCxDQUFDO0FBaEJELHNDQWdCQyJ9

package/build/utils/communication.js

@@ -0,0 +1,76 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSessionAndGetProfile = exports.getUserProfile = void 0;
+const axios_1 = __importDefault(require("axios"));
+const t = __importStar(require("io-ts"));
+const function_1 = require("fp-ts/function");
+const Either_1 = require("fp-ts/Either");
+const core_1 = require("@slicemachine/core");
+const UserProfile = t.exact(t.type({
+    userId: t.string,
+    shortId: t.string,
+    email: t.string,
+    firstName: t.string,
+    lastName: t.string,
+}));
+async function getUserProfile(cookies, base = core_1.Utils.CONSTS.DEFAULT_BASE) {
+    const url = new URL(base);
+    url.hostname = `user.${url.hostname}`;
+    url.pathname = "profile";
+    const endpoint = url.toString();
+    const token = core_1.Utils.Cookie.parsePrismicAuthToken(cookies);
+    return axios_1.default
+        .get(endpoint, {
+        headers: {
+            Authorization: `Bearer Token ${token}`,
+        },
+    })
+        .then((res) => (0, function_1.pipe)(UserProfile.decode(res.data), (0, Either_1.fold)(() => {
+        throw new Error("Can't parse user profile");
+    }, (data) => data)));
+}
+exports.getUserProfile = getUserProfile;
+async function validateSessionAndGetProfile(base = core_1.Utils.CONSTS.DEFAULT_BASE) {
+    const config = core_1.FileSystem.PrismicSharedConfigManager.get();
+    if (!config.cookies.length)
+        return Promise.resolve(null);
+    if (base != config.base)
+        return Promise.resolve(null);
+    try {
+        const info = await core_1.Communication.validateSession(config.cookies, base);
+        const profile = await getUserProfile(config.cookies, base).catch(() => null);
+        if (profile === null || profile === void 0 ? void 0 : profile.shortId) {
+            core_1.FileSystem.PrismicSharedConfigManager.setProperties({
+                shortId: profile.shortId,
+            });
+        }
+        return { info, profile };
+    }
+    catch {
+        return null;
+    }
+}
+exports.validateSessionAndGetProfile = validateSessionAndGetProfile;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbXVuaWNhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tdW5pY2F0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxrREFBMEI7QUFDMUIseUNBQTJCO0FBQzNCLDZDQUFzQztBQUN0Qyx5Q0FBb0M7QUFDcEMsNkNBQXNFO0FBRXRFLE1BQU0sV0FBVyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQ3pCLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFDTCxNQUFNLEVBQUUsQ0FBQyxDQUFDLE1BQU07SUFDaEIsT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNO0lBQ2pCLEtBQUssRUFBRSxDQUFDLENBQUMsTUFBTTtJQUNmLFNBQVMsRUFBRSxDQUFDLENBQUMsTUFBTTtJQUNuQixRQUFRLEVBQUUsQ0FBQyxDQUFDLE1BQU07Q0FDbkIsQ0FBQyxDQUNILENBQUM7QUFJSyxLQUFLLFVBQVUsY0FBYyxDQUNsQyxPQUFlLEVBQ2YsSUFBSSxHQUFHLFlBQUssQ0FBQyxNQUFNLENBQUMsWUFBWTtJQUloQyxNQUFNLEdBQUcsR0FBRyxJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMxQixHQUFHLENBQUMsUUFBUSxHQUFHLFFBQVEsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQ3RDLEdBQUcsQ0FBQyxRQUFRLEdBQUcsU0FBUyxDQUFDO0lBRXpCLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUNoQyxNQUFNLEtBQUssR0FBRyxZQUFLLENBQUMsTUFBTSxDQUFDLHFCQUFxQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRTFELE9BQU8sZUFBSztTQUNULEdBQUcsQ0FBYyxRQUFRLEVBQUU7UUFDMUIsT0FBTyxFQUFFO1lBQ1AsYUFBYSxFQUFFLGdCQUFnQixLQUFLLEVBQUU7U0FDdkM7S0FDRixDQUFDO1NBQ0QsSUFBSSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDWixJQUFBLGVBQUksRUFDRixXQUFXLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFDNUIsSUFBQSxhQUFJLEVBQ0YsR0FBRyxFQUFFO1FBQ0gsTUFBTSxJQUFJLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO0lBQzlDLENBQUMsRUFDRCxDQUFDLElBQWlCLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FDNUIsQ0FDRixDQUNGLENBQUM7QUFDTixDQUFDO0FBOUJELHdDQThCQztBQUVNLEtBQUssVUFBVSw0QkFBNEIsQ0FDaEQsSUFBSSxHQUFHLFlBQUssQ0FBQyxNQUFNLENBQUMsWUFBWTtJQUtoQyxNQUFNLE1BQU0sR0FBRyxpQkFBVSxDQUFDLDBCQUEwQixDQUFDLEdBQUcsRUFBRSxDQUFDO0lBRTNELElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU07UUFBRSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekQsSUFBSSxJQUFJLElBQUksTUFBTSxDQUFDLElBQUk7UUFBRSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEQsSUFBSTtRQUNGLE1BQU0sSUFBSSxHQUFHLE1BQU0sb0JBQWEsQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUN2RSxNQUFNLE9BQU8sR0FBRyxNQUFNLGNBQWMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDLEtBQUssQ0FDOUQsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUNYLENBQUM7UUFDRixJQUFJLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPLEVBQUU7WUFDcEIsaUJBQVUsQ0FBQywwQkFBMEIsQ0FBQyxhQUFhLENBQUM7Z0JBQ2xELE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTzthQUN6QixDQUFDLENBQUM7U0FDSjtRQUNELE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUM7S0FDMUI7SUFBQyxNQUFNO1FBQ04sT0FBTyxJQUFJLENBQUM7S0FDYjtBQUNILENBQUM7QUF6QkQsb0VBeUJDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slicemachine/init",
-  "version": "1.0.2-alpha.33",
+  "version": "1.0.2-alpha.37",
   "license": "MIT",
   "description": "The easiest way to add Slice Machine to your project",
   "bin": {
@@ -46,7 +46,7 @@
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "@slicemachine/core": "1.0.2-alpha.33",
+    "@slicemachine/core": "1.0.2-alpha.37",
     "adm-zip": "^0.5.9",
     "analytics-node": "^6.0.0",
     "axios": "^0.24.0",
@@ -56,5 +56,5 @@
     "io-ts": "^2.2.16",
     "tmp": "^0.2.1"
   },
-  "gitHead": "9a0380ab52178798110fd40807c843399ed487a0"
+  "gitHead": "3905fa35d8f027fe7ff94c548ac43cb43ea73871"
 }

package/src/index.ts

@@ -53,14 +53,16 @@ async function init() {
     await createRepository(name, frameworkResult.value, config);
   }
 
-  const tracker = Tracker.build(
-    "JfTfmHaATChc4xueS7RcCBsixI71dJIJ",
-    name,
-    {
-      userId: user.userId,
-    },
-    isTrackingAvailable
-  );
+  const tracker = user.profile?.shortId
+    ? Tracker.build(
+        "JfTfmHaATChc4xueS7RcCBsixI71dJIJ",
+        name,
+        {
+          userId: user.profile.shortId,
+        },
+        isTrackingAvailable
+      )
+    : undefined;
 
   // install the required dependencies in the project.
   await installRequiredDependencies(cwd, frameworkResult.value);

package/src/steps/loginOrBypass.ts

@@ -1,14 +1,23 @@
-import { Utils, Auth } from "@slicemachine/core";
-import { UserInfo } from "@slicemachine/core/build/src/core/communication";
+import { Utils, Communication, Auth } from "@slicemachine/core";
+import {
+  validateSessionAndGetProfile,
+  UserProfile,
+} from "../utils/communication";
 
-export async function loginOrBypass(base: string): Promise<UserInfo | null> {
-  const user = await Auth.validateSession(base);
+export async function loginOrBypass(base: string): Promise<{
+  info: Communication.UserInfo;
+  profile: UserProfile | null;
+} | null> {
+  const user = await validateSessionAndGetProfile(base).catch((err) =>
+    console.log(err)
+  );
   if (user) {
-    Utils.writeCheck(`Logged in as ${Utils.bold(user.email)}`);
+    const email = user.info.email;
+    Utils.writeCheck(`Logged in as ${Utils.bold(email)}`);
     return user;
   } else {
     await Auth.login(base);
-    const user = await Auth.validateSession(base);
+    const user = await validateSessionAndGetProfile(base);
     return user;
   }
 }

package/src/utils/communication.ts

@@ -0,0 +1,76 @@
+import axios from "axios";
+import * as t from "io-ts";
+import { pipe } from "fp-ts/function";
+import { fold } from "fp-ts/Either";
+import { Utils, Communication, FileSystem } from "@slicemachine/core";
+
+const UserProfile = t.exact(
+  t.type({
+    userId: t.string,
+    shortId: t.string,
+    email: t.string,
+    firstName: t.string,
+    lastName: t.string,
+  })
+);
+
+export type UserProfile = t.TypeOf<typeof UserProfile>;
+
+export async function getUserProfile(
+  cookies: string,
+  base = Utils.CONSTS.DEFAULT_BASE
+): Promise<UserProfile> {
+  // note the auth server also provides a userId
+
+  const url = new URL(base);
+  url.hostname = `user.${url.hostname}`;
+  url.pathname = "profile";
+
+  const endpoint = url.toString();
+  const token = Utils.Cookie.parsePrismicAuthToken(cookies);
+
+  return axios
+    .get<UserProfile>(endpoint, {
+      headers: {
+        Authorization: `Bearer Token ${token}`,
+      },
+    })
+    .then((res) =>
+      pipe(
+        UserProfile.decode(res.data),
+        fold<t.Errors, UserProfile, UserProfile>(
+          () => {
+            throw new Error("Can't parse user profile");
+          },
+          (data: UserProfile) => data
+        )
+      )
+    );
+}
+
+export async function validateSessionAndGetProfile(
+  base = Utils.CONSTS.DEFAULT_BASE
+): Promise<{
+  info: Communication.UserInfo;
+  profile: UserProfile | null;
+} | null> {
+  const config = FileSystem.PrismicSharedConfigManager.get();
+
+  if (!config.cookies.length) return Promise.resolve(null); // default config, logged out.
+  if (base != config.base) return Promise.resolve(null); // not the same base so it doesn't
+
+  try {
+    const info = await Communication.validateSession(config.cookies, base);
+    const profile = await getUserProfile(config.cookies, base).catch(
+      () => null
+    );
+    if (profile?.shortId) {
+      FileSystem.PrismicSharedConfigManager.setProperties({
+        shortId: profile.shortId,
+      });
+    }
+    return { info, profile };
+  } catch {
+    return null;
+  }
+}