- {sortBy(props.guildEnumeration.guildsList, 'id').map((guild) => (
+ {sortBy(props.guilds, 'id').map((guild) => (
-
+
diff --git a/src/design-system/molecules/nav-slug/NavSlug.tsx b/src/design-system/molecules/nav-slug/NavSlug.tsx
index 53b8c4f..c7dafa5 100644
--- a/src/design-system/molecules/nav-slug/NavSlug.tsx
+++ b/src/design-system/molecules/nav-slug/NavSlug.tsx
@@ -1,16 +1,23 @@
import * as React from 'react';
-import { Guild } from 'roleypoly/common/types';
+import { GoOrganization } from 'react-icons/go';
+import { GuildSlug } from 'roleypoly/common/types';
import { Avatar, utils } from 'roleypoly/design-system/atoms/avatar';
import { SlugContainer, SlugName } from './NavSlug.styled';
-import { GoOrganization } from 'react-icons/go';
type Props = {
- guild: Guild | null;
+ guild: GuildSlug | null;
};
export const NavSlug = (props: Props) => (
-
+
{props.guild ? utils.initialsFromName(props.guild.name) : }
{props.guild?.name || <>Your Guilds}
diff --git a/src/design-system/organisms/app-shell/AppShell.tsx b/src/design-system/organisms/app-shell/AppShell.tsx
index 3463faa..a283b78 100644
--- a/src/design-system/organisms/app-shell/AppShell.tsx
+++ b/src/design-system/organisms/app-shell/AppShell.tsx
@@ -1,27 +1,27 @@
import * as React from 'react';
-import * as Masthead from 'roleypoly/design-system/organisms/masthead';
-import { RoleypolyUser, GuildEnumeration } from 'roleypoly/common/types';
-import { Footer } from 'roleypoly/design-system/molecules/footer';
-import { Content, GlobalStyles } from './AppShell.styled';
-import { GlobalStyleColors } from 'roleypoly/design-system/atoms/colors';
import { Scrollbars } from 'react-custom-scrollbars';
+import { DiscordUser, GuildSlug } from 'roleypoly/common/types';
+import { GlobalStyleColors } from 'roleypoly/design-system/atoms/colors';
+import { Footer } from 'roleypoly/design-system/molecules/footer';
+import * as Masthead from 'roleypoly/design-system/organisms/masthead';
+import { Content, GlobalStyles } from './AppShell.styled';
-type AppShellProps = {
+export type AppShellProps = {
children: React.ReactNode;
- user: RoleypolyUser | null;
+ user?: DiscordUser;
showFooter?: boolean;
small?: boolean;
activeGuildId?: string | null;
- guildEnumeration?: GuildEnumeration;
+ guilds?: GuildSlug[];
};
export const AppShell = (props: AppShellProps) => (
<>
- {props.user !== null ? (
+ {props.user ? (
diff --git a/src/design-system/organisms/masthead/Authed.tsx b/src/design-system/organisms/masthead/Authed.tsx
index 31c5412..b501eb0 100644
--- a/src/design-system/organisms/masthead/Authed.tsx
+++ b/src/design-system/organisms/masthead/Authed.tsx
@@ -1,7 +1,13 @@
import Link from 'next/link';
import * as React from 'react';
import { GoOrganization } from 'react-icons/go';
-import { GuildEnumeration, RoleypolyUser } from 'roleypoly/common/types';
+import { Guilds } from 'roleypoly/backend-worker/utils/kv';
+import {
+ DiscordUser,
+ GuildEnumeration,
+ GuildSlug,
+ RoleypolyUser,
+} from 'roleypoly/common/types';
import { guildEnum } from 'roleypoly/common/types/storyData';
import { DynamicLogomark } from 'roleypoly/design-system/atoms/branding';
import { Popover } from 'roleypoly/design-system/atoms/popover';
@@ -20,9 +26,9 @@ import {
} from './Masthead.styled';
type Props = {
- user: RoleypolyUser;
+ user?: DiscordUser;
activeGuildId: string | null;
- guildEnumeration: GuildEnumeration;
+ guilds: GuildSlug[];
};
export const Authed = (props: Props) => {
@@ -47,9 +53,9 @@ export const Authed = (props: Props) => {
>
g.id === props.activeGuildId
- )?.guild || null
+ props.guilds.find(
+ (guild) => guild.id === props.activeGuildId
+ ) || null
}
/>
@@ -65,7 +71,7 @@ export const Authed = (props: Props) => {
active={serverPopoverState}
onExit={() => setServerPopoverState(false)}
>
-
+
@@ -76,9 +82,7 @@ export const Authed = (props: Props) => {
}}
hide={!userPopoverState}
>
- {props.user.discorduser && (
-
- )}
+ {props.user && }
}
@@ -87,9 +91,7 @@ export const Authed = (props: Props) => {
active={userPopoverState}
onExit={() => setUserPopoverState(false)}
>
- {props.user.discorduser && (
-
- )}
+ {props.user && }
diff --git a/src/design-system/templates/auth-login/AuthLogin.tsx b/src/design-system/templates/auth-login/AuthLogin.tsx
index db5ea74..f29a964 100644
--- a/src/design-system/templates/auth-login/AuthLogin.tsx
+++ b/src/design-system/templates/auth-login/AuthLogin.tsx
@@ -6,7 +6,7 @@ import * as React from 'react';
export type AuthLoginProps = PreauthProps;
export const AuthLogin = (props: AuthLoginProps) => (
-
+
diff --git a/src/design-system/templates/help-page/HelpPage.tsx b/src/design-system/templates/help-page/HelpPage.tsx
index ace8731..620bca6 100644
--- a/src/design-system/templates/help-page/HelpPage.tsx
+++ b/src/design-system/templates/help-page/HelpPage.tsx
@@ -1,15 +1,15 @@
import * as React from 'react';
import { AppShell } from 'roleypoly/design-system/organisms/app-shell';
import { HelpPageBase } from 'roleypoly/design-system/molecules/help-page-base';
-import { RoleypolyUser } from 'roleypoly/common/types';
+import { DiscordUser } from 'roleypoly/common/types';
type HelpPageProps = {
- user: RoleypolyUser | null;
+ user: DiscordUser | null;
children: React.ReactNode;
};
export const HelpPageTemplate = (props: HelpPageProps) => (
-
+
{props.children}
);
diff --git a/src/design-system/templates/landing/Landing.tsx b/src/design-system/templates/landing/Landing.tsx
index acf6562..c9d49d9 100644
--- a/src/design-system/templates/landing/Landing.tsx
+++ b/src/design-system/templates/landing/Landing.tsx
@@ -3,7 +3,7 @@ import { AppShell } from 'roleypoly/design-system/organisms/app-shell';
import { Landing } from 'roleypoly/design-system/organisms/landing';
export const LandingTemplate = () => (
-
+
);
diff --git a/src/design-system/templates/role-picker/RolePicker.tsx b/src/design-system/templates/role-picker/RolePicker.tsx
index fac4a3a..a022b53 100644
--- a/src/design-system/templates/role-picker/RolePicker.tsx
+++ b/src/design-system/templates/role-picker/RolePicker.tsx
@@ -6,11 +6,7 @@ import {
RolePickerProps,
} from 'roleypoly/design-system/organisms/role-picker';
-export type RolePickerTemplateProps = RolePickerProps & {
- user: RoleypolyUser;
- guildEnumeration?: GuildEnumeration;
- activeGuildId?: string;
-};
+export type RolePickerTemplateProps = RolePickerProps & AppShellProps;
export const RolePickerTemplate = (props: RolePickerTemplateProps) => {
const { user, ...pickerProps } = props;
@@ -18,7 +14,8 @@ export const RolePickerTemplate = (props: RolePickerTemplateProps) => {
diff --git a/src/functions/bot-join/README.md b/src/functions/bot-join/README.md
deleted file mode 100644
index ee12901..0000000
--- a/src/functions/bot-join/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Bot Join Bounce Service
-
-This function sends a user to the necessary Discord.com Bot OAuth flow.
-
-Two cases may be present:
-
-- General: The user will be sent to allow any of their relevant servers to join
- - This flow would be triggered from a generalized button
-- Specific: The user will be sent to join one of their servers.
- - This flow would be triggered from server picker
diff --git a/src/functions/bot-join/botjoin.go b/src/functions/bot-join/botjoin.go
deleted file mode 100644
index bafe9d3..0000000
--- a/src/functions/bot-join/botjoin.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package botjoin
-
-import (
- "bytes"
- "net/http"
- "regexp"
- "text/template"
-
- "github.com/roleypoly/roleypoly/src/common"
- "github.com/roleypoly/roleypoly/src/common/faas"
-)
-
-var (
- validGuildID = regexp.MustCompile(`^[0-9]+$`)
- redirectPathTemplate = template.Must(
- template.New("redirect").Parse(
- `https://discord.com/api/oauth2/authorize?client_id={{.ClientID}}&scope=bot&permissions={{.Permissions}}{{if .GuildID}}&guild_id={{.GuildID}}&disable_guild_select=true{{end}}`,
- ),
- )
- clientID = common.Getenv("BOT_CLIENT_ID").String()
-)
-
-type redirectPathData struct {
- ClientID string
- Permissions int
- GuildID string
-}
-
-func BotJoin(rw http.ResponseWriter, r *http.Request) {
- guildID := r.URL.Query().Get("guild")
- if !validGuildID.MatchString(guildID) {
- guildID = ""
- }
-
- pathData := redirectPathData{
- ClientID: clientID,
- Permissions: 268435456, // MANAGE_ROLES
- GuildID: guildID,
- }
-
- pathBuffer := bytes.Buffer{}
- redirectPathTemplate.Execute(&pathBuffer, pathData)
-
- faas.Bounce(rw, pathBuffer.String())
-}
diff --git a/src/functions/bot-join/botjoin_test.go b/src/functions/bot-join/botjoin_test.go
deleted file mode 100644
index 8dccbec..0000000
--- a/src/functions/bot-join/botjoin_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package botjoin_test
-
-import (
- "net/http/httptest"
- "testing"
-
- "github.com/onsi/gomega"
- botjoin "github.com/roleypoly/roleypoly/src/functions/bot-join"
-)
-
-func TestGeneral(t *testing.T) {
- O := gomega.NewWithT(t)
-
- req := httptest.NewRequest("GET", "/bot-join", nil)
- resp := httptest.NewRecorder()
-
- botjoin.BotJoin(resp, req)
-
- result := resp.Result()
- O.Expect(result.StatusCode).Should(gomega.BeIdenticalTo(303))
- O.Expect(result.Header.Get("location")).ShouldNot(gomega.ContainSubstring("guild_id"))
-
-}
-
-func TestGeneralSpecific(t *testing.T) {
- O := gomega.NewWithT(t)
-
- req := httptest.NewRequest("GET", "/bot-join?guild=386659935687147521", nil)
- resp := httptest.NewRecorder()
-
- botjoin.BotJoin(resp, req)
-
- result := resp.Result()
- O.Expect(result.StatusCode).Should(gomega.BeIdenticalTo(303))
- O.Expect(result.Header.Get("location")).Should(gomega.ContainSubstring("guild_id=386659935687147521"))
-}
diff --git a/src/functions/create-session/createsession.go b/src/functions/create-session/createsession.go
deleted file mode 100644
index 023fd0e..0000000
--- a/src/functions/create-session/createsession.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package createsession
-
-import (
- "context"
- "encoding/json"
- "net/http"
- "time"
-
- "cloud.google.com/go/firestore"
- "k8s.io/klog"
-
- "github.com/roleypoly/roleypoly/src/common"
- "github.com/roleypoly/roleypoly/src/common/types"
-)
-
-var (
- firestoreClient *firestore.Client
- projectID = common.Getenv("GCP_PROJECT_ID").String()
- firestoreEndpoint = common.Getenv("FIRESTORE_ENDPOINT").String()
-)
-
-func init() {
- var err error // shadow avoidance
-
- ctx := context.Background()
- firestoreClient, err = firestore.NewClient(ctx, projectID)
- if err != nil {
- panic(err)
- }
-}
-
-func CreateSession(rw http.ResponseWriter, req *http.Request) {
- requestData := types.CreateSessionRequest{}
- json.NewDecoder(req.Body).Decode(&requestData)
-
- klog.Info("Creating session...")
-
- sessionData := types.SessionData{
- AccessTokens: requestData.AccessTokenResponse,
- Fingerprint: requestData.Fingerprint,
- UserData: types.UserData{},
- }
-
- ctx, ctxCancel := context.WithTimeout(context.Background(), 15*time.Second)
- defer ctxCancel()
-
- docRef, _, err := firestoreClient.Collection("sessions").Add(ctx, sessionData)
- if err != nil {
- rw.WriteHeader(500)
- klog.Error("error: create session in firestore: ", err)
- }
-
- klog.Info("Created session ", docRef.ID)
-
- responseData := types.CreateSessionResponse{
- SessionID: docRef.ID,
- }
- json.NewEncoder(rw).Encode(responseData)
-}
diff --git a/src/functions/hello-world/helloworld.go b/src/functions/hello-world/helloworld.go
deleted file mode 100644
index 8d960ae..0000000
--- a/src/functions/hello-world/helloworld.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package helloworld
-
-import (
- "fmt"
- "net/http"
-)
-
-func HelloWorld(rw http.ResponseWriter, req *http.Request) {
- fmt.Fprintln(rw, "Hello "+req.RemoteAddr+"!")
-}
diff --git a/src/functions/hello-world/helloworld.ts b/src/functions/hello-world/helloworld.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/src/functions/login-bounce/loginbounce.go b/src/functions/login-bounce/loginbounce.go
deleted file mode 100644
index d97c8df..0000000
--- a/src/functions/login-bounce/loginbounce.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package loginbounce
-
-import (
- "bytes"
- "net/http"
- "text/template"
-
- "github.com/segmentio/ksuid"
-
- "github.com/roleypoly/roleypoly/src/common"
- "github.com/roleypoly/roleypoly/src/common/faas"
-)
-
-var (
- redirectPathTemplate = template.Must(
- template.New("redirect").Parse(
- `https://discord.com/api/oauth2/authorize?client_id={{.ClientID}}&response_type=code&scope=identify%20guilds&redirect_uri={{urlquery .RedirectURI}}&state={{.State}}`,
- ),
- )
- clientID = common.Getenv("BOT_CLIENT_ID").String()
- redirectURI = common.Getenv("OAUTH_REDIRECT_URI").String()
-)
-
-type redirectPathData struct {
- ClientID string
- RedirectURI string
- State string
-}
-
-func LoginBounce(rw http.ResponseWriter, r *http.Request) {
- faas.Stash(rw, r.URL.Query().Get("redirect_url"))
-
- pathData := redirectPathData{
- ClientID: clientID,
- RedirectURI: redirectURI,
- State: ksuid.New().String(),
- }
-
- pathBuffer := bytes.Buffer{}
- redirectPathTemplate.Execute(&pathBuffer, pathData)
-
- faas.Bounce(rw, pathBuffer.String())
-}
diff --git a/src/functions/login-bounce/loginbounce_test.go b/src/functions/login-bounce/loginbounce_test.go
deleted file mode 100644
index 83899f9..0000000
--- a/src/functions/login-bounce/loginbounce_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package loginbounce_test
-
-import (
- "net/http/httptest"
- "testing"
-
- "github.com/onsi/gomega"
- loginbounce "github.com/roleypoly/roleypoly/src/functions/login-bounce"
-)
-
-func TestBounce(t *testing.T) {
- O := gomega.NewWithT(t)
-
- req := httptest.NewRequest("GET", "/login-bounce?redirect_url=https://localhost:6600/test", nil)
- rw := httptest.NewRecorder()
-
- loginbounce.LoginBounce(rw, req)
-
- resp := rw.Result()
-
- O.Expect(resp.StatusCode).Should(gomega.BeIdenticalTo(303))
- O.Expect(resp.Header.Get("location")).Should(gomega.ContainSubstring("identify,guild"))
- O.Expect(resp.Header.Get("set-cookie")).Should(gomega.ContainSubstring("https://localhost:6600/test"))
-}
diff --git a/src/functions/login-handler/loginhandler.go b/src/functions/login-handler/loginhandler.go
deleted file mode 100644
index 559195b..0000000
--- a/src/functions/login-handler/loginhandler.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package loginhandler
-
-import (
- "bytes"
- "encoding/json"
- "net/http"
- "net/url"
- "time"
-
- "github.com/roleypoly/roleypoly/src/common"
- "github.com/roleypoly/roleypoly/src/common/faas"
- "github.com/roleypoly/roleypoly/src/common/types"
- "github.com/segmentio/ksuid"
- "k8s.io/klog"
-)
-
-var (
- // HTTPClient is an overridable HTTP client with a 15 second timeout
- HTTPClient = http.Client{Timeout: 15 * time.Second}
- uiPath = common.Getenv("UI_PUBLIC_URI").SafeURL()
- apiPath = common.Getenv("API_PUBLIC_URI").SafeURL()
- clientID = common.Getenv("BOT_CLIENT_ID").String()
- clientSecret = common.Getenv("BOT_CLIENT_SECRET").String()
- redirectURI = common.Getenv("OAUTH_REDIRECT_URI").String()
-)
-
-func LoginHandler(rw http.ResponseWriter, req *http.Request) {
- query := req.URL.Query()
-
- state := query.Get("state")
- stateID, err := ksuid.Parse(state)
- if err != nil || stateID.IsNil() || stateID.Time().Add(5*time.Minute).Before(time.Now()) {
- faas.Bounce(rw, uiPath+"/machinery/error?error_code=auth_failure")
- return
- }
-
- code := query.Get("code")
-
- body := url.Values{}
- body.Set("client_id", clientID)
- body.Set("client_secret", clientSecret)
- body.Set("grant_type", "authorization_code")
- body.Set("code", code)
- body.Set("redirect_uri", redirectURI)
- body.Set("scope", "identify guilds")
-
- response, err := HTTPClient.PostForm("https://discord.com/api/v8/oauth2/token", body)
- if err != nil {
- klog.Error("token fetch failed: ", err)
- faas.Bounce(rw, uiPath+"/machinery/error?error_code=auth_failure")
- return
- }
-
- tokens := types.AccessTokenResponse{}
- json.NewDecoder(response.Body).Decode(&tokens)
-
- sessionRequest := types.CreateSessionRequest{
- AccessTokenResponse: tokens,
- Fingerprint: faas.Fingerprint(req),
- }
-
- buf := bytes.Buffer{}
- json.NewEncoder(&buf).Encode(sessionRequest)
-
- response, err = HTTPClient.Post(apiPath+"/create-session", "application/json", &buf)
- if err != nil {
- klog.Error("create session failed: ", err)
- faas.Bounce(rw, uiPath+"/machinery/error?error_code=auth_failure")
- return
- }
-
- session := types.CreateSessionResponse{}
- json.NewDecoder(response.Body).Decode(&session)
-
- faas.Bounce(rw, uiPath+"/machinery/new-session?session_id="+session.SessionID)
-}
diff --git a/src/functions/session-data/client/client.go b/src/functions/session-data/client/client.go
deleted file mode 100644
index e69de29..0000000
diff --git a/src/functions/session-data/session-data.go b/src/functions/session-data/session-data.go
deleted file mode 100644
index 791ea35..0000000
--- a/src/functions/session-data/session-data.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package sessiondata
-
-import (
- "fmt"
- "net/http"
-)
-
-func SessionData(rw http.ResponseWriter, r *http.Request) {
- fmt.Fprintln(rw, "Hello world!")
-}
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 5fb5493..fcc3791 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -1,11 +1,36 @@
-import { AppProps } from 'next/app';
+import NextApp, { AppContext, AppProps } from 'next/app';
import * as React from 'react';
import { InjectTypekitFont } from 'roleypoly/design-system/atoms/fonts';
+import nookies from 'nookies';
+import { AuthProvider } from 'roleypoly/providers/auth/AuthContext';
-const App = (props: AppProps) => (
+type Props = AppProps & {
+ sessionKey: string | null;
+};
+
+const App = (props: Props) => (
<>
-
+
+
+
);
export default App;
+
+export const getInitialProps = async (context: AppContext) => {
+ let sessionKey: string | null = null;
+
+ if (context.ctx.req) {
+ const key = nookies.get(context.ctx)['rp_session_key'];
+ if (key) {
+ sessionKey = key;
+ }
+ } else {
+ sessionKey = sessionStorage.getItem('session_key');
+ }
+
+ const pageProps = await NextApp.getInitialProps(context);
+
+ return { ...pageProps, sessionKey };
+};
diff --git a/src/pages/machinery/new-session.tsx b/src/pages/machinery/new-session.tsx
index 1da47f2..1576189 100644
--- a/src/pages/machinery/new-session.tsx
+++ b/src/pages/machinery/new-session.tsx
@@ -1,5 +1,9 @@
import { NextPageContext } from 'next';
import * as React from 'react';
+import nookies from 'nookies';
+import { AppShell } from 'roleypoly/design-system/organisms/app-shell';
+import { Hero } from 'roleypoly/design-system/atoms/hero';
+import { AccentTitle } from 'roleypoly/design-system/atoms/typography';
type Props = {
sessionID: string;
@@ -9,19 +13,33 @@ const NewSession = (props: Props) => {
const { sessionID } = props;
React.useEffect(() => {
sessionStorage.setItem('session_key', sessionID);
+
location.href = '/';
}, [sessionID]);
- return Logging you in...
;
+ return (
+
+
+ Logging you in...
+
+
+ );
};
-NewSession.getInitialProps = (context: NextPageContext): Props => {
- const sessionID = context.query.session_id;
+export const getServerSideProps = (context: NextPageContext): { props: Props } => {
+ const sessionID = context.query.session_id as string;
if (!sessionID) {
throw new Error("I shouldn't be here today.");
}
- return { sessionID: sessionID as string };
+ nookies.set(context, 'rp_session_key', sessionID, {
+ httpOnly: true,
+ maxAge: 60 * 60 * 6,
+ path: '/',
+ sameSite: 'strict',
+ });
+
+ return { props: { sessionID } };
};
export default NewSession;
diff --git a/src/providers/auth/AuthContext.tsx b/src/providers/auth/AuthContext.tsx
new file mode 100644
index 0000000..eaf7224
--- /dev/null
+++ b/src/providers/auth/AuthContext.tsx
@@ -0,0 +1,40 @@
+import * as React from 'react';
+
+type AuthContextType = {
+ sessionKey: string | null;
+ setSessionKey: (value: string | null) => void;
+};
+
+type Props = {
+ sessionKey: string | null;
+ children: React.ReactNode;
+};
+
+const AuthContext = React.createContext({
+ sessionKey: null,
+ setSessionKey: () => {},
+});
+
+export const AuthProvider = (props: Props) => {
+ const [sessionKey, setSessionKey] = React.useState(props.sessionKey);
+
+ return (
+
+ {props.children}
+
+ );
+};
+
+export const useAuth = () => {
+ const authCtx = React.useContext(AuthContext);
+ if (!authCtx) {
+ throw new Error('useAuth used without AuthProvider');
+ }
+
+ return authCtx;
+};
+
+export const isAuthenticated = () => {
+ const authCtx = useAuth();
+ return authCtx.sessionKey !== null;
+};
diff --git a/src/providers/auth/index.ts b/src/providers/auth/index.ts
new file mode 100644
index 0000000..dc39de3
--- /dev/null
+++ b/src/providers/auth/index.ts
@@ -0,0 +1 @@
+export * from './AuthContext';
diff --git a/yarn.lock b/yarn.lock
index 6932979..8c41402 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3791,6 +3791,11 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+base-convert-int-array@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/base-convert-int-array/-/base-convert-int-array-1.0.1.tgz#5b4ddbfa72d2d3b5f75dd86cd32fe3dc8e7e81fe"
+ integrity sha512-NWqzaoXx8L/SS32R+WmKqnQkVXVYl2PwNJ68QV3RAlRRL1uV+yxJT66abXI1cAvqCXQTyXr7/9NN4Af90/zDVw==
+
base64-js@^1.0.2, base64-js@^1.3.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -4708,6 +4713,11 @@ cookie@0.4.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+cookie@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+ integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
copy-concurrently@^1.0.0:
version "1.0.5"
resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -8025,6 +8035,14 @@ isobject@^4.0.0:
resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
+isomorphic-unfetch@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f"
+ integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==
+ dependencies:
+ node-fetch "^2.6.1"
+ unfetch "^4.2.0"
+
isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -8839,6 +8857,13 @@ known-css-properties@^0.20.0:
resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.20.0.tgz#0570831661b47dd835293218381166090ff60e96"
integrity sha512-URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw==
+ksuid@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ksuid/-/ksuid-2.0.0.tgz#83618ce67b235bb5f41c04cb914a2605e1ffca5a"
+ integrity sha512-BM5UU56FhzqQN6v83X8JSKWktl0gAYRovV0DnO/mXpuOs/SFMTPP7fr7ViNtzpg3iV4pnk/6pChuLhOkKBZ59A==
+ dependencies:
+ base-convert-int-array "^1.0.1"
+
lazy-universal-dotenv@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lazy-universal-dotenv/-/lazy-universal-dotenv-3.0.1.tgz#a6c8938414bca426ab8c9463940da451a911db38"
@@ -9769,7 +9794,7 @@ node-fetch@2.6.0:
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-node-fetch@2.6.1, node-fetch@^2.6.0:
+node-fetch@2.6.1, node-fetch@^2.6.0, node-fetch@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -9837,6 +9862,14 @@ node-releases@^1.1.52, node-releases@^1.1.65, node-releases@^1.1.67:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
+nookies@^2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/nookies/-/nookies-2.5.0.tgz#00c78ac9a91c3af82ab4bc8b193ad7bd41ee7aa5"
+ integrity sha512-yFIKz80h6SRqO1a6fcgO7D2qfnXAjXmGftPw5KrMWH+zGm1xHvyHyZ93z1yul9snwG/9LLvSY8pyZ3G5s6/UJQ==
+ dependencies:
+ cookie "^0.4.1"
+ set-cookie-parser "^2.4.6"
+
noop-logger@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
@@ -12039,6 +12072,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+set-cookie-parser@^2.4.6:
+ version "2.4.6"
+ resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.4.6.tgz#43bdea028b9e6f176474ee5298e758b4a44799c3"
+ integrity sha512-mNCnTUF0OYPwYzSHbdRdCfNNHqrne+HS5tS5xNb6yJbdP9wInV0q5xPLE0EyfV/Q3tImo3y/OXpD8Jn0Jtnjrg==
+
set-value@^2.0.0, set-value@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -13427,7 +13465,7 @@ typescript@^4.1.2:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
-unfetch@^4.1.0:
+unfetch@^4.1.0, unfetch@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
@@ -13719,7 +13757,7 @@ uuid@^7.0.3:
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
-uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.1:
+uuid@^8.0.0, uuid@^8.3.0:
version "8.3.1"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==