fix(ipInfo): fix CI typings

adrienZ · Sep 3, 2024 · d416d7f · d416d7f
1 parent 562b234
commit d416d7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/runtime/core/core.ts b/src/runtime/core/core.ts
@@ -2,11 +2,12 @@ import { generateRandomString, alphabet } from "oslo/crypto";
 import { checkDbAndTables, type tableNames } from "../database";
 import { getOAuthAccountsTableSchema, getSessionsTableSchema, getUsersTableSchema } from "../database/lib/schema";
 import { drizzle as drizzleIntegration } from "db0/integrations/drizzle/index";
-import type { checkDbAndTablesParameters, ICreateOrLoginParams, ISlipAuthCoreOptions, SchemasMockValue, SlipAuthSession } from "./types";
+import type { checkDbAndTablesParameters, ICreateOrLoginParams, ISlipAuthCoreOptions, SchemasMockValue } from "./types";
 import { createSlipHooks } from "./hooks";
 import { UsersRepository } from "./repositories/UsersRepository";
 import { SessionsRepository } from "./repositories/SessionsRepository";
 import { OAuthAccountsRepository } from "./repositories/OAuthAccountsRepository";
+import type { SlipAuthPublicSession } from "../types";
 
 const defaultIdGenerationMethod = () => generateRandomString(15, alphabet("a-z", "A-Z", "0-9"));
 
@@ -69,7 +70,7 @@ export class SlipAuthCore {
    */
   public async registerUserIfMissingInDb(
     params: ICreateOrLoginParams,
-  ): Promise<[ string, SlipAuthSession]> {
+  ): Promise<[ string, SlipAuthPublicSession]> {
     const existingUser = await this.#repos.users.findByEmail(params.email);
 
     if (!existingUser) {
@@ -91,7 +92,7 @@ export class SlipAuthCore {
         ua: params.ua,
       });
 
-      return [userId, sessionFromRegistration as SlipAuthSession];
+      return [userId, sessionFromRegistration];
     }
 
     const existingAccount = await this.#repos.oAuthAccounts.findByProviderData(

diff --git a/src/runtime/server/utils/useSlipAuth.ts b/src/runtime/server/utils/useSlipAuth.ts
@@ -21,7 +21,7 @@ export function useSlipAuth() {
       sessionMaxAge: slipAuthConfig.sessionMaxAge,
     });
 
-    if (config.slipAuthIpInfoToken) {
+    if (config.slipAuthIpInfoToken && typeof config.slipAuthIpInfoToken === "string" && config.slipAuthIpInfoToken.length > 0) {
       setupIpInfoAddOn(instance, config.slipAuthIpInfoToken);
     }
   }

diff --git a/src/runtime/types.ts b/src/runtime/types.ts
@@ -24,7 +24,7 @@ export interface SlipModuleOptions extends ISlipAuthCoreOptions {
 declare module "nuxt/schema" {
   interface RuntimeConfig {
     slipAuth: SlipModuleOptions
-    slipAuthIpInfoToken?: string
+    slipAuthIpInfoToken: string
   }
 }