@sparkstudio/authentication-ui 1.0.21 → 1.0.23

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 (5) hide show
  1. package/dist/index.cjs +10 -18
  2. package/dist/index.d.cts +2 -4
  3. package/dist/index.d.ts +2 -4
  4. package/dist/index.js +10 -18
  5. package/package.json +3 -3
package/dist/index.cjs CHANGED
@@ -44,7 +44,6 @@ var Auth = class {
44
44
  const token = localStorage.getItem("auth_token");
45
45
  const requestOptions = {
46
46
  method: "GET",
47
- credentials: "include",
48
47
  headers: {
49
48
  "Content-Type": "application/json",
50
49
  ...token && { Authorization: `Bearer ${token}` }
@@ -59,7 +58,6 @@ var Auth = class {
59
58
  const token = localStorage.getItem("auth_token");
60
59
  const requestOptions = {
61
60
  method: "GET",
62
- credentials: "include",
63
61
  headers: {
64
62
  "Content-Type": "application/json",
65
63
  ...token && { Authorization: `Bearer ${token}` }
@@ -74,7 +72,6 @@ var Auth = class {
74
72
  const token = localStorage.getItem("auth_token");
75
73
  const requestOptions = {
76
74
  method: "POST",
77
- credentials: "include",
78
75
  headers: {
79
76
  "Content-Type": "application/json",
80
77
  ...token && { Authorization: `Bearer ${token}` }
@@ -85,12 +82,6 @@ var Auth = class {
85
82
  if (!response.ok) throw new Error(await response.text());
86
83
  return await response.json();
87
84
  }
88
- getCookie(name) {
89
- const value = `; ${document.cookie}`;
90
- const parts = value.split(`; ${name}=`);
91
- if (parts.length === 2) return parts.pop().split(";").shift() || null;
92
- return null;
93
- }
94
85
  };
95
86
 
96
87
  // src/api/Controllers/Home.ts
@@ -99,12 +90,6 @@ var Home = class {
99
90
  constructor(baseUrl) {
100
91
  this.baseUrl = baseUrl;
101
92
  }
102
- getCookie(name) {
103
- const value = `; ${document.cookie}`;
104
- const parts = value.split(`; ${name}=`);
105
- if (parts.length === 2) return parts.pop().split(";").shift() || null;
106
- return null;
107
- }
108
93
  };
109
94
 
110
95
  // src/api/SparkStudioAuthenticationSDK.ts
@@ -118,6 +103,7 @@ var SparkStudioAuthenticationSDK = class {
118
103
  };
119
104
 
120
105
  // src/context/UserProvider.tsx
106
+ var import_accounts_sdk = require("@sparkstudio/accounts-sdk");
121
107
  var import_jsx_runtime = require("react/jsx-runtime");
122
108
  var UserContext = (0, import_react.createContext)(void 0);
123
109
  function UserProvider({
@@ -137,7 +123,13 @@ function UserProvider({
137
123
  try {
138
124
  const api = new SparkStudioAuthenticationSDK(authenticationUrl);
139
125
  const me = await api.auth.GetCurrentUser();
140
- setUser(me);
126
+ if (me) {
127
+ const accountsApi = new import_accounts_sdk.SparkStudioAccountsSDK(accountsUrl);
128
+ const dbUser = await accountsApi.users.SyncUser();
129
+ setUser(dbUser);
130
+ } else {
131
+ throw new Error("Authenticated user in cache does not exist.");
132
+ }
141
133
  } catch (error) {
142
134
  console.warn("No user logged in", error);
143
135
  setUserState(null);
@@ -195,7 +187,7 @@ function useUser() {
195
187
  var import_react2 = require("react");
196
188
  var import_google = require("@react-oauth/google");
197
189
  var import_common_ui = require("@sparkstudio/common-ui");
198
- var import_accounts_sdk = require("@sparkstudio/accounts-sdk");
190
+ var import_accounts_sdk2 = require("@sparkstudio/accounts-sdk");
199
191
  var import_jsx_runtime2 = require("react/jsx-runtime");
200
192
  function LoginButton({ onLogin, onLoginFailed }) {
201
193
  const { setUser, authenticationUrl, accountsUrl } = useUser();
@@ -210,7 +202,7 @@ function LoginButton({ onLogin, onLoginFailed }) {
210
202
  });
211
203
  const user = authentication?.User ?? null;
212
204
  localStorage.setItem("auth_token", authentication?.Token ?? "");
213
- const accountsApi = new import_accounts_sdk.SparkStudioAccountsSDK(accountsUrl);
205
+ const accountsApi = new import_accounts_sdk2.SparkStudioAccountsSDK(accountsUrl);
214
206
  const dbUser = await accountsApi.users.SyncUser();
215
207
  setUser(dbUser);
216
208
  onLogin?.(user);
package/dist/index.d.cts CHANGED
@@ -5,14 +5,14 @@ import { ReactNode } from 'react';
5
5
  * Represents an Auto-generated model for UserDTO.
6
6
  */
7
7
  interface IUserDTO {
8
- Sub?: string;
8
+ Id?: string;
9
9
  Name?: string;
10
10
  Email?: string;
11
11
  ProfilePicture?: string;
12
12
  }
13
13
  type UserDTOInit = Partial<IUserDTO>;
14
14
  declare class UserDTO implements IUserDTO {
15
- Sub?: string;
15
+ Id?: string;
16
16
  Name?: string;
17
17
  Email?: string;
18
18
  ProfilePicture?: string;
@@ -107,7 +107,6 @@ declare class Auth {
107
107
  Logout(): Promise<UserDTO>;
108
108
  GetCurrentUser(): Promise<UserDTO>;
109
109
  SignIn(tokenRequest: TokenRequest): Promise<AuthResponse>;
110
- private getCookie;
111
110
  }
112
111
 
113
112
  /**
@@ -116,7 +115,6 @@ declare class Auth {
116
115
  declare class Home {
117
116
  private baseUrl;
118
117
  constructor(baseUrl: string);
119
- private getCookie;
120
118
  }
121
119
 
122
120
  /**
package/dist/index.d.ts CHANGED
@@ -5,14 +5,14 @@ import { ReactNode } from 'react';
5
5
  * Represents an Auto-generated model for UserDTO.
6
6
  */
7
7
  interface IUserDTO {
8
- Sub?: string;
8
+ Id?: string;
9
9
  Name?: string;
10
10
  Email?: string;
11
11
  ProfilePicture?: string;
12
12
  }
13
13
  type UserDTOInit = Partial<IUserDTO>;
14
14
  declare class UserDTO implements IUserDTO {
15
- Sub?: string;
15
+ Id?: string;
16
16
  Name?: string;
17
17
  Email?: string;
18
18
  ProfilePicture?: string;
@@ -107,7 +107,6 @@ declare class Auth {
107
107
  Logout(): Promise<UserDTO>;
108
108
  GetCurrentUser(): Promise<UserDTO>;
109
109
  SignIn(tokenRequest: TokenRequest): Promise<AuthResponse>;
110
- private getCookie;
111
110
  }
112
111
 
113
112
  /**
@@ -116,7 +115,6 @@ declare class Auth {
116
115
  declare class Home {
117
116
  private baseUrl;
118
117
  constructor(baseUrl: string);
119
- private getCookie;
120
118
  }
121
119
 
122
120
  /**
package/dist/index.js CHANGED
@@ -17,7 +17,6 @@ var Auth = class {
17
17
  const token = localStorage.getItem("auth_token");
18
18
  const requestOptions = {
19
19
  method: "GET",
20
- credentials: "include",
21
20
  headers: {
22
21
  "Content-Type": "application/json",
23
22
  ...token && { Authorization: `Bearer ${token}` }
@@ -32,7 +31,6 @@ var Auth = class {
32
31
  const token = localStorage.getItem("auth_token");
33
32
  const requestOptions = {
34
33
  method: "GET",
35
- credentials: "include",
36
34
  headers: {
37
35
  "Content-Type": "application/json",
38
36
  ...token && { Authorization: `Bearer ${token}` }
@@ -47,7 +45,6 @@ var Auth = class {
47
45
  const token = localStorage.getItem("auth_token");
48
46
  const requestOptions = {
49
47
  method: "POST",
50
- credentials: "include",
51
48
  headers: {
52
49
  "Content-Type": "application/json",
53
50
  ...token && { Authorization: `Bearer ${token}` }
@@ -58,12 +55,6 @@ var Auth = class {
58
55
  if (!response.ok) throw new Error(await response.text());
59
56
  return await response.json();
60
57
  }
61
- getCookie(name) {
62
- const value = `; ${document.cookie}`;
63
- const parts = value.split(`; ${name}=`);
64
- if (parts.length === 2) return parts.pop().split(";").shift() || null;
65
- return null;
66
- }
67
58
  };
68
59
 
69
60
  // src/api/Controllers/Home.ts
@@ -72,12 +63,6 @@ var Home = class {
72
63
  constructor(baseUrl) {
73
64
  this.baseUrl = baseUrl;
74
65
  }
75
- getCookie(name) {
76
- const value = `; ${document.cookie}`;
77
- const parts = value.split(`; ${name}=`);
78
- if (parts.length === 2) return parts.pop().split(";").shift() || null;
79
- return null;
80
- }
81
66
  };
82
67
 
83
68
  // src/api/SparkStudioAuthenticationSDK.ts
@@ -91,6 +76,7 @@ var SparkStudioAuthenticationSDK = class {
91
76
  };
92
77
 
93
78
  // src/context/UserProvider.tsx
79
+ import { SparkStudioAccountsSDK } from "@sparkstudio/accounts-sdk";
94
80
  import { jsx } from "react/jsx-runtime";
95
81
  var UserContext = createContext(void 0);
96
82
  function UserProvider({
@@ -110,7 +96,13 @@ function UserProvider({
110
96
  try {
111
97
  const api = new SparkStudioAuthenticationSDK(authenticationUrl);
112
98
  const me = await api.auth.GetCurrentUser();
113
- setUser(me);
99
+ if (me) {
100
+ const accountsApi = new SparkStudioAccountsSDK(accountsUrl);
101
+ const dbUser = await accountsApi.users.SyncUser();
102
+ setUser(dbUser);
103
+ } else {
104
+ throw new Error("Authenticated user in cache does not exist.");
105
+ }
114
106
  } catch (error) {
115
107
  console.warn("No user logged in", error);
116
108
  setUserState(null);
@@ -168,7 +160,7 @@ function useUser() {
168
160
  import { useState as useState2 } from "react";
169
161
  import { useGoogleLogin } from "@react-oauth/google";
170
162
  import { Button } from "@sparkstudio/common-ui";
171
- import { SparkStudioAccountsSDK } from "@sparkstudio/accounts-sdk";
163
+ import { SparkStudioAccountsSDK as SparkStudioAccountsSDK2 } from "@sparkstudio/accounts-sdk";
172
164
  import { Fragment, jsx as jsx2, jsxs } from "react/jsx-runtime";
173
165
  function LoginButton({ onLogin, onLoginFailed }) {
174
166
  const { setUser, authenticationUrl, accountsUrl } = useUser();
@@ -183,7 +175,7 @@ function LoginButton({ onLogin, onLoginFailed }) {
183
175
  });
184
176
  const user = authentication?.User ?? null;
185
177
  localStorage.setItem("auth_token", authentication?.Token ?? "");
186
- const accountsApi = new SparkStudioAccountsSDK(accountsUrl);
178
+ const accountsApi = new SparkStudioAccountsSDK2(accountsUrl);
187
179
  const dbUser = await accountsApi.users.SyncUser();
188
180
  setUser(dbUser);
189
181
  onLogin?.(user);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sparkstudio/authentication-ui",
3
- "version": "1.0.21",
3
+ "version": "1.0.23",
4
4
  "type": "module",
5
5
  "main": "dist/index.cjs",
6
6
  "module": "dist/index.js",
@@ -35,8 +35,8 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@react-oauth/google": "^0.13.4",
38
- "@sparkstudio/accounts-sdk": "^1.1.69",
39
- "@sparkstudio/accounts-ui": "^1.1.69",
38
+ "@sparkstudio/accounts-sdk": "^1.1.71",
39
+ "@sparkstudio/accounts-ui": "^1.1.71",
40
40
  "@sparkstudio/common-ui": "^1.0.5",
41
41
  "rimraf": "^6.1.2"
42
42
  },