Skip to content

Migrate/figma auth storage #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 19, 2021
Merged

Migrate/figma auth storage #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
945b671
init
softmarshmallow Jul 19, 2021
629878e
migrated figma personal access token utils to @design-sdk/figma-auth-…
softmarshmallow Jul 19, 2021
707786a
update with figma-auth-store api
softmarshmallow Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions editor/components/figma/screen-importer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
parseFileAndNodeId,
FigmaTargetNodeConfig,
} from "@design-sdk/figma-url";
import { utils_figma } from "../../utils";
import { UserInputCache } from "../../utils/user-input-value-cache";
import { personal } from "@design-sdk/figma-auth-store";

export type OnImportedCallback = (reflect: nodes.ReflectSceneNode) => void;
type _OnPartiallyLoadedCallback = (pack: fetch.FigmaRemoteImportPack) => void;
Expand Down Expand Up @@ -58,7 +58,7 @@ function _DefaultImporterSegment(props: {
const handleOnLoadDefaultDesignClick = () => {
fetch
.fetchDemo({
personalAccessToken: utils_figma.figmaPersonalAccessToken_safe(),
personalAccessToken: personal.get_safe(),
})
.then((d) => {
// it's okay to force cast here. since the typings are the same (following official figma remote api spec)
Expand Down Expand Up @@ -99,7 +99,7 @@ function _UrlImporterSegment(props: {
setLoadState("loading");
fetch
.fetchTarget(figmaTargetConfig.file, figmaTargetConfig.node, {
personalAccessToken: utils_figma.figmaPersonalAccessToken_safe(),
personalAccessToken: personal.get_safe(),
})
.then((d) => {
setLoadState("complete");
Expand Down
3 changes: 2 additions & 1 deletion editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"dependencies": {
"@babel/runtime": "^7.14.0",
"@base-sdk/base": "^0.1.0-5",
"@design-sdk/figma-auth-store": "^0.0.1",
"@designto/code": "0.0.1",
"@emotion/core": "^11.0.0",
"@emotion/react": "^11.1.5",
Expand Down Expand Up @@ -51,4 +52,4 @@
"next-transpile-modules": "^7.0.0",
"typescript": "^4.2.3"
}
}
}
4 changes: 2 additions & 2 deletions editor/pages/figma/to-token.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import { useRouter } from "next/router";
import { extractFromFigmaQueryParams } from "../../query/from-figma";
import { Figma } from "@design-sdk/figma";
import { fetch } from "@design-sdk/figma-remote";
import { personal } from "@design-sdk/figma-auth-store";
import { DefaultEditorWorkspaceLayout } from "../../layout/default-editor-workspace-layout";
import { LayerHierarchy } from "../../components/editor-hierarchy";
import { WorkspaceContentPanelGridLayout } from "../../layout/panel/workspace-content-panel-grid-layout";
import { WorkspaceContentPanel } from "../../layout/panel";
import { WorkspaceBottomPanelDockLayout } from "../../layout/panel/workspace-bottom-panel-dock-layout";
import { utils_figma } from "../../utils";

export default function FigmaToReflectWidgetTokenPage() {
const [figmaNode, setFigmaNode] = useState<Figma.SceneNode>();
Expand All @@ -40,7 +40,7 @@ export default function FigmaToReflectWidgetTokenPage() {
setTargetnodeConfig(targetnodeconfig);
fetch
.fetchTargetAsReflect(targetnodeconfig.file, targetnodeconfig.node, {
personalAccessToken: utils_figma.figmaPersonalAccessToken_safe(),
personalAccessToken: personal.get_safe(),
})
.then((res) => {
setReflect(res.reflect);
Expand Down
8 changes: 4 additions & 4 deletions editor/pages/preferences/access-tokens.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import styled from "@emotion/styled";
import { TextField } from "@material-ui/core";
import { utils_figma } from "../../utils";
import { personal } from "@design-sdk/figma-auth-store";

export default function AccessTokenConfigurationPage_Dev() {
return (
Expand All @@ -19,7 +19,7 @@ export default function AccessTokenConfigurationPage_Dev() {
}

function FigmaSection() {
const initialToken = utils_figma.figmaPersonalAccessToken_safe();
const initialToken = personal.get_safe();
const [token, setToken] = useState(initialToken);

// this get set by input later
Expand All @@ -39,7 +39,7 @@ function FigmaSection() {
</button>
<button
onClick={() => {
utils_figma.clearToken();
personal.clear();
setToken(undefined);
}}
>
Expand All @@ -62,7 +62,7 @@ function FigmaSection() {
/>
<button
onClick={() => {
utils_figma.setFigmaPersonalAccessToken_LocalDev(tokenInput);
personal.set(tokenInput);
setToken(tokenInput);
}}
>
Expand Down
4 changes: 2 additions & 2 deletions editor/query/from-figma/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Figma, nodes, remote } from "@design-sdk/figma";
import { NextRouter, useRouter } from "next/router";
import { useEffect, useState } from "react";
import { fetch } from "@design-sdk/figma-remote";
import { utils_figma } from "../../utils";
import { personal } from "@design-sdk/figma-auth-store"
import { TargetNodeConfig as _TargetNodeConfig } from "../target-node";

const P_FIGMA_TARGET_URL = "figma_target_url";
Expand Down Expand Up @@ -72,7 +72,7 @@ export function useReflectTargetNode() {
if (figmaTargetNode) {
fetch
.fetchTargetAsReflect(figmaTargetNode.file, figmaTargetNode.node, {
personalAccessToken: utils_figma.figmaPersonalAccessToken_safe(),
personalAccessToken: personal.get_safe(),
})
.then((res) => {
setTargetNode(<TargetNodeConfig>{
Expand Down
4 changes: 2 additions & 2 deletions editor/query/to-code/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useEffect, useState } from "react";
import { DesignProvider, analyzeDesignUrl } from "@design-sdk/url-analysis";
import { parseFileAndNodeId } from "@design-sdk/figma-url";
import { fetch } from "@design-sdk/figma-remote";
import { utils_figma } from "../../utils";
import { personal } from "@design-sdk/figma-auth-store";
import { TargetNodeConfig } from "../target-node";
/**
* query param for design input
Expand Down Expand Up @@ -31,7 +31,7 @@ export function useDesign() {
targetnodeconfig.file,
targetnodeconfig.node,
{
personalAccessToken: utils_figma.figmaPersonalAccessToken_safe(),
personalAccessToken: personal.get_safe(),
}
)
.then((res) => {
Expand Down
47 changes: 0 additions & 47 deletions editor/utils/figma/figma-access-token.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion editor/utils/figma/index.ts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion editor/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * as utils_figma from "./figma";
export * as utils_dart from "./dart";
2 changes: 1 addition & 1 deletion packages/design-sdk
Open in desktop
Submodule design-sdk updated from 35bdec to 48db0e
2 changes: 1 addition & 1 deletion ui/editor-ui
Open in desktop
Submodule editor-ui updated from 46361d to 526f26
16 changes: 8 additions & 8 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,11 +1282,6 @@
exec-sh "^0.3.2"
minimist "^1.2.0"

"@design-sdk/figma-url@0.0.2":
version "0.0.2"
resolved "https://registry.yarnpkg.com/@design-sdk/figma-url/-/figma-url-0.0.2.tgz#6cdac717440def04f419efea080f95dae23e9d6f"
integrity sha512-BHxiY5OlX8OQNr/81NGo6pI8bm4c9M6s5vV+IJlQf9NFMKIoxv8fUZl0cuDvmQBloOC0HdVL09fPgIi0etVEvQ==

"@design-sdk/figma-url@^0.0.4":
version "0.0.4"
resolved "https://registry.yarnpkg.com/@design-sdk/figma-url/-/figma-url-0.0.4.tgz#a522d5aea17dcae92e849497c74d5f85fea42b1f"
Expand Down Expand Up @@ -3007,7 +3002,7 @@
dependencies:
"@types/istanbul-lib-report" "*"

"@types/jest@^26.0.23":
"@types/jest@^26.0.23", "@types/jest@^26.0.24":
version "26.0.24"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a"
integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==
Expand Down Expand Up @@ -6338,6 +6333,11 @@ dotenv-webpack@^1.8.0:
dependencies:
dotenv-defaults "^1.0.2"

dotenv@^10.0.0:
version "10.0.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==

dotenv@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
Expand Down Expand Up @@ -9471,7 +9471,7 @@ jest-worker@^27.0.6:
merge-stream "^2.0.0"
supports-color "^8.0.0"

jest@^27.0.3, jest@^27.0.4:
jest@^27.0.3, jest@^27.0.4, jest@^27.0.6:
version "27.0.6"
resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz#10517b2a628f0409087fbf473db44777d7a04505"
integrity sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==
Expand Down Expand Up @@ -14157,7 +14157,7 @@ ts-essentials@^2.0.3:
resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==

ts-jest@^27.0.2:
ts-jest@^27.0.2, ts-jest@^27.0.3:
version "27.0.3"
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.0.3.tgz#808492f022296cde19390bb6ad627c8126bf93f8"
integrity sha512-U5rdMjnYam9Ucw+h0QvtNDbc5+88nxt7tbIvqaZUhFrfG4+SkWhMXjejCLVGcpILTPuV+H3W/GZDZrnZFpPeXw==
Expand Down