@techstuff-dev/foundation-api-utils 1.11.0 → 1.13.0

package/dist/@types/lib/services/auth/slice.d.ts

@@ -22,27 +22,7 @@ export declare const authSlice: import("@reduxjs/toolkit").Slice<AuthState, {
         };
         authenticated: boolean;
         verifying: boolean;
-        user: import("immer").WritableDraft<{
-            accessToken: string;
-            idToken: string;
-            refreshToken: string;
-            accessTokenExpiry?: number | undefined;
-            details: {
-                subscriptionDetails?: any;
-                userSub?: string | undefined;
-                userEmail?: string | undefined;
-                lastName?: string | undefined;
-                firstName?: string | undefined;
-                avatar?: string | undefined;
-                dateOfBirth?: string | undefined;
-                termsAccepted: any;
-                contactPreference: any;
-                uuid?: string | undefined;
-                subscription?: string | undefined;
-                customerId?: string | undefined;
-            };
-            email?: string | undefined;
-        }>;
+        user: import("immer").WritableDraft<import("../../types/index.interfaces").User>;
         loading: boolean;
         error: boolean;
         session?: string | undefined;
@@ -56,21 +36,26 @@ export declare const authSlice: import("@reduxjs/toolkit").Slice<AuthState, {
                 subscription: any;
                 subscriptionDetails: any;
                 userSub?: string | undefined;
-                userEmail?: string | undefined;
-                lastName?: string | undefined;
+                uuid?: string | undefined;
                 firstName?: string | undefined;
+                lastName?: string | undefined;
+                userEmail?: string | undefined;
                 avatar?: string | undefined;
+                termsAccepted?: string | undefined;
                 dateOfBirth?: string | undefined;
-                termsAccepted: any;
-                contactPreference: any;
-                uuid?: string | undefined;
-                customerId?: string | undefined;
+                contactPreference?: boolean | undefined;
+                password?: string | undefined;
+                passwordConfirm?: string | undefined;
+                agency?: boolean | undefined;
             };
-            accessToken: string;
-            idToken: string;
-            refreshToken: string;
-            accessTokenExpiry?: number | undefined;
+            accessToken?: string | undefined;
+            idToken?: string | undefined;
+            refreshToken?: string | undefined;
+            expires?: number | undefined;
+            accessTokenExpiry?: number | null | undefined;
             email?: string | undefined;
+            info?: import("immer").WritableDraft<import("../../types/index.interfaces").Info> | undefined;
+            sub?: string | undefined;
         };
         authenticated: boolean;
         verifying: boolean;
@@ -85,22 +70,9 @@ export declare const authSlice: import("@reduxjs/toolkit").Slice<AuthState, {
     logout: () => AuthState;
 }, "auth", "auth", {
     isAuthenticated: (auth: AuthState) => boolean;
-    selectAccessToken: (auth: AuthState) => string;
-    selectRefreshToken: (auth: AuthState) => string;
-    selectCurrentUser: (auth: AuthState) => {
-        subscriptionDetails?: any;
-        userSub?: string | undefined;
-        userEmail?: string | undefined;
-        lastName?: string | undefined;
-        firstName?: string | undefined;
-        avatar?: string | undefined;
-        dateOfBirth?: string | undefined;
-        termsAccepted: any;
-        contactPreference: any;
-        uuid?: string | undefined;
-        subscription?: string | undefined;
-        customerId?: string | undefined;
-    };
+    selectAccessToken: (auth: AuthState) => string | undefined;
+    selectRefreshToken: (auth: AuthState) => string | undefined;
+    selectCurrentUser: (auth: AuthState) => import("../../types/index.interfaces").UserDetails | undefined;
     selectUserCreating: (auth: AuthState) => {
         details: string;
         payment: string;
@@ -109,15 +81,30 @@ export declare const authSlice: import("@reduxjs/toolkit").Slice<AuthState, {
     isVerifying: (auth: AuthState) => boolean;
     getUserSession: (auth: AuthState) => string | false | undefined;
     selectCurrentUserSub: (auth: AuthState) => string | undefined;
-    selectCurrentUserRefreshToken: (auth: AuthState) => string;
+    selectCurrentUserRefreshToken: (auth: AuthState) => string | undefined;
     selectUserTokens: (auth: AuthState) => {
-        accessToken: string;
-        refreshToken: string;
-        idToken: string;
+        accessToken: string | undefined;
+        refreshToken: string | undefined;
+        idToken: string | undefined;
     };
-    selectUserSubscriptionStatus: (auth: AuthState) => any;
-    selectSubscription: (auth: AuthState) => string | undefined;
-    selectSubscriptionPrice: (auth: AuthState) => any;
+    selectUserSubscriptionStatus: (auth: AuthState) => string | undefined;
+    selectSubscription: (auth: AuthState) => {
+        status: string;
+        id: string;
+        created: number;
+        nextPayment: number;
+        amount: number;
+        interval: string;
+        currency: string;
+        cancelAt?: number | undefined;
+        planID: string;
+        planDescription: string;
+        paymentDetails: {
+            response: import("../../types/index.interfaces").PaymentResponse;
+            formatted: import("../../types/index.interfaces").FormattedPayment;
+        };
+    } | undefined;
+    selectSubscriptionPrice: (auth: AuthState) => number | undefined;
 }>;
 export declare const setCredentials: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "auth/setCredentials">, resetCreating: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"auth/resetCreating">, logout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"auth/logout">, updateSubscription: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "auth/updateSubscription">;
 export declare const isAuthenticated: import("reselect").Selector<{
@@ -126,42 +113,16 @@ export declare const isAuthenticated: import("reselect").Selector<{
     unwrapped: (auth: AuthState) => boolean;
 }, selectAccessToken: import("reselect").Selector<{
     auth: AuthState;
-}, string, []> & {
-    unwrapped: (auth: AuthState) => string;
+}, string | undefined, []> & {
+    unwrapped: (auth: AuthState) => string | undefined;
 }, selectRefreshToken: import("reselect").Selector<{
     auth: AuthState;
-}, string, []> & {
-    unwrapped: (auth: AuthState) => string;
+}, string | undefined, []> & {
+    unwrapped: (auth: AuthState) => string | undefined;
 }, selectCurrentUser: import("reselect").Selector<{
     auth: AuthState;
-}, {
-    subscriptionDetails?: any;
-    userSub?: string | undefined;
-    userEmail?: string | undefined;
-    lastName?: string | undefined;
-    firstName?: string | undefined;
-    avatar?: string | undefined;
-    dateOfBirth?: string | undefined;
-    termsAccepted: any;
-    contactPreference: any;
-    uuid?: string | undefined;
-    subscription?: string | undefined;
-    customerId?: string | undefined;
-}, []> & {
-    unwrapped: (auth: AuthState) => {
-        subscriptionDetails?: any;
-        userSub?: string | undefined;
-        userEmail?: string | undefined;
-        lastName?: string | undefined;
-        firstName?: string | undefined;
-        avatar?: string | undefined;
-        dateOfBirth?: string | undefined;
-        termsAccepted: any;
-        contactPreference: any;
-        uuid?: string | undefined;
-        subscription?: string | undefined;
-        customerId?: string | undefined;
-    };
+}, import("../../types/index.interfaces").UserDetails | undefined, []> & {
+    unwrapped: (auth: AuthState) => import("../../types/index.interfaces").UserDetails | undefined;
 }, selectUserCreating: import("reselect").Selector<{
     auth: AuthState;
 }, {
@@ -190,32 +151,62 @@ export declare const isAuthenticated: import("reselect").Selector<{
     unwrapped: (auth: AuthState) => string | undefined;
 }, selectCurrentUserRefreshToken: import("reselect").Selector<{
     auth: AuthState;
-}, string, []> & {
-    unwrapped: (auth: AuthState) => string;
+}, string | undefined, []> & {
+    unwrapped: (auth: AuthState) => string | undefined;
 }, selectUserTokens: import("reselect").Selector<{
     auth: AuthState;
 }, {
-    accessToken: string;
-    refreshToken: string;
-    idToken: string;
+    accessToken: string | undefined;
+    refreshToken: string | undefined;
+    idToken: string | undefined;
 }, []> & {
     unwrapped: (auth: AuthState) => {
-        accessToken: string;
-        refreshToken: string;
-        idToken: string;
+        accessToken: string | undefined;
+        refreshToken: string | undefined;
+        idToken: string | undefined;
     };
 }, selectUserSubscriptionStatus: import("reselect").Selector<{
     auth: AuthState;
-}, any, []> & {
-    unwrapped: (auth: AuthState) => any;
-}, selectSubscription: import("reselect").Selector<{
-    auth: AuthState;
 }, string | undefined, []> & {
     unwrapped: (auth: AuthState) => string | undefined;
+}, selectSubscription: import("reselect").Selector<{
+    auth: AuthState;
+}, {
+    status: string;
+    id: string;
+    created: number;
+    nextPayment: number;
+    amount: number;
+    interval: string;
+    currency: string;
+    cancelAt?: number | undefined;
+    planID: string;
+    planDescription: string;
+    paymentDetails: {
+        response: import("../../types/index.interfaces").PaymentResponse;
+        formatted: import("../../types/index.interfaces").FormattedPayment;
+    };
+} | undefined, []> & {
+    unwrapped: (auth: AuthState) => {
+        status: string;
+        id: string;
+        created: number;
+        nextPayment: number;
+        amount: number;
+        interval: string;
+        currency: string;
+        cancelAt?: number | undefined;
+        planID: string;
+        planDescription: string;
+        paymentDetails: {
+            response: import("../../types/index.interfaces").PaymentResponse;
+            formatted: import("../../types/index.interfaces").FormattedPayment;
+        };
+    } | undefined;
 }, selectSubscriptionPrice: import("reselect").Selector<{
     auth: AuthState;
-}, any, []> & {
-    unwrapped: (auth: AuthState) => any;
+}, number | undefined, []> & {
+    unwrapped: (auth: AuthState) => number | undefined;
 };
 declare const _default: import("redux").Reducer<AuthState>;
 export default _default;

package/dist/@types/lib/types/index.interfaces.d.ts

@@ -15,19 +15,34 @@ export type UserCreating = {
     details: UserDetails;
 };
 export type User = {
-    accessToken: string;
-    idToken: string;
-    refreshToken: string;
-    accessTokenExpiry: number | null;
-    details: UserDetails;
-    email: string;
-    info: Info;
+    accessToken?: string;
+    idToken?: string;
+    refreshToken?: string;
+    expires?: number;
+    accessTokenExpiry?: number | null;
+    details?: UserDetails;
+    email?: string;
+    info?: Info;
+    sub?: string;
 };
 export type UserDetails = {
-    userSub: string;
+    userSub?: string;
     uuid?: string;
     subscriptionDetails?: {
         status: string;
+        id: string;
+        created: number;
+        nextPayment: number;
+        amount: number;
+        interval: string;
+        currency: string;
+        cancelAt?: number;
+        planID: string;
+        planDescription: string;
+        paymentDetails: {
+            response: PaymentResponse;
+            formatted: FormattedPayment;
+        };
     };
     firstName?: string;
     lastName?: string;
@@ -35,10 +50,11 @@ export type UserDetails = {
     avatar?: string;
     termsAccepted?: string;
     dateOfBirth?: string;
-    contactPreference: boolean;
+    contactPreference?: boolean;
     password?: string;
     passwordConfirm?: string;
-    agency: boolean;
+    agency?: boolean;
+    [key: string]: any;
 };
 export type Info = {
     orders?: string[];
@@ -92,27 +108,7 @@ export interface VerifyUserResponse {
 export interface AuthState {
     authenticated: boolean;
     verifying: boolean;
-    user: {
-        accessToken: string;
-        idToken: string;
-        refreshToken: string;
-        accessTokenExpiry?: number;
-        details: {
-            subscriptionDetails?: any;
-            userSub?: string;
-            userEmail?: string;
-            lastName?: string;
-            firstName?: string;
-            avatar?: string;
-            dateOfBirth?: string;
-            termsAccepted: any;
-            contactPreference: any;
-            uuid?: string;
-            subscription?: string;
-            customerId?: string;
-        };
-        email?: string;
-    };
+    user: User;
     creating: {
         details: string;
         payment: string;
@@ -265,58 +261,60 @@ export interface UserSubResponse {
         status: string;
     };
     payment: {
-        response: {
-            id: string;
-            object: string;
-            allow_redisplay: string;
-            billing_details: {
-                address: {
-                    city: null;
-                    country: null;
-                    line1: null;
-                    line2: null;
-                    postal_code: null;
-                    state: null;
-                };
-                email: null;
-                name: string;
-                phone: null;
-            };
-            card: {
-                brand: string;
-                checks: {
-                    address_line1_check: null;
-                    address_postal_code_check: null;
-                    cvc_check: string;
-                };
-                country: string;
-                display_brand: string;
-                exp_month: number;
-                exp_year: number;
-                fingerprint: string;
-                funding: string;
-                generated_from: null;
-                last4: string;
-                networks: {
-                    available: string[];
-                    preferred: null;
-                };
-                three_d_secure_usage: {
-                    supported: boolean;
-                };
-                wallet: null;
-            };
-            created: number;
-            customer: string;
-            livemode: boolean;
-            metadata: {};
-            type: string;
+        response: PaymentResponse;
+        formatted: FormattedPayment;
+    };
+}
+export interface FormattedPayment {
+    id: string;
+    maskedNumber: string;
+    expirationDate: string;
+    cardType: string;
+}
+export interface PaymentResponse {
+    id: string;
+    object: string;
+    allow_redisplay: string;
+    billing_details: {
+        address: {
+            city: null;
+            country: null;
+            line1: null;
+            line2: null;
+            postal_code: null;
+            state: null;
+        };
+        email: null;
+        name: string;
+        phone: null;
+    };
+    card: {
+        brand: string;
+        checks: {
+            address_line1_check: null;
+            address_postal_code_check: null;
+            cvc_check: string;
+        };
+        country: string;
+        display_brand: string;
+        exp_month: number;
+        exp_year: number;
+        fingerprint: string;
+        funding: string;
+        generated_from: null;
+        last4: string;
+        networks: {
+            available: string[];
+            preferred: null;
         };
-        formatted: {
-            id: string;
-            maskedNumber: string;
-            expirationDate: string;
-            cardType: string;
+        three_d_secure_usage: {
+            supported: boolean;
         };
+        wallet: null;
     };
+    created: number;
+    customer: string;
+    livemode: boolean;
+    metadata: {};
+    type: string;
 }

package/dist/index.esm.js

@@ -86,9 +86,7 @@ var initialState = {
             userSub: '',
             uuid: '',
             subscription: '',
-            subscriptionDetails: {
-                status: '',
-            },
+            subscriptionDetails: undefined,
             firstName: '',
             lastName: '',
             userEmail: '',
@@ -98,7 +96,7 @@ var initialState = {
         },
         accessToken: '',
         idToken: '',
-        accessTokenExpiry: undefined,
+        accessTokenExpiry: null,
         refreshToken: '',
         email: '',
     },
@@ -137,7 +135,7 @@ var authSlice = createSlice({
         selectUserCreatingDetails: function (auth) { return auth.creating.details; },
         isVerifying: function (auth) { return auth.verifying; },
         getUserSession: function (auth) { return (auth.authenticated ? auth.session : false); },
-        selectCurrentUserSub: function (auth) { return auth.user.details.uuid; },
+        selectCurrentUserSub: function (auth) { var _a, _b; return (_b = (_a = auth === null || auth === void 0 ? void 0 : auth.user) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.uuid; },
         selectCurrentUserRefreshToken: function (auth) { return auth.user.refreshToken; },
         selectUserTokens: function (auth) {
             return {
@@ -147,13 +145,16 @@ var authSlice = createSlice({
             };
         },
         selectUserSubscriptionStatus: function (auth) {
-            return auth.user.details.subscriptionDetails.status;
+            var _a, _b, _c;
+            return (_c = (_b = (_a = auth === null || auth === void 0 ? void 0 : auth.user) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.subscriptionDetails) === null || _c === void 0 ? void 0 : _c.status;
         },
         selectSubscription: function (auth) {
-            return auth.user.details.subscription;
+            var _a, _b;
+            return (_b = (_a = auth === null || auth === void 0 ? void 0 : auth.user) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.subscriptionDetails;
         },
         selectSubscriptionPrice: function (auth) {
-            return auth.user.details.subscriptionDetails.price;
+            var _a, _b, _c;
+            return (_c = (_b = (_a = auth === null || auth === void 0 ? void 0 : auth.user) === null || _a === void 0 ? void 0 : _a.details) === null || _b === void 0 ? void 0 : _b.subscriptionDetails) === null || _c === void 0 ? void 0 : _c.amount;
         },
     },
 });
@@ -165,6 +166,7 @@ authSlice.reducer;
 
 // TODO: typing.
 var formatUserPayload = function (payload) {
+    console.log('formatUserPayload', payload);
     var userEmail = payload.email, firstName = payload.given_name, lastName = payload.family_name, dateOfBirth = payload.birthdate, uuid = payload["cognito:username"], termsAccepted = payload["custom:termsAccepted"], subscriptionId = payload["custom:subscriptionId"], contactPreference = payload["custom:contactPreferences"], customerId = payload["custom:customerId"];
     var parsedTermsAccepted = termsAccepted ? JSON.parse(termsAccepted) : null;
     var parsedContactPreference = contactPreference
@@ -182,6 +184,7 @@ var formatUserPayload = function (payload) {
         subscription: subscriptionId || null,
         customerId: customerId,
     };
+    console.log('formatUserPayload', data);
     return data;
 };
 function formatPromos(data) {