fix: fixed the user type error in auth.service file
This commit is contained in:
6335
packages/hoppscotch-backend/pnpm-lock.yaml
generated
6335
packages/hoppscotch-backend/pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,6 @@
|
|||||||
|
-- CreateEnum
|
||||||
|
CREATE TYPE "ReqType" AS ENUM ('REST', 'GQL');
|
||||||
|
|
||||||
-- CreateEnum
|
-- CreateEnum
|
||||||
CREATE TYPE "TeamMemberRole" AS ENUM ('OWNER', 'VIEWER', 'EDITOR');
|
CREATE TYPE "TeamMemberRole" AS ENUM ('OWNER', 'VIEWER', 'EDITOR');
|
||||||
|
|
||||||
@@ -79,6 +82,8 @@ CREATE TABLE "User" (
|
|||||||
"photoURL" TEXT,
|
"photoURL" TEXT,
|
||||||
"isAdmin" BOOLEAN NOT NULL DEFAULT false,
|
"isAdmin" BOOLEAN NOT NULL DEFAULT false,
|
||||||
"refreshToken" TEXT,
|
"refreshToken" TEXT,
|
||||||
|
"currentRESTSession" JSONB,
|
||||||
|
"currentGQLSession" JSONB,
|
||||||
"createdOn" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
"createdOn" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
CONSTRAINT "User_pkey" PRIMARY KEY ("uid")
|
CONSTRAINT "User_pkey" PRIMARY KEY ("uid")
|
||||||
@@ -106,6 +111,40 @@ CREATE TABLE "PasswordlessVerification" (
|
|||||||
"expiresOn" TIMESTAMP(3) NOT NULL
|
"expiresOn" TIMESTAMP(3) NOT NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "UserSettings" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"userUid" TEXT NOT NULL,
|
||||||
|
"properties" JSONB NOT NULL,
|
||||||
|
"updatedOn" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "UserSettings_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "UserHistory" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"userUid" TEXT NOT NULL,
|
||||||
|
"reqType" "ReqType" NOT NULL,
|
||||||
|
"request" JSONB NOT NULL,
|
||||||
|
"responseMetadata" JSONB NOT NULL,
|
||||||
|
"isStarred" BOOLEAN NOT NULL,
|
||||||
|
"executedOn" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "UserHistory_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "UserEnvironment" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"userUid" TEXT NOT NULL,
|
||||||
|
"name" TEXT,
|
||||||
|
"variables" JSONB NOT NULL,
|
||||||
|
"isGlobal" BOOLEAN NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "UserEnvironment_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
-- CreateIndex
|
-- CreateIndex
|
||||||
CREATE UNIQUE INDEX "TeamMember_teamID_userUid_key" ON "TeamMember"("teamID", "userUid");
|
CREATE UNIQUE INDEX "TeamMember_teamID_userUid_key" ON "TeamMember"("teamID", "userUid");
|
||||||
|
|
||||||
@@ -130,6 +169,9 @@ CREATE UNIQUE INDEX "PasswordlessVerification_token_key" ON "PasswordlessVerific
|
|||||||
-- CreateIndex
|
-- CreateIndex
|
||||||
CREATE UNIQUE INDEX "PasswordlessVerification_deviceIdentifier_token_key" ON "PasswordlessVerification"("deviceIdentifier", "token");
|
CREATE UNIQUE INDEX "PasswordlessVerification_deviceIdentifier_token_key" ON "PasswordlessVerification"("deviceIdentifier", "token");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "UserSettings_userUid_key" ON "UserSettings"("userUid");
|
||||||
|
|
||||||
-- AddForeignKey
|
-- AddForeignKey
|
||||||
ALTER TABLE "TeamMember" ADD CONSTRAINT "TeamMember_teamID_fkey" FOREIGN KEY ("teamID") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
ALTER TABLE "TeamMember" ADD CONSTRAINT "TeamMember_teamID_fkey" FOREIGN KEY ("teamID") REFERENCES "Team"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
@@ -156,3 +198,12 @@ ALTER TABLE "Account" ADD CONSTRAINT "Account_userId_fkey" FOREIGN KEY ("userId"
|
|||||||
|
|
||||||
-- AddForeignKey
|
-- AddForeignKey
|
||||||
ALTER TABLE "PasswordlessVerification" ADD CONSTRAINT "PasswordlessVerification_userUid_fkey" FOREIGN KEY ("userUid") REFERENCES "User"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
|
ALTER TABLE "PasswordlessVerification" ADD CONSTRAINT "PasswordlessVerification_userUid_fkey" FOREIGN KEY ("userUid") REFERENCES "User"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "UserSettings" ADD CONSTRAINT "UserSettings_userUid_fkey" FOREIGN KEY ("userUid") REFERENCES "User"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "UserHistory" ADD CONSTRAINT "UserHistory_userUid_fkey" FOREIGN KEY ("userUid") REFERENCES "User"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "UserEnvironment" ADD CONSTRAINT "UserEnvironment_userUid_fkey" FOREIGN KEY ("userUid") REFERENCES "User"("uid") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
cd /home/balubabu/work/self-hosted/packages/hoppscotch-backend
|
|
||||||
@@ -201,7 +201,7 @@ export class AuthService {
|
|||||||
* @param profile Provider Account type (Magic,Google,Github,Microsoft)
|
* @param profile Provider Account type (Magic,Google,Github,Microsoft)
|
||||||
* @returns {Promise<O.None | O.Some<Account>>} Either of existing user provider Account
|
* @returns {Promise<O.None | O.Some<Account>>} Either of existing user provider Account
|
||||||
*/
|
*/
|
||||||
async checkIfProviderAccountExists(user: User, profile) {
|
async checkIfProviderAccountExists(user: AuthUser, profile) {
|
||||||
const provider = await this.prismaService.account.findUnique({
|
const provider = await this.prismaService.account.findUnique({
|
||||||
where: {
|
where: {
|
||||||
verifyProviderAccount: {
|
verifyProviderAccount: {
|
||||||
|
|||||||
Reference in New Issue
Block a user