@restorecommerce/facade 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.2.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.2.1...@restorecommerce/facade@0.2.2) (2022-02-15)
+
+
+### Bug Fixes
+
+* store facade token in cookies ([5fe1b53](https://github.com/restorecommerce/libs/commit/5fe1b538955993f6d20626968699867f0120589c))
+
+
+
+
+
 ## [0.2.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/facade@0.2.0...@restorecommerce/facade@0.2.1) (2022-02-14)
 
 

package/debug-run.ts

@@ -15,7 +15,7 @@ import {
   ostorageModule,
   paymentModule,
   schedulingModule
-} from './dist';
+} from './src';
 import { join } from 'path';
 
 const CONFIG_PATH = __dirname;

package/dist/modules/identity/oauth/oauth.js

@@ -17,10 +17,35 @@ const createOAuth = () => {
         ctx.body = await exports.login((await ctx.identitySrvClient.oauth.GenerateLinks({})).links);
         return next();
     });
+    router.get('/oauth2-logout', async (ctx, next) => {
+        ctx.cookies.set('token', undefined);
+        ctx.status = 303;
+        ctx.redirect('/oauth2-login');
+        ctx.body = 'Redirecting to login page';
+        return next();
+    });
     router.get('/oauth2-urls', async (ctx, next) => {
         ctx.body = (await ctx.identitySrvClient.oauth.GenerateLinks({})).links;
         return next();
     });
+    router.get('/oauth2-account', async (ctx, next) => {
+        const token = ctx.cookies.get('token');
+        if (!token) {
+            ctx.body = 'user not logged in';
+            return next();
+        }
+        const ids = ctx.identitySrvClient;
+        const user = await ids.user.FindByToken({
+            token: token
+        });
+        if (!user || !user.payload) {
+            ctx.body = 'user not logged in';
+            return next();
+        }
+        ctx.type = 'html';
+        ctx.body = await exports.account(user.payload);
+        return next();
+    });
     router.post('/oauth2-register', async (ctx, next) => {
         const ids = ctx.identitySrvClient;
         const body = ctx.request.body;
@@ -34,8 +59,11 @@ const createOAuth = () => {
             guest: false,
         }));
         if (user.payload) {
-            ctx.type = 'html';
-            ctx.body = await exports.account(user.payload);
+            const token = await upsertUserToken(ids, user.payload.id);
+            ctx.cookies.set('token', token);
+            ctx.status = 303;
+            ctx.redirect('/oauth2-account');
+            ctx.body = 'Redirecting to account page';
             return next();
         }
         if (user.status) {
@@ -50,7 +78,6 @@ const createOAuth = () => {
             code: ctx.request.query['code'],
             state: ctx.request.query['state']
         });
-        console.log(user);
         if (!user.user || !user.user.payload || (user.user.status && user.user.status.code !== 200)) {
             if (user.email) {
                 ctx.type = 'html';
@@ -62,26 +89,32 @@ const createOAuth = () => {
                 return next();
             }
         }
-        const token = utils_1.nanoid();
-        // 1 Month
-        const expiresIn = Date.now() + (1000 * 60 * 60 * 24 * 30);
-        await ids.token.upsert({
-            id: uuid.v4().replace(/-/g, ''),
-            type: 'access_token',
-            expiresIn: expiresIn,
-            payload: utils_1.marshallProtobufAny({
-                accountId: user.user.payload.id,
-                exp: expiresIn,
-                jti: token
-            })
-        });
-        ctx.type = 'html';
-        ctx.body = await exports.account(user.user.payload);
+        const token = await upsertUserToken(ids, user.user.payload.id);
+        ctx.cookies.set('token', token);
+        ctx.status = 303;
+        ctx.redirect('/oauth2-account');
+        ctx.body = 'Redirecting to account page';
         return next();
     });
     return router;
 };
 exports.createOAuth = createOAuth;
+const upsertUserToken = async (ids, accountId) => {
+    const token = utils_1.nanoid();
+    // 1 Month
+    const expiresIn = Date.now() + (1000 * 60 * 60 * 24 * 30);
+    await ids.token.upsert({
+        id: uuid.v4().replace(/-/g, ''),
+        type: 'access_token',
+        expiresIn: expiresIn,
+        payload: utils_1.marshallProtobufAny({
+            accountId: accountId,
+            exp: expiresIn,
+            jti: token
+        })
+    });
+    return token;
+};
 let layoutHbs;
 const layout = async (context) => {
     if (!layoutHbs) {

package/dist/modules/identity/oauth/views/account.hbs

@@ -16,8 +16,12 @@
 <div class="rc-login flex col justify-center">
   <div class="self-center justify-center rc-account scale110p">
     <h2>{{title}}</h2>
-    <div class="row center justify-center">
+    <div class="col center justify-center">
       <h3>Welcome {{user.firstName}} {{user.lastName}}!</h3>
+
+      <a href="/oauth2-logout" class="button emphasized">
+        <div class="icogram"><span class="text">Logout</span></div>
+      </a>
     </div>
   </div>
 </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/facade",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Facade for Restorecommerce microservices",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -106,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e97bbfe2fe8166dfe1cd47ae60bce54347a4f1c9"
+  "gitHead": "a3e82fe9170e6bd988d722af28d212e0ec87d8b4"
 }