@kaspernj/api-maker 1.0.347 → 1.0.349

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.347",
+  "version": "1.0.349",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -52,7 +52,7 @@
     "on-location-changed": ">= 1.0.10",
     "qs": ">= 6.9.3",
     "replaceall": ">= 0.1.6",
-    "set-state-compare": ">= 1.0.28",
+    "set-state-compare": ">= 1.0.30",
     "spark-md5": "^3.0.2",
     "strftime": ">= 0.10.0",
     "uniqunize": "^1.0.1",

package/src/api.mjs

@@ -1,9 +1,14 @@
 import config from "./config.mjs"
 import CustomError from "./custom-error.mjs"
 import FormDataObjectizer from "form-data-objectizer"
+import Logger from "./logger.mjs"
 import qs from "qs"
 import SessionStatusUpdater from "./session-status-updater.mjs"
 
+const logger = new Logger({name: "ApiMaker / Api"})
+
+// logger.setDebug(true)
+
 export default class Api {
   static get(path, pathParams = null) {
     return Api.requestLocal({path, pathParams, method: "GET"})
@@ -70,6 +75,8 @@ export default class Api {
 
     const token = await this._token()
 
+    logger.debug(() => `Got token: ${token}`)
+
     if (token) {
       args.headers["X-CSRF-Token"] = token
     }

package/src/commands-pool.mjs

@@ -14,7 +14,7 @@ import {ValidationErrors} from "./validation-errors.mjs"
 const shared = {}
 
 export default class ApiMakerCommandsPool {
-  static addCommand (data, args = {}) {
+  static addCommand(data, args = {}) {
     let pool
 
     if (args.instant) {
@@ -34,17 +34,17 @@ export default class ApiMakerCommandsPool {
     return promiseResult
   }
 
-  static current () {
+  static current() {
     if (!shared.currentApiMakerCommandsPool) shared.currentApiMakerCommandsPool = new ApiMakerCommandsPool()
 
     return shared.currentApiMakerCommandsPool
   }
 
-  static flush () {
+  static flush() {
     ApiMakerCommandsPool.current().flush()
   }
 
-  constructor () {
+  constructor() {
     this.flushCount = 0
     this.pool = {}
     this.poolData = {}
@@ -52,7 +52,7 @@ export default class ApiMakerCommandsPool {
     this.globalRequestData = {}
   }
 
-  addCommand (data) {
+  addCommand(data) {
     return new Promise((resolve, reject) => {
       const id = this.currentId
       this.currentId += 1
@@ -87,11 +87,11 @@ export default class ApiMakerCommandsPool {
     })
   }
 
-  commandsCount () {
+  commandsCount() {
     return Object.keys(this.pool)
   }
 
-  async sendRequest ({commandSubmitData, url}) {
+  async sendRequest({commandSubmitData, url}) {
     let response
 
     for (let i = 0; i < 3; i++) {
@@ -113,7 +113,7 @@ export default class ApiMakerCommandsPool {
     throw new Error("Couldnt successfully execute request")
   }
 
-  async flush () {
+  async flush() {
     if (this.commandsCount() == 0) {
       return
     }
@@ -166,7 +166,7 @@ export default class ApiMakerCommandsPool {
     }
   }
 
-  handleFailedResponse (commandData, commandResponseData) {
+  handleFailedResponse(commandData, commandResponseData) {
     let error
 
     if (commandResponseData.error_type == "destroy_error") {
@@ -190,13 +190,13 @@ export default class ApiMakerCommandsPool {
     commandData.reject(error)
   }
 
-  clearTimeout () {
+  clearTimeout() {
     if (this.flushTimeout) {
       clearTimeout(this.flushTimeout)
     }
   }
 
-  isActive () {
+  isActive() {
     if (this.commandsCount() > 0) {
       return true
     }
@@ -208,7 +208,7 @@ export default class ApiMakerCommandsPool {
     return false
   }
 
-  setFlushTimeout () {
+  setFlushTimeout() {
     this.clearTimeout()
     this.flushTimeout = setTimeout(() => this.flush(), 0)
   }

package/src/devise.mjs

@@ -9,11 +9,11 @@ import Services from "./services.mjs"
 const shared = {}
 
 export default class ApiMakerDevise {
-  static callSignOutEvent (args) {
+  static callSignOutEvent(args) {
     events.emit("onDeviseSignOut", {args})
   }
 
-  static current () {
+  static current() {
     if (!shared.currentApiMakerDevise) {
       shared.currentApiMakerDevise = new ApiMakerDevise()
     }
@@ -21,11 +21,11 @@ export default class ApiMakerDevise {
     return shared.currentApiMakerDevise
   }
 
-  static events () {
+  static events() {
     return events
   }
 
-  static addUserScope (scope) {
+  static addUserScope(scope) {
     const currentMethodName = `current${inflection.camelize(scope)}`
 
     ApiMakerDevise[currentMethodName] = () => ApiMakerDevise.current().getCurrentScope(scope)
@@ -35,7 +35,7 @@ export default class ApiMakerDevise {
     ApiMakerDevise[isSignedInMethodName] = () => Boolean(ApiMakerDevise.current().getCurrentScope(scope))
   }
 
-  static async signIn (username, password, args = {}) {
+  static async signIn(username, password, args = {}) {
     if (!args.scope) args.scope = "user"
 
     const postData = {username, password, args}
@@ -53,7 +53,7 @@ export default class ApiMakerDevise {
     return {model, response}
   }
 
-  static updateSession (model, args = {}) {
+  static updateSession(model, args = {}) {
     if (!args.scope) {
       args.scope = digg(model.modelClassData(), "name")
     }
@@ -63,11 +63,17 @@ export default class ApiMakerDevise {
     ApiMakerDevise.current().currents[camelizedScopeName] = model
   }
 
-  static setSignedOut (args) {
+  hasCurrentScope(scope) {
+    const camelizedScopeName = inflection.camelize(scope, true)
+
+    return camelizedScopeName in ApiMakerDevise.current().currents
+  }
+
+  static setSignedOut(args) {
     ApiMakerDevise.current().currents[inflection.camelize(args.scope, true)] = null
   }
 
-  static async signOut (args = {}) {
+  static async signOut(args = {}) {
     if (!args.scope) {
       args.scope = "user"
     }
@@ -87,11 +93,11 @@ export default class ApiMakerDevise {
     return response
   }
 
-  constructor () {
+  constructor() {
     this.currents = {}
   }
 
-  getCurrentScope (scope) {
+  getCurrentScope(scope) {
     if (!(scope in this.currents)) {
       this.currents[scope] = this.loadCurrentScope(scope)
     }
@@ -99,7 +105,7 @@ export default class ApiMakerDevise {
     return this.currents[scope]
   }
 
-  hasCurrentScope(scope) {
+  hasGlobalCurrentScope(scope) {
     if (globalThis.apiMakerDeviseCurrent && scope in globalThis.apiMakerDeviseCurrent) {
       return true
     }
@@ -107,8 +113,8 @@ export default class ApiMakerDevise {
     return false
   }
 
-  loadCurrentScope (scope) {
-    if (!this.hasCurrentScope(scope)) {
+  loadCurrentScope(scope) {
+    if (!this.hasGlobalCurrentScope(scope)) {
       return null
     }
 

package/src/logger.mjs

@@ -12,7 +12,13 @@ export default class ApiMakerLogger {
   }
 
   debug(message) {
-    if (this.getDebug()) this.log(message)
+    if (this.getDebug()) {
+      this.log(message)
+    }
+  }
+
+  error(message) {
+    console.error(message)
   }
 
   log(message) {

package/src/session-status-updater.mjs

@@ -37,7 +37,7 @@ export default class ApiMakerSessionStatusUpdater {
 
   async getCsrfToken() {
     if (this.csrfToken) {
-      logger.debug("Get CSRF token from set variable")
+      logger.debug(`Get CSRF token from set variable: ${this.csrfToken}`)
 
       return this.csrfToken
     }
@@ -46,7 +46,7 @@ export default class ApiMakerSessionStatusUpdater {
       const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
 
       if (csrfTokenElement) {
-        logger.debug("Get CSRF token from meta element")
+        logger.debug(() => `Get CSRF token from meta element: ${csrfTokenElement.getAttribute("content")}`)
 
         this.csrfToken = csrfTokenElement.getAttribute("content")
 
@@ -58,7 +58,7 @@ export default class ApiMakerSessionStatusUpdater {
     await this.updateSessionStatus()
 
     if (this.csrfToken) {
-      logger.debug("Returning CSRF token after updating session status")
+      logger.debug(() => `Returning CSRF token after updating session status: ${this.csrfToken}`)
 
       return this.csrfToken
     }
@@ -68,9 +68,10 @@ export default class ApiMakerSessionStatusUpdater {
 
   sessionStatus() {
     return new Promise((resolve) => {
+      const host = config.getHost()
       let requestPath = ""
 
-      if (config.getHost()) requestPath += config.getHost()
+      if (host) requestPath += host
 
       requestPath += "/api_maker/session_statuses"
 

package/src/use-current-user.mjs

@@ -1,10 +1,15 @@
 import {useCallback, useEffect, useMemo} from "react"
 import {camelize} from "inflection"
 import Devise from "./devise.mjs"
+import Logger from "./logger.mjs"
 import Services from "./services.mjs"
 import useEventEmitter from "./use-event-emitter.mjs"
 import useShape from "set-state-compare/src/use-shape.js"
 
+const logger = new Logger({name: "ApiMaker / useCurrentUser"})
+
+// logger.setDebug(true)
+
 const useCurrentUser = (args) => {
   const s = useShape(args || {})
   const scope = args?.scope || "user"
@@ -13,20 +18,10 @@ const useCurrentUser = (args) => {
   s.meta.scope = scope
   s.meta.scopeName = scopeName
 
-  const debugs = useCallback((debugCallback) => {
-    if (s.props.debug) {
-      let debugArgs = debugCallback()
-
-      if (!Array.isArray(debugArgs)) debugArgs = [debugArgs]
-
-      console.log("useCurrentUser", ...debugArgs)
-    }
-  })
-
   const loadCurrentUserFromRequest = useCallback(async () => {
     const {scope, scopeName} = s.m
 
-    debugs(() => `Loading ${scope} with request`)
+    logger.debug(() => `Loading ${scope} with request`)
 
     const result = await Services.current().sendRequest("Devise::Current", {scope})
     const current = digg(result, "current")
@@ -41,21 +36,28 @@ const useCurrentUser = (args) => {
 
   const defaultCurrentUser = useCallback(() => {
     const {scope, scopeName} = s.m
+    let current
 
-    if (Devise.current().hasCurrentScope(scope)) {
-      const current = Devise[scopeName]()
+    if (Devise.current().hasCurrentScope(s.m.scope)) {
+      current = Devise.current().getCurrentScope(scope)
 
-      debugs(() => `Setting ${scope} from current scope: ${current?.id()}`)
+      logger.debug(() => `Setting ${scope} from current scope: ${current?.id()}`)
+    } else if (Devise.current().hasGlobalCurrentScope(scope)) {
+      current = Devise[scopeName]()
 
-      if (s.props.onCurrentUserLoaded) setTimeout(() => s.props.onCurrentUserLoaded(current), 0)
+      logger.debug(() => `Setting ${scope} from global current scope: ${current?.id()}`)
+    }
 
-      return current
+    if (current && s.props.onCurrentUserLoaded) {
+      setTimeout(() => s.props.onCurrentUserLoaded(current), 0)
     }
+
+    return current
   }, [])
 
   const useStatesArgument = {}
 
-  useStatesArgument[scopeName] = defaultCurrentUser()
+  useStatesArgument[scopeName] = () => defaultCurrentUser()
 
   s.useStates(useStatesArgument)
 
@@ -68,7 +70,8 @@ const useCurrentUser = (args) => {
   }, [])
 
   useEffect(() => {
-    if (!Devise.current().hasCurrentScope(s.m.scope)) {
+    if (!Devise.current().hasGlobalCurrentScope(s.m.scope) && !Devise.current().hasCurrentScope(s.m.scope)) {
+      logger.debug(() => `Devise hasn't got current scope ${s.m.scope} so loading from request`)
       loadCurrentUserFromRequest()
     }
   }, [])