prostgles-client 4.0.426 → 4.0.427

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/auth/useAuthState.d.ts +30 -4
  2. package/dist/auth/useAuthState.d.ts.map +1 -1
  3. package/dist/auth/useAuthState.js +15 -12
  4. package/package.json +1 -1
package/dist/auth/useAuthState.d.ts CHANGED
@@ -1,6 +1,31 @@
1
- import type { AuthHandler } from "../getAuthHandler";
2
- export declare const useAuthState: ({ auth }: {
1
+ import type { AuthHandler, ConfirmEmail, PasswordLogin, PasswordRegister } from "../getAuthHandler";
2
+ type PasswordLoginDataAndFunc = {
3
+ onCall: PasswordLogin;
4
+ result: undefined | Awaited<ReturnType<PasswordLogin>>;
5
+ } & Parameters<PasswordLogin>[0];
6
+ type PasswordRegisterDataAndFunc = {
7
+ onCall: PasswordRegister;
8
+ result: undefined | Awaited<ReturnType<PasswordRegister>>;
9
+ } & Parameters<PasswordRegister>[0];
10
+ type FormData = ({
11
+ type: "login";
12
+ } & PasswordLoginDataAndFunc) | ({
13
+ type: "loginTotp";
14
+ } & PasswordLoginDataAndFunc) | ({
15
+ type: "loginTotpRecovery";
16
+ } & PasswordLoginDataAndFunc) | ({
17
+ type: "registerWithPassword";
18
+ } & PasswordRegisterDataAndFunc) | ({
19
+ type: "registerWithPasswordConfirmationCode";
20
+ onCall: ConfirmEmail;
21
+ result: undefined | Awaited<ReturnType<ConfirmEmail>>;
22
+ } & Parameters<ConfirmEmail>[0]);
23
+ type FormStates = FormData["type"];
24
+ export declare const useAuthState: ({ auth, initialState, initialUsername, invitationToken, }: {
3
25
  auth: AuthHandler;
26
+ initialState?: FormStates;
27
+ initialUsername?: string;
28
+ invitationToken?: string;
4
29
  }) => {
5
30
  formHandlers: {
6
31
  state: "login" | "loginTotp" | "loginTotpRecovery" | "registerWithPassword" | "registerWithPasswordConfirmationCode";
@@ -44,7 +69,7 @@ export declare const useAuthState: ({ auth }: {
44
69
  };
45
70
  }>) => Promise<import("./authRequest").ClientAuthResponse<"login">>) | undefined;
46
71
  } | {
47
- onCall: (data: import("prostgles-types").JSONB.GetObjectType<{
72
+ onCall: ((data: import("prostgles-types").JSONB.GetObjectType<{
48
73
  readonly invitationToken: {
49
74
  readonly type: "string";
50
75
  readonly optional: true;
@@ -58,7 +83,7 @@ export declare const useAuthState: ({ auth }: {
58
83
  readonly type: "string";
59
84
  readonly optional: true;
60
85
  };
61
- }>) => Promise<import("./authRequest").ClientAuthResponse<"register">>;
86
+ }>) => Promise<import("./authRequest").ClientAuthResponse<"register">>) | undefined;
62
87
  result: ({
63
88
  code: "server-error" | "rate-limit-exceeded" | "something-went-wrong";
64
89
  success: false;
@@ -505,4 +530,5 @@ export declare const ERR_CODE_MESSAGES: {
505
530
  "expired-otp-code": string;
506
531
  "provider-issue": string;
507
532
  };
533
+ export {};
508
534
  //# sourceMappingURL=useAuthState.d.ts.map
package/dist/auth/useAuthState.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useAuthState.d.ts","sourceRoot":"","sources":["../../lib/auth/useAuthState.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAiD,MAAM,mBAAmB,CAAC;AA6BpG,eAAO,MAAM,YAAY,GAAI,UAAU;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAa/C,OAAO;iBACP,MAAM;;;CAoNlB,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmC7B,CAAC"}
1
+ {"version":3,"file":"useAuthState.d.ts","sourceRoot":"","sources":["../../lib/auth/useAuthState.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEpG,KAAK,wBAAwB,GAAG;IAC9B,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;CACxD,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,KAAK,2BAA2B,GAAG;IACjC,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;CAC3D,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpC,KAAK,QAAQ,GACT,CAAC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG,wBAAwB,CAAC,GAC9C,CAAC;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GAAG,wBAAwB,CAAC,GAClD,CAAC;IAAE,IAAI,EAAE,mBAAmB,CAAA;CAAE,GAAG,wBAAwB,CAAC,GAC1D,CAAC;IACC,IAAI,EAAE,sBAAsB,CAAC;CAC9B,GAAG,2BAA2B,CAAC,GAChC,CAAC;IACC,IAAI,EAAE,sCAAsC,CAAC;IAC7C,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;CACvD,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAErC,KAAK,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;AAInC,eAAO,MAAM,YAAY,GAAI,2DAK1B;IACD,IAAI,EAAE,WAAW,CAAC;IAClB,YAAY,CAAC,EAAE,UAAU,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAaY,OAAO;iBACP,MAAM;;;CAwNlB,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmC7B,CAAC"}
package/dist/auth/useAuthState.js CHANGED
@@ -5,10 +5,10 @@ const prostgles_types_1 = require("prostgles-types");
5
5
  const reactImports_1 = require("../hooks/reactImports");
6
6
  const { useEffect, useState } = reactImports_1.reactImports;
7
7
  const loginStates = ["login", "loginTotp", "loginTotpRecovery"];
8
- const useAuthState = ({ auth }) => {
8
+ const useAuthState = ({ auth, initialState = "login", initialUsername = "", invitationToken, }) => {
9
9
  const [loading, setIsLoading] = useState(false);
10
- const [state, setState] = useState("login");
11
- const [username, setUsername] = useState("");
10
+ const [state, setState] = useState(initialState);
11
+ const [username, setUsername] = useState(initialUsername);
12
12
  const [password, setPassword] = useState("");
13
13
  const [emailVerificationCode, setEmailVerificationCode] = useState("");
14
14
  const [totpToken, setTotpToken] = useState("");
@@ -30,16 +30,18 @@ const useAuthState = ({ auth }) => {
30
30
  useEffect(() => {
31
31
  _setError("");
32
32
  }, [username, password, totpToken, totpRecoveryCode, confirmPassword]);
33
- const showPassword = (state === "registerWithPassword" && auth.signupWithEmailAndPassword) ||
33
+ const canRegister = auth.signupWithEmail && (!auth.signupWithEmailOptions?.requireInvitation || invitationToken);
34
+ const requiresPassword = auth.signupWithEmailOptions?.requirePassword ?? true;
35
+ const showPassword = (state === "registerWithPassword" && canRegister && requiresPassword) ||
34
36
  (state === "login" && auth.loginType === "email" && usernamesWithPassword.includes(username)) ||
35
37
  (state === "login" && auth.loginType === "email+password");
36
- const showUsername = (state === "registerWithPassword" && auth.signupWithEmailAndPassword) ||
38
+ const showUsername = (state === "registerWithPassword" && canRegister) ||
37
39
  (state === "login" && auth.loginType === "email") ||
38
40
  (state === "login" && auth.loginType === "email+password");
39
- const showConfirmPassword = state === "registerWithPassword" && auth.signupWithEmailAndPassword;
41
+ const showConfirmPassword = state === "registerWithPassword" && showPassword;
40
42
  const showTotpCode = state === "loginTotp" && auth.login;
41
43
  const showTotpRecoveryCode = state === "loginTotpRecovery" && auth.login;
42
- const showEmailVerificationCode = state === "registerWithPasswordConfirmationCode" && auth.signupWithEmailAndPassword;
44
+ const showEmailVerificationCode = state === "registerWithPasswordConfirmationCode" && auth.confirmEmail;
43
45
  const show = {
44
46
  username: Boolean(showUsername),
45
47
  password: Boolean(showPassword),
@@ -69,13 +71,13 @@ const useAuthState = ({ auth }) => {
69
71
  : state === "login" && auth.loginType === "email+password" ? commonFormHandlers
70
72
  : state === "loginTotp" && auth.login ? commonFormHandlers
71
73
  : state === "loginTotpRecovery" && auth.login ? commonFormHandlers
72
- : state === "registerWithPassword" && auth.signupWithEmailAndPassword ?
74
+ : state === "registerWithPassword" && canRegister ?
73
75
  {
74
76
  ...commonFormHandlers,
75
- onCall: auth.signupWithEmailAndPassword,
77
+ onCall: auth.signupWithEmail,
76
78
  result,
77
79
  }
78
- : state === "registerWithPasswordConfirmationCode" && auth.signupWithEmailAndPassword ?
80
+ : state === "registerWithPasswordConfirmationCode" && auth.confirmEmail ?
79
81
  {
80
82
  ...commonFormHandlers,
81
83
  onCall: () => {
@@ -101,6 +103,7 @@ const useAuthState = ({ auth }) => {
101
103
  remember_me: false,
102
104
  totp_token: isOnlyShowingUsername ? undefined : totpToken,
103
105
  totp_recovery_code: isOnlyShowingUsername ? undefined : totpRecoveryCode,
106
+ ...(state === "registerWithPassword" && invitationToken && { invitationToken }),
104
107
  };
105
108
  const errorMap = {
106
109
  "no match": "Invalid credentials",
@@ -135,7 +138,7 @@ const useAuthState = ({ auth }) => {
135
138
  if (!username) {
136
139
  return setError("Email cannot be empty");
137
140
  }
138
- if (formHandlers.state === "registerWithPassword") {
141
+ if (formHandlers.state === "registerWithPassword" && requiresPassword) {
139
142
  if (!password) {
140
143
  return setError("Password cannot be empty");
141
144
  }
@@ -171,7 +174,7 @@ const useAuthState = ({ auth }) => {
171
174
  window.location.href = res.redirect_url;
172
175
  }
173
176
  if (state === "registerWithPassword") {
174
- setState("registerWithPasswordConfirmationCode");
177
+ setState(res.code === "email-verified" ? "login" : "registerWithPasswordConfirmationCode");
175
178
  }
176
179
  let message = (res.code && SIGNUP_CODE_MESSAGES[res.code]) ?? res.message ?? "Success";
177
180
  if (formHandlers.state === "registerWithPasswordConfirmationCode") {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-client",
3
- "version": "4.0.426",
3
+ "version": "4.0.427",
4
4
  "description": "Reactive client for Postgres",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",