Merge pull request #127 from gridaco/staging

(1/2) Assistant 2021.8 Release

Author: softmarshmallow

.github/workflows/tests.yaml

@@ -5,7 +5,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "12"
       - run: git submodule update --init --recursive
       - run: yarn
       - run: yarn test

.gitignore

@@ -4,3 +4,7 @@ dist
 .idea
 package.lock
 webdev/.eslintcache
+
+
+# we use yarn
+package-lock.json

app/README.md

@@ -1 +1 @@
-# Assistant shared ui library
+# Assistant shared app (ui) library

app/lib/about.ts

@@ -1,4 +1,4 @@
 // const _package = require("../package.jsonn");
-export const name = "Bridged Assistant";
-export const version = "2021.2.1f0"; /*_package.version*/
+export const name = "Grida Assistant";
+export const version = "2021.2.2f0"; /*_package.version*/
 export const versionText = `v${version}`;

app/lib/analytics/index.ts

@@ -7,7 +7,9 @@ export function initialize() {
     // const client_id = nanoid();
     // with proxy
     analytics.initWithProxy(
-      process.env.BRIDGED_FIRST_PARTY_ANALYTICS_PROXY_SERVICE_TOTP_SECRET
+      process.env.BRIDGED_FIRST_PARTY_ANALYTICS_PROXY_SERVICE_TOTP_SECRET ??
+        process.env
+          .NEXT_PUBLIC_BRIDGED_FIRST_PARTY_ANALYTICS_PROXY_SERVICE_TOTP_SECRET
     );
 
     analytics.initWithCors();

app/lib/app.css

@@ -1,11 +1,11 @@
 #create {
-    box-shadow: none;
-    background: #18a0fb;
-    color: white;
+  box-shadow: none;
+  background: #18a0fb;
+  color: white;
 }
 
 #create:focus {
-    box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3);
+  box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3);
 }
 
 h1,
@@ -16,29 +16,27 @@ h5,
 h6,
 sub,
 p {
-    font-family: "Roboto";
+  font-family: "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
 }
 
 .jss3 {
-    background-color: #000 !important;
+  background-color: #000 !important;
 }
 
-
 /* for selected tab under line color */
 
 .PrivateTabIndicator-colorSecondary-3 {
-    background-color: #000 !important;
+  background-color: #000 !important;
 }
 
-
 /* for tabs font color switch select */
 
 .MuiTab-textColorInherit.Mui-selected {
-    opacity: 1 !important;
-    font-weight: bold !important;
+  opacity: 1 !important;
+  font-weight: bold !important;
 }
 
 .MuiTab-textColorInherit {
-    opacity: 0.4 !important;
-    font-weight: initial !important;
-}
+  opacity: 0.4 !important;
+  font-weight: initial !important;
+}

app/lib/auth/README.md

@@ -0,0 +1,3 @@
+# First pary auth - do not modify under this directory unless you are a inside collaborator.
+
+> Cases for general contributing, you won't have to modify files under this directory.

app/lib/auth/index.ts

@@ -1,18 +1,67 @@
+import { __HOSTS } from "@base-sdk/core";
 import {
   __auth_proxy,
   ProxyAuthenticationMode,
-} from "@base-sdk/auth-first-party";
-import { __HOSTS } from "@base-sdk/core";
+  AuthProxySessionStartRequest,
+  AuthProxySessionStartResult,
+} from "@base-sdk-fp/auth";
+import { client_id } from "plugin-app";
+import { AuthStorage } from "./storage";
 
 const PROXY_AUTH_REQUEST_SECRET =
-  process.env.BRIDGED_FIRST_PARTY_PROXY_AUTH_REQUEST_TOTP_SECRET;
+  process.env.GRIDA_FIRST_PARTY_PROXY_AUTH_REQUEST_TOTP_SECRET ??
+  process.env.NEXT_PUBLIC_GRIDA_FIRST_PARTY_PROXY_AUTH_REQUEST_TOTP_SECRET;
+
+function _make_request(): AuthProxySessionStartRequest {
+  return {
+    appId: "co.grida.assistant",
+    clientId: client_id,
+    mode: ProxyAuthenticationMode.long_polling,
+    redirect_uri: "figma://", // TODO: change this scheme based on target platform.
+  };
+}
+
+export async function startAuthenticationSession(): Promise<AuthProxySessionStartResult> {
+  return __auth_proxy.openProxyAuthSession(
+    PROXY_AUTH_REQUEST_SECRET,
+    _make_request()
+  );
+}
+
+export async function startAuthenticationWithSession(
+  session: AuthProxySessionStartResult
+) {
+  const result = await __auth_proxy.requesetProxyAuthWithSession(
+    PROXY_AUTH_REQUEST_SECRET,
+    session,
+    _make_request()
+  );
+
+  AuthStorage.save(result.access_token);
+  // save result
+
+  return result;
+}
 
 export async function startAuthentication() {
-  const request = await __auth_proxy.requesetProxyAuth({
-    mode: ProxyAuthenticationMode.ws,
-    secret: PROXY_AUTH_REQUEST_SECRET,
-  });
+  const session = await startAuthenticationSession();
+  return await startAuthenticationWithSession(session);
+}
+
+export async function isAuthenticated() {
+  return (await AuthStorage.get())?.length > 1; // using 1 (same as != undefined.)
+}
+
+export async function checkAuthSession(session: string): Promise<boolean> {
+  // TODO:
+  const res = await __auth_proxy.checkProxyAuthResult(
+    PROXY_AUTH_REQUEST_SECRET,
+    session
+  );
 
-  // todo - build full url using method in base sdk
-  open(__HOSTS.INTERNAL_SECURE_ACCOUNTS_SERVICE_HOST);
+  const success = res.success && res.access_token !== undefined;
+  if (success) {
+    AuthStorage.save(res.access_token);
+  }
+  return success;
 }

app/lib/auth/no-auth-trial-manager.ts

@@ -1,3 +1,27 @@
 ////
 //// Manage the quota of app usage as on unauthenticated anonymous user.
 ////
+
+import { PluginSdk } from "@plugin-sdk/app";
+
+const _STATE_STORE_KEY = "trial-state-store-key";
+export class TrialManager {
+  private static _instance: TrialManager;
+  private state;
+  public static get instance(): TrialManager {
+    if (!TrialManager._instance) {
+      TrialManager._instance = new TrialManager();
+    }
+    return TrialManager._instance;
+  }
+
+  private constructor() {
+    this._loadstate();
+  }
+
+  async _loadstate() {
+    if (!this.state) {
+      this.state = await PluginSdk.getItem(_STATE_STORE_KEY);
+    }
+  }
+}

app/lib/auth/storage.ts

@@ -0,0 +1,23 @@
+///
+///
+///
+import { PluginSdk } from "@plugin-sdk/app";
+
+/** Preserve value: Do not change value */
+const _ASSISTANT_GRIDA_AUTHENTICATION_CREDENTIAL_KEY =
+  "co.grida.assistant/user-auth";
+
+type Credential = string;
+
+function saveAuthCredential(credential: Credential) {
+  PluginSdk.setItem(_ASSISTANT_GRIDA_AUTHENTICATION_CREDENTIAL_KEY, credential);
+}
+
+async function getAuthCredential(): Promise<Credential> {
+  return PluginSdk.getItem(_ASSISTANT_GRIDA_AUTHENTICATION_CREDENTIAL_KEY);
+}
+
+export const AuthStorage = {
+  save: saveAuthCredential,
+  get: getAuthCredential,
+};