@civic/auth 0.1.1 → 0.1.2

package/dist/vitest.config.d.ts

@@ -0,0 +1,3 @@
+declare const _default: import("vite").UserConfig;
+export default _default;
+//# sourceMappingURL=vitest.config.d.ts.map

package/dist/vitest.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest.config.d.ts","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":";AAIA,wBAoCG"}

package/dist/vitest.config.js

@@ -0,0 +1,40 @@
+/// <reference types='vitest' />
+import { defineConfig } from "vite";
+import path from "path";
+export default defineConfig({
+    resolve: {
+        alias: {
+            "@": path.resolve(__dirname, "./src"),
+        },
+    },
+    test: {
+        globals: true,
+        environment: "jsdom",
+        include: ["test/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+        env: {
+            NODE_ENV: "development",
+        },
+        reporters: ["default"],
+        coverage: {
+            exclude: [
+                "**/node_modules/**",
+                "**/dist/**",
+                "**/build/**",
+                "postcss.config.cjs",
+                "tailwind.config.js",
+                ".eslintrc.js",
+                "tsup.config.ts",
+                "vitest.config.ts",
+            ],
+            reportsDirectory: "../../coverage/apps/civic-auth-client",
+            provider: "v8",
+            thresholds: {
+                lines: 80,
+                functions: 70,
+                branches: 85,
+                statements: 80,
+            },
+        },
+    },
+});
+//# sourceMappingURL=vitest.config.js.map

package/dist/vitest.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest.config.js","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,eAAe,YAAY,CAAC;IAC1B,OAAO,EAAE;QACP,KAAK,EAAE;YACL,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC;SACtC;KACF;IAED,IAAI,EAAE;QACJ,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,OAAO;QACpB,OAAO,EAAE,CAAC,uDAAuD,CAAC;QAClE,GAAG,EAAE;YACH,QAAQ,EAAE,aAAa;SACxB;QACD,SAAS,EAAE,CAAC,SAAS,CAAC;QACtB,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP,oBAAoB;gBACpB,YAAY;gBACZ,aAAa;gBACb,oBAAoB;gBACpB,oBAAoB;gBACpB,cAAc;gBACd,gBAAgB;gBAChB,kBAAkB;aACnB;YACD,gBAAgB,EAAE,uCAAuC;YACzD,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE;gBACV,KAAK,EAAE,EAAE;gBACT,SAAS,EAAE,EAAE;gBACb,QAAQ,EAAE,EAAE;gBACZ,UAAU,EAAE,EAAE;aACf;SACF;KACF;CACF,CAAC,CAAC","sourcesContent":["/// <reference types='vitest' />\nimport { defineConfig } from \"vite\";\nimport path from \"path\";\n\nexport default defineConfig({\n  resolve: {\n    alias: {\n      \"@\": path.resolve(__dirname, \"./src\"),\n    },\n  },\n\n  test: {\n    globals: true,\n    environment: \"jsdom\",\n    include: [\"test/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}\"],\n    env: {\n      NODE_ENV: \"development\",\n    },\n    reporters: [\"default\"],\n    coverage: {\n      exclude: [\n        \"**/node_modules/**\",\n        \"**/dist/**\",\n        \"**/build/**\",\n        \"postcss.config.cjs\",\n        \"tailwind.config.js\",\n        \".eslintrc.js\",\n        \"tsup.config.ts\",\n        \"vitest.config.ts\",\n      ],\n      reportsDirectory: \"../../coverage/apps/civic-auth-client\",\n      provider: \"v8\",\n      thresholds: {\n        lines: 80,\n        functions: 70,\n        branches: 85,\n        statements: 80,\n      },\n    },\n  },\n});\n"]}

package/package.json

@@ -1,58 +1,58 @@
 {
   "name": "@civic/auth",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "module": "dist/index.js",
   "main": "dist/index.ts",
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/esm/src/index.d.ts",
-        "default": "./dist/esm/src/index.js"
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
       },
       "require": {
-        "types": "./dist/cjs/src/index.d.ts",
-        "default": "./dist/cjs/src/index.js"
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
       }
     },
     "./react": {
       "import": {
-        "types": "./dist/esm/src/reactjs/index.d.ts",
-        "default": "./dist/esm/src/reactjs/index.js"
+        "types": "./dist/esm/reactjs/index.d.ts",
+        "default": "./dist/esm/reactjs/index.js"
       },
       "require": {
-        "types": "./dist/cjs/src/reactjs/index.d.ts",
-        "default": "./dist/cjs/src/reactjs/index.js"
+        "types": "./dist/cjs/reactjs/index.d.ts",
+        "default": "./dist/cjs/reactjs/index.js"
       }
     },
     "./nextjs": {
       "import": {
-        "types": "./dist/esm/src/nextjs/index.d.ts",
-        "default": "./dist/esm/src/nextjs/index.js"
+        "types": "./dist/esm/nextjs/index.d.ts",
+        "default": "./dist/esm/nextjs/index.js"
       },
       "require": {
-        "types": "./dist/cjs/src/nextjs/index.d.ts",
-        "default": "./dist/cjs/src/nextjs/index.js"
+        "types": "./dist/cjs/nextjs/index.d.ts",
+        "default": "./dist/cjs/nextjs/index.js"
       }
     },
     "./nextjs/middleware": {
       "import": {
-        "types": "./dist/esm/src/nextjs/middleware/index.d.ts",
-        "default": "./dist/esm/src/nextjs/middleware/index.js"
+        "types": "./dist/esm/nextjs/middleware/index.d.ts",
+        "default": "./dist/esm/nextjs/middleware/index.js"
       },
       "require": {
-        "types": "./dist/cjs/src/nextjs/middleware/index.d.ts",
-        "default": "./dist/cjs/src/nextjs/middleware/index.js"
+        "types": "./dist/cjs/nextjs/middleware/index.d.ts",
+        "default": "./dist/cjs/nextjs/middleware/index.js"
       }
     },
     "./server": {
       "import": {
-        "types": "./dist/esm/src/server/index.d.ts",
-        "default": "./dist/esm/src/server/index.js"
+        "types": "./dist/esm/server/index.d.ts",
+        "default": "./dist/esm/server/index.js"
       },
       "require": {
-        "types": "./dist/cjs/src/server/index.d.ts",
-        "default": "./dist/cjs/src/server/index.js"
+        "types": "./dist/cjs/server/index.d.ts",
+        "default": "./dist/cjs/server/index.js"
       }
     }
   },
@@ -89,10 +89,10 @@
     "vite": "^5.4.8",
     "vite-plugin-dts": "^4.2.3",
     "vitest": "^2.1.2",
-    "@repo/eslint-config": "0.0.0",
-    "@repo/typescript-config": "0.0.0"
+    "@repo/typescript-config": "0.0.0",
+    "@repo/eslint-config": "0.0.0"
   },
-  "peerDependencies": {
+  "optionalDependency": {
     "next": "^14"
   },
   "scripts": {

package/src/reactjs/components/UserButton.tsx

@@ -110,6 +110,7 @@ const UserButton = ({
         <button
           ref={buttonRef}
           style={{
+            cursor: "pointer",
             display: "flex",
             minWidth: "10rem",
             alignItems: "center",
@@ -119,9 +120,16 @@ const UserButton = ({
             border: "1px solid #6b7280",
             padding: "0.75rem 1rem",
             color: "#6b7280",
+            background: "none",
             transition: "background-color 0.2s",
           }}
           className={className}
+          onMouseEnter={(e) =>
+            (e.currentTarget.style.backgroundColor = "#f3f4f6")
+          }
+          onMouseLeave={(e) =>
+            (e.currentTarget.style.backgroundColor = "transparent")
+          }
           onClick={() => {
             setIsOpen((isOpen) => !isOpen);
           }}
@@ -174,7 +182,7 @@ const UserButton = ({
               : { display: "none" }
           }
         >
-          <ul>
+          <ul style={{ listStyleType: "none", margin: 0, padding: 0 }}>
             <li>
               <button
                 style={{
@@ -182,8 +190,18 @@ const UserButton = ({
                   width: "100%",
                   padding: "0.5rem 1rem",
                   transition: "background-color 0.2s",
+                  background: "none",
+                  border: "none",
+                  textAlign: "center",
+                  cursor: "pointer",
                 }}
                 onClick={handleSignOut}
+                onMouseEnter={(e) =>
+                  (e.currentTarget.style.backgroundColor = "#f3f4f6")
+                }
+                onMouseLeave={(e) =>
+                  (e.currentTarget.style.backgroundColor = "transparent")
+                }
               >
                 Logout
               </button>
@@ -199,12 +217,18 @@ const UserButton = ({
       ref={buttonRef}
       data-testid="sign-in-button"
       style={{
+        cursor: "pointer",
         borderRadius: "9999px",
         border: "1px solid #6b7280",
         padding: "0.75rem 1rem",
+        background: "none",
         transition: "background-color 0.2s",
       }}
       className={className}
+      onMouseEnter={(e) => (e.currentTarget.style.backgroundColor = "#f3f4f6")}
+      onMouseLeave={(e) =>
+        (e.currentTarget.style.backgroundColor = "transparent")
+      }
       onClick={handleSignIn}
     >
       Sign in

package/src/server/ServerAuthenticationResolver.ts

@@ -14,6 +14,7 @@ import {
   storeTokens,
 } from "@/shared/lib/util.js";
 import type { AuthenticationResolver, PKCEProducer } from "@/services/types.ts";
+import { DEFAULT_AUTH_SERVER } from "@/constants.js";
 
 export class ServerAuthenticationResolver implements AuthenticationResolver {
   private pkceProducer: PKCEProducer;
@@ -31,10 +32,14 @@ export class ServerAuthenticationResolver implements AuthenticationResolver {
     throw new Error("Method not implemented.");
   }
 
+  get oauthServer(): string {
+    return this.authConfig.oauthServer || DEFAULT_AUTH_SERVER;
+  }
+
   async init(): Promise<this> {
     // resolve oauth config
     this.endpoints = await getEndpointsWithOverrides(
-      this.authConfig.oauthServer,
+      this.oauthServer,
       this.endpointOverrides,
     );
     this.oauth2client = new OAuth2Client(
@@ -63,7 +68,7 @@ export class ServerAuthenticationResolver implements AuthenticationResolver {
       state,
       this.pkceProducer,
       this.oauth2client!, // clean up types here to avoid the ! operator
-      this.authConfig.oauthServer,
+      this.oauthServer,
       this.endpoints!, // clean up types here to avoid the ! operator
     );
 

package/src/server/config.ts

@@ -1,17 +1,9 @@
 import type { Endpoints } from "@/types.ts";
 
-export type CookieConfig = {
-  secure?: boolean;
-  sameSite?: "strict" | "lax" | "none";
-  domain?: string;
-  path?: string;
-  maxAge?: number;
-};
-
 export type AuthConfig = {
   clientId: string;
-  oauthServer: string;
   redirectUrl: string;
+  oauthServer?: string;
   challengeUrl?: string;
   endpointOverrides?: Partial<Endpoints> | undefined;
 };

package/src/server/index.ts

@@ -8,5 +8,6 @@ export {
   isLoggedIn,
   buildLoginUrl,
 } from "@/server/login.js";
+export type { AuthConfig } from "@/server/config.js";
 export { getUser } from "@/shared/lib/session.js";
 export { refreshTokens } from "@/server/refresh.js";

package/src/shared/lib/GenericAuthenticationRefresher.ts

@@ -7,6 +7,7 @@ import {
 } from "@/shared/lib/util.js";
 import type { AuthConfig } from "@/server/config.js";
 import { OAuth2Client } from "oslo/oauth2";
+import { DEFAULT_AUTH_SERVER } from "@/constants.js";
 
 export class GenericAuthenticationRefresher implements AuthenticationRefresher {
   private oauth2client: OAuth2Client | undefined;
@@ -18,10 +19,14 @@ export class GenericAuthenticationRefresher implements AuthenticationRefresher {
     private endpointOverrides?: Partial<Endpoints>,
   ) {}
 
+  get oauthServer(): string {
+    return this.authConfig.oauthServer || DEFAULT_AUTH_SERVER;
+  }
+
   async init(): Promise<this> {
     // resolve oauth config
     this.endpoints = await getEndpointsWithOverrides(
-      this.authConfig.oauthServer,
+      this.oauthServer,
       this.endpointOverrides,
     );
     this.oauth2client = new OAuth2Client(

package/tsconfig.build.json

@@ -1,5 +1,9 @@
 {
   "extends": "./tsconfig.json",
   "include": ["src"],
-  "exclude": ["test"]
+  "exclude": ["test"],
+  "compilerOptions": {
+    /* needed to stop /src from being included in the output */
+    "rootDir": "./src",
+  }
 }