Skip to content
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.

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

Facebook stamp wip #94

Merged
merged 4 commits into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions app/.env-example.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# .env
NEXT_PUBLIC_DPOPP_GOOGLE_CLIENT_ID=MY-APP-ID.apps.googleusercontent.com
NEXT_PUBLIC_DPOPP_TWITTER_CLIENT_ID=ABC123456789
NEXT_PUBLIC_DPOPP_TWITTER_CALLBACK=http://localhost:3000/
NEXT_PUBLIC_DPOPP_FACEBOOK_APP_ID=123456789

NEXT_PUBLIC_DPOPP_IAM_URL=http://localhost:80/api/
NEXT_PUBLIC_DPOPP_PROCEDURE_URL=http://localhost:80/procedure/
Expand Down
5 changes: 5 additions & 0 deletions app/__test-fixtures__/databaseStorageFixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ export const twitterStampFixture: Stamp = {
credential,
};

export const facebookStampFixture: Stamp = {
provider: "Facebook",
credential,
};

export const passportFixture: Passport = {
issuanceDate: new Date("2022-01-01"),
expiryDate: new Date("2022-01-02"),
Expand Down
72 changes: 72 additions & 0 deletions app/__tests__/components/ProviderCards/FacebookCard.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import React from "react";
import { render, screen } from "@testing-library/react";
import { FacebookCard } from "../../../components/ProviderCards";

import { UserContext, UserContextState } from "../../../context/userContext";
import { mockAddress, mockWallet } from "../../../__test-fixtures__/onboardHookValues";
import { STAMP_PROVIDERS } from "../../../config/providers";
import { facebookStampFixture } from "../../../__test-fixtures__/databaseStorageFixtures";

jest.mock("../../../utils/onboard.ts");

const mockHandleConnection = jest.fn();
const mockCreatePassport = jest.fn();
const handleAddStamp = jest.fn();
const mockUserContext: UserContextState = {
loggedIn: true,
passport: undefined,
isLoadingPassport: false,
allProvidersState: {
Facebook: {
providerSpec: STAMP_PROVIDERS.Facebook,
stamp: undefined,
},
},
handleAddStamp: handleAddStamp,
handleCreatePassport: mockCreatePassport,
handleConnection: mockHandleConnection,
address: mockAddress,
wallet: mockWallet,
signer: undefined,
walletLabel: mockWallet.label,
};

describe("when user has not verfied with FacebookProvider", () => {
it("should display a facebook verification button", () => {
render(
<UserContext.Provider value={mockUserContext}>
<FacebookCard />
</UserContext.Provider>
);

const verifyFacebookButton = screen.queryByRole("button", {
name: /Verify/,
});

expect(verifyFacebookButton).toBeInTheDocument();
});
});

describe("when user has verified with FacebookProvider", () => {
it("should display that facebook is verified", () => {
render(
<UserContext.Provider
value={{
...mockUserContext,
allProvidersState: {
Facebook: {
providerSpec: STAMP_PROVIDERS.Facebook,
stamp: facebookStampFixture,
},
},
}}
>
<FacebookCard />
</UserContext.Provider>
);

const facebookVerified = screen.queryByText(/Verified/);

expect(facebookVerified).toBeInTheDocument();
});
});
4 changes: 4 additions & 0 deletions app/__tests__/pages/Dashboard.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ const mockUserContext: UserContextState = {
providerSpec: STAMP_PROVIDERS.POAP,
stamp: undefined,
},
Facebook: {
providerSpec: STAMP_PROVIDERS.Facebook,
stamp: undefined,
},
},
handleAddStamp: handleAddStamp,
handleCreatePassport: mockCreatePassport,
Expand Down
4 changes: 4 additions & 0 deletions app/__tests__/pages/Home.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ const mockUserContext: UserContextState = {
providerSpec: STAMP_PROVIDERS.POAP,
stamp: undefined,
},
Facebook: {
providerSpec: STAMP_PROVIDERS.Facebook,
stamp: undefined,
},
},
handleAddStamp: handleAddStamp,
handleCreatePassport: mockCreatePassport,
Expand Down
4 changes: 4 additions & 0 deletions app/__tests__/pages/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ const mockUserContext: UserContextState = {
providerSpec: STAMP_PROVIDERS.POAP,
stamp: undefined,
},
Facebook: {
providerSpec: STAMP_PROVIDERS.Facebook,
stamp: undefined,
},
},
handleAddStamp: handleAddStamp,
handleCreatePassport: mockCreatePassport,
Expand Down
3 changes: 2 additions & 1 deletion app/components/CardList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React from "react";

// --- Identity Providers
import { GoogleCard, SimpleCard, EnsCard, PohCard, TwitterCard, PoapCard } from "./ProviderCards";
import { GoogleCard, SimpleCard, EnsCard, PohCard, TwitterCard, PoapCard, FacebookCard } from "./ProviderCards";

export const CardList = (): JSX.Element => {
return (
Expand All @@ -15,6 +15,7 @@ export const CardList = (): JSX.Element => {
<TwitterCard />
<PohCard />
<PoapCard />
<FacebookCard />
</div>
</div>
</section>
Expand Down
4 changes: 2 additions & 2 deletions app/components/ProviderCards/EnsCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ export default function EnsCard(): JSX.Element {

return (
<Card
providerSpec={allProvidersState[providerId].providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId].stamp?.credential}
providerSpec={allProvidersState[providerId]!.providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId]!.stamp?.credential}
issueCredentialWidget={issueCredentialWidget}
/>
);
Expand Down
87 changes: 87 additions & 0 deletions app/components/ProviderCards/FacebookCard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// --- React Methods
import React, { useContext } from "react";

// --- Identity tools
import { fetchVerifiableCredential } from "@dpopp/identity/dist/commonjs";

// --- UserContext
import { UserContext } from "../../context/userContext";

// --- Style Components
import { Card } from "../Card";

import { PROVIDER_ID } from "@dpopp/types";
import { ProviderSpec } from "../../config/providers";

export interface ReactFacebookLoginInfo {
id: string;
userID: string;
accessToken: string;
name?: string | undefined;
email?: string | undefined;
picture?:
| {
data: {
height?: number | undefined;
is_silhouette?: boolean | undefined;
url?: string | undefined;
width?: number | undefined;
};
}
| undefined;
}

// import from .env
const iamUrl = process.env.NEXT_PUBLIC_DPOPP_IAM_URL || "";

const providerId: PROVIDER_ID = "Facebook";

export default function FacebookCard(): JSX.Element {
const { address, signer, handleAddStamp, allProvidersState } = useContext(UserContext);

const onClick = () => {
//@ts-ignore assuming FB.init was already called; see facebookSdkScript in pages/index.tsx
FB.login(function (response) {
if (response.status === "connected") {
onFacebookSignIn(response.authResponse);
}
});
};

const onFacebookSignIn = (response: ReactFacebookLoginInfo): void => {
// fetch the verifiable credential
fetchVerifiableCredential(
iamUrl,
{
type: "Facebook",
version: "0.0.0",
address: address || "",
proofs: {
accessToken: response.accessToken,
},
},
signer as { signMessage: (message: string) => Promise<string> }
)
.then((verified): void => {
handleAddStamp({
provider: "Facebook",
credential: verified.credential,
});
})
.catch((e): void => {
throw e;
});
};

return (
<Card
providerSpec={allProvidersState[providerId]!.providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId]!.stamp?.credential}
issueCredentialWidget={
<button className="verify-btn" onClick={onClick}>
Verify
</button>
}
/>
);
}
4 changes: 2 additions & 2 deletions app/components/ProviderCards/GoogleCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ export default function GoogleCard(): JSX.Element {

return (
<Card
providerSpec={allProvidersState[providerId].providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId].stamp?.credential}
providerSpec={allProvidersState[providerId]!.providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId]!.stamp?.credential}
issueCredentialWidget={
<GoogleLogin
clientId={googleClientId}
Expand Down
4 changes: 2 additions & 2 deletions app/components/ProviderCards/PohCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ export default function PohCard(): JSX.Element {

return (
<Card
providerSpec={allProvidersState[providerId].providerSpec}
verifiableCredential={allProvidersState[providerId].stamp?.credential}
providerSpec={allProvidersState[providerId]!.providerSpec}
verifiableCredential={allProvidersState[providerId]!.stamp?.credential}
issueCredentialWidget={issueCredentialWidget}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions app/components/ProviderCards/SimpleCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ export default function SimpleCard(): JSX.Element {

return (
<Card
providerSpec={allProvidersState[providerId].providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId].stamp?.credential}
providerSpec={allProvidersState[providerId]!.providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId]!.stamp?.credential}
issueCredentialWidget={issueCredentialWidget}
/>
);
Expand Down
4 changes: 2 additions & 2 deletions app/components/ProviderCards/TwitterCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ export default function TwitterCard(): JSX.Element {

return (
<Card
providerSpec={allProvidersState[providerId].providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId].stamp?.credential}
providerSpec={allProvidersState[providerId]!.providerSpec as ProviderSpec}
verifiableCredential={allProvidersState[providerId]!.stamp?.credential}
issueCredentialWidget={issueCredentialWidget}
/>
);
Expand Down
1 change: 1 addition & 0 deletions app/components/ProviderCards/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ export { default as EnsCard } from "./EnsCard";
export { default as PohCard } from "./PohCard";
export { default as TwitterCard } from "./TwitterCard";
export { default as PoapCard } from "./PoapCard";
export { default as FacebookCard } from "./FacebookCard";
4 changes: 4 additions & 0 deletions app/config/providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@ export const STAMP_PROVIDERS: Readonly<Providers> = {
name: "POAP",
description: "POAP Verification",
},
Facebook: {
name: "Facebook",
description: "Facebook name",
},
};
24 changes: 15 additions & 9 deletions app/context/userContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { EthereumAuthProvider } from "@self.id/web";
import { useViewerConnection } from "@self.id/framework";

export type AllProvidersState = {
[provider in PROVIDER_ID]: {
[provider in PROVIDER_ID]?: {
providerSpec: ProviderSpec;
stamp?: Stamp;
};
Expand Down Expand Up @@ -50,6 +50,10 @@ const startingAllProvidersState: AllProvidersState = {
providerSpec: STAMP_PROVIDERS.POAP,
stamp: undefined,
},
Facebook: {
providerSpec: STAMP_PROVIDERS.Facebook,
stamp: undefined,
},
};

export interface UserContextState {
Expand Down Expand Up @@ -208,14 +212,16 @@ export const UserContextProvider = ({ children }: { children: any }) => {
passport?.stamps.forEach((stamp: Stamp) => {
const { provider } = stamp;
const providerState = allProvidersState[provider];
const newProviderState = {
providerSpec: providerState.providerSpec,
stamp,
};
setAllProviderState((prevState) => ({
...prevState,
[provider]: newProviderState,
}));
if (providerState) {
const newProviderState = {
providerSpec: providerState.providerSpec,
stamp,
};
setAllProviderState((prevState) => ({
...prevState,
[provider]: newProviderState,
}));
}
});
// TODO remove providerstate on stamp removal
}, [passport]);
Expand Down
Loading