muffin-admin 11.5.0 → 11.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-admin",
-  "version": "11.5.0",
+  "version": "11.5.1",
   "description": "NPM package for https://github.com/klen/muffin-admin",
   "files": [
     "src",

package/src/authprovider.ts

@@ -1,92 +1,107 @@
-import Cookies from "js-cookie"
-import { findBuilder, makeRequest, requestHeaders, setupAdmin } from "."
-import { AdminOpts } from "./types"
+import Cookies from "js-cookie";
+import { findBuilder, makeRequest, requestHeaders, setupAdmin } from ".";
+import type { AdminOpts } from "./types";
 
 setupAdmin(
-  ["auth-storage-get"],
-  ({ storage, storageName }: AdminOpts["auth"]) =>
-    () =>
-      storage == "localstorage" ? localStorage.getItem(storageName) : Cookies.get(storageName)
-)
-
-setupAdmin(["auth-storage-set"], ({ storage }) => (name, value) => {
-  if (storage == "localstorage") {
-    localStorage.setItem(name, value)
-    requestHeaders["Authorization"] = value
-  } else Cookies.set(name, value)
-})
+	["auth-storage-get"],
+	({ storage, storageName }: AdminOpts["auth"]) =>
+		() =>
+			storage == "localstorage"
+				? localStorage.getItem(storageName)
+				: Cookies.get(storageName),
+);
 
-export function MuffinAuthProvider(props: AdminOpts["auth"]) {
-  const { identityURL, authorizeURL, logoutURL, required, storageName } = props
-
-  const authGet = findBuilder(["auth-storage-get"])(props)
-  const authSet = findBuilder(["auth-storage-set"])(props)
-
-  // Initialize request headers
-  authSet(storageName, authGet(storageName))
-
-  const getIdentity = async () => {
-    if (identityURL) {
-      const { json } = await makeRequest(identityURL)
-      return json
-    }
-  }
-
-  if (required)
-    return {
-      login: async (data) => {
-        if (!authorizeURL) throw { message: "Authorization is not supported" }
-
-        const { json } = await makeRequest(authorizeURL, {
-          data,
-          method: "POST",
-        })
-        authSet(storageName, json)
-      },
-
-      checkError: async (error) => {
-        const { status } = error || {}
-
-        if (status == 401 || status == 403) {
-          // Clean storage
-          authSet(storageName, "")
-
-          throw {
-            message: "Invalid authorization",
-            redirectTo: logoutURL,
-            logoutUser: !logoutURL,
-          }
-        }
-      },
-
-      checkAuth: async () => {
-        const auth = authGet(storageName)
-        if (!auth) throw { message: "Authorization required" }
-
-        if (!identityURL) return auth
-
-        const user = await getIdentity()
-        if (!user) throw { message: "Authorization required" }
-
-        return user
-      },
-
-      getAuthorization: () => authGet(storageName),
-
-      logout: async () => {
-        // Clean storage
-        authSet(storageName, "")
-
-        if (logoutURL) window.location.href = logoutURL
-      },
-
-      getIdentity,
+setupAdmin(
+	["auth-storage-set"],
+	({ storage }) =>
+		(name, value, requestOnly) => {
+			if (storage == "localstorage") {
+				localStorage.setItem(name, value);
+				requestHeaders["Authorization"] = value;
+			} else Cookies.set(name, value);
+		},
+);
 
-      getPermissions: async () => {
-        const role = authGet(storageName + "_role")
-        return role || ""
-      },
-    }
+export function MuffinAuthProvider(props: AdminOpts["auth"]) {
+	const {
+		identityURL,
+		authorizeURL,
+		logoutURL,
+		required,
+		storageName,
+		storage,
+	} = props;
+
+	const authGet = findBuilder(["auth-storage-get"])(props);
+	const authSet = findBuilder(["auth-storage-set"])(props);
+
+	// Initialize request headers
+	if (storage == "localstorage") {
+		const token = authGet(storageName);
+		if (token) requestHeaders["Authorization"] = token;
+	}
+
+	const getIdentity = async () => {
+		if (identityURL) {
+			const { json } = await makeRequest(identityURL);
+			return json;
+		}
+	};
+
+	if (required)
+		return {
+			login: async (data) => {
+				if (!authorizeURL) throw { message: "Authorization is not supported" };
+
+				const { json } = await makeRequest(authorizeURL, {
+					data,
+					method: "POST",
+				});
+				authSet(storageName, json);
+			},
+
+			checkError: async (error) => {
+				const { status } = error || {};
+
+				if (status == 401 || status == 403) {
+					// Clean storage
+					authSet(storageName, "");
+
+					throw {
+						message: "Invalid authorization",
+						redirectTo: logoutURL,
+						logoutUser: !logoutURL,
+					};
+				}
+			},
+
+			checkAuth: async () => {
+				const auth = authGet(storageName);
+				if (!auth) throw { message: "Authorization required" };
+
+				if (!identityURL) return auth;
+
+				const user = await getIdentity();
+				if (!user) throw { message: "Authorization required" };
+
+				return user;
+			},
+
+			getAuthorization: () => authGet(storageName),
+
+			logout: async () => {
+				// Clean storage
+				authSet(storageName, "");
+				if (logoutURL) window.location.href = logoutURL;
+			},
+
+			getIdentity,
+
+			getPermissions: async () => {
+				const role = authGet(storageName + "_role");
+				return role || "";
+			},
+		};
 }
 
-setupAdmin(["auth-provider"], MuffinAuthProvider)
+setupAdmin(["auth-provider"], MuffinAuthProvider);

package/src/index.tsx

@@ -37,4 +37,4 @@ export async function initAdmin(prefix = "", containerId: string = "root") {
   )
 }
 
-export const VERSION = "11.5.0"
+export const VERSION = "11.5.1"