Skip to content
This repository has been archived by the owner on Mar 12, 2024. It is now read-only.

Commit

Permalink
Fix/typings improvements (#183)
Browse files Browse the repository at this point in the history 
* Add typings

* Fix possible nulls

* Add LoginGridProps type

* Fix possible null

* remove breaklines

* Add export

* Add import
  • Loading branch information
@EstebanDalelR
EstebanDalelR committed Jun 24, 2023
1 parent 121c944 commit 8491472
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 32 deletions.
4 changes: 2 additions & 2 deletions components/Header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Image from "next/image";
import { useSession, signOut } from "next-auth/react";
import { useEffect, useState } from "react";
export default function Header() {
const [userEmail, setUserEmail] = useState(null);
const [userEmail, setUserEmail] = useState<string | null | undefined>(null);
const { data } = useSession();

useEffect(() => {
Expand Down Expand Up @@ -47,7 +47,7 @@ export default function Header() {
className="dropdown-item"
href={`vscode://watermelontools.watermelon-tools?email=${
userEmail ?? ""
}&token=${data?.user.name ? data.user.name : ""}`}
}&token=${data?.user?.name ? data.user.name : ""}`}
>
VSCode Extension
</a>
Expand Down
29 changes: 22 additions & 7 deletions components/loginGrid.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,30 @@ import DiscordLoginLink from "./DiscordLoginLink";
import NotionLoginLink from "./NotionLoginLink";
import getAllUserData from "../utils/api/getAllUserData";
import getPaymentInfo from "../utils/api/getPaymentInfo";
type LoginGridProps = {
userEmail: string;
user_displayname: string;
};

function LoginGrid({ userEmail }) {
const [jiraUserData, setJiraUserData] = useState(null);
const [githubUserData, setGithubUserData] = useState(null);
const [bitbucketUserData, setBitbucketUserData] = useState(null);
const [gitlabUserData, setGitlabUserData] = useState(null);
const [slackUserData, setSlackUserData] = useState(null);
const [discordUserData, setDiscordUserData] = useState(null);
const [notionUserData, setNotionUserData] = useState(null);
const [jiraUserData, setJiraUserData] = useState<LoginGridProps | null>(null);
const [githubUserData, setGithubUserData] = useState<LoginGridProps | null>(
null
);
const [bitbucketUserData, setBitbucketUserData] =
useState<LoginGridProps | null>(null);
const [gitlabUserData, setGitlabUserData] = useState<LoginGridProps | null>(
null
);
const [slackUserData, setSlackUserData] = useState<LoginGridProps | null>(
null
);
const [discordUserData, setDiscordUserData] = useState<LoginGridProps | null>(
null
);
const [notionUserData, setNotionUserData] = useState<LoginGridProps | null>(
null
);
const [hasPaid, setHasPaid] = useState(false);

useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion components/logout-btn.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export default function Component() {
const { data: session } = useSession();
return (
<>
<p>Signed in as {session.user.email}</p>
<p>Signed in as {session?.user?.email}</p>
<button className="btn" onClick={() => signOut()}>
Sign out
</button>
Expand Down
1 change: 1 addition & 0 deletions pages/api/actions/github.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import githubMarkdown from "../../../utils/actions/markdownHelpers/github";
import jiraMarkdown from "../../../utils/actions/markdownHelpers/jira";
import slackMarkdown from "../../../utils/actions/markdownHelpers/slack";
import notionMarkdown from "../../../utils/actions/markdownHelpers/notion";
import countMarkdown from "../../../utils/actions/markdownHelpers/count";

const app = new App({
appId: process.env.GITHUB_APP_ID,
Expand Down
1 change: 1 addition & 0 deletions utils/actions/markdownHelpers/count.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ const countMarkdown = ({
}
return textToWrite;
};
export default countMarkdown;
33 changes: 11 additions & 22 deletions utils/auth/adapter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ export default function MyAdapter(): Adapter {
},
async getUser(id): Promise<AdapterUser> {
let userData = await executeRequest(
`EXEC [dbo].[get_user] @id = '${id}';
`
`EXEC [dbo].[get_user] @id = '${id}';`
);
if (!userData.email) {
return null;
Expand All @@ -67,8 +66,7 @@ export default function MyAdapter(): Adapter {
},
async getUserByEmail(email): Promise<AdapterUser> {
let userData = await executeRequest(
`EXEC [dbo].[get_user_by_email] @email = '${email}';
`
`EXEC [dbo].[get_user_by_email] @email = '${email}';`
);
if (!userData.email) {
return null;
Expand All @@ -86,8 +84,7 @@ export default function MyAdapter(): Adapter {
provider,
}): Promise<AdapterUser> {
let userData = await executeRequest(
`EXEC [dbo].[get_user_by_account] @providerAccountId = '${providerAccountId}', @provider = '${provider}';
`
`EXEC [dbo].[get_user_by_account] @providerAccountId = '${providerAccountId}', @provider = '${provider}';`
);
if (!userData.email) {
return null;
Expand All @@ -103,8 +100,7 @@ export default function MyAdapter(): Adapter {
user.email ? `@email = '${user.email}',` : ""
} ${
user.name ? `@name = '${user.name}',` : ""
} @emailVerified = '${makeISO(user.emailVerified)}';
`
} @emailVerified = '${makeISO(user.emailVerified)}';`
);
return {
id: updatedUser.id,
Expand All @@ -120,8 +116,7 @@ export default function MyAdapter(): Adapter {
},
async linkAccount(account): Promise<void> {
await executeRequest(
`EXEC [dbo].[create_account] @user_id = '${account.id}', @provider_type = '${account.provider}', @provider_id = '${account.provider_id}, @provider_account_id = '${account.providerAccountId}', @access_token ='${account.access_token}', @refresh_token = '${account.refresh_token}', @scopes = '${account.scopes}', @access_token_expires = '${account.expires_in}';
`
`EXEC [dbo].[create_account] @user_id = '${account.id}', @provider_type = '${account.provider}', @provider_id = '${account.provider_id}, @provider_account_id = '${account.providerAccountId}', @access_token ='${account.access_token}', @refresh_token = '${account.refresh_token}', @scopes = '${account.scopes}', @access_token_expires = '${account.expires_in}';`
);
},
async unlinkAccount({ providerAccountId, provider }): Promise<void> {
Expand All @@ -135,8 +130,7 @@ export default function MyAdapter(): Adapter {
let createdSession = await executeRequest(
`EXEC [dbo].[create_session] @session_token = '${sessionToken}', @userId = '${userId}', @expires = '${new Date(
expires
).toISOString()}';
`
).toISOString()}';`
);
return {
id: createdSession.id as string,
Expand All @@ -149,8 +143,7 @@ export default function MyAdapter(): Adapter {
sessionToken
): Promise<{ session: AdapterSession; user: AdapterUser }> {
let fetchedSession = await executeRequest(
`EXEC [dbo].[get_session] @sessionToken = '${sessionToken}';
`
`EXEC [dbo].[get_session] @sessionToken = '${sessionToken}';`
);
let fetchedUser = await executeRequest(
`EXEC [dbo].[get_user] @id = '${fetchedSession.user_id}';`
Expand Down Expand Up @@ -180,8 +173,7 @@ export default function MyAdapter(): Adapter {
let updatedSession = await executeRequest(
`EXEC [dbo].[update_session] @session_token = '${sessionToken}', @userId = '${userId}', @expires = '${new Date(
expires
).toISOString()}';
`
).toISOString()}';`
);
const session = {
id: updatedSession.id as string,
Expand All @@ -193,8 +185,7 @@ export default function MyAdapter(): Adapter {
},
async deleteSession(sessionToken): Promise<AdapterSession> {
let deletedSession = await executeRequest(
`EXEC [dbo].[delete_session] @sessionToken = '${sessionToken}';
`
`EXEC [dbo].[delete_session] @sessionToken = '${sessionToken}';`
);
const session = {
id: deletedSession.id as string,
Expand All @@ -212,17 +203,15 @@ export default function MyAdapter(): Adapter {
return await executeRequest(
`EXEC [dbo].[create_verification_token] @identifier = '${identifier}', @expires = '${new Date(
expires
).toISOString()}', @token = '${token}';
`
).toISOString()}', @token = '${token}';`
);
},
async useVerificationToken({
identifier,
token,
}): Promise<VerificationToken> {
return await executeRequest(
`EXEC [dbo].[delete_verification_token] @identifier = '${identifier}', @token = '${token}';
`
`EXEC [dbo].[delete_verification_token] @identifier = '${identifier}', @token = '${token}';`
);
},
};
Expand Down

1 comment on commit 8491472

@vercel
Copy link

@vercel vercel bot commented on 8491472 Jun 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

watermelon – ./

watermelon-watermelontools.vercel.app
watermelon-git-main-watermelontools.vercel.app
app.watermelontools.com
watermelon-nine.vercel.app

Please sign in to comment.