Skip to content

Commit

Permalink
Handle 401 - would be good to do this via an axios hook
Browse files Browse the repository at this point in the history
  • Loading branch information
@josephluck
josephluck committed Sep 26, 2018
1 parent 26ee6e2 commit 81b43c8
Show file tree
Hide file tree
Showing 7 changed files with 227 additions and 187 deletions.
6 changes: 2 additions & 4 deletions now.api.json
View file
Expand Up @@ -5,13 +5,11 @@
"cloud": "v1"
},
"public": true,
"alias": [
"api.internote.app"
],
"alias": ["api.internote.app"],
"scale": {
"bru1": {
"min": 1,
"max": "auto"
}
}
}
}
15 changes: 11 additions & 4 deletions now.ui.json
View file
@@ -1,8 +1,15 @@
{
"name": "internote-ui",
"type": "docker",
"features": {
"cloud": "v1"
},
"public": true,
"alias": [
"internote.app"
]
}
"alias": ["internote.app"],
"scale": {
"bru1": {
"min": 1,
"max": "auto"
}
}
}
291 changes: 155 additions & 136 deletions ui/store/index.ts
View file
Expand Up @@ -6,8 +6,8 @@ import {
removeAuthenticationCookie
} from "../utilities/cookie";
import Router from "next/router";

const api = makeApi(process.env.API_BASE_URL);
import { makeSubscriber } from "@internote/ui/store/make-subscriber";
import { AxiosError } from "axios";

export interface State {
session: Types.Session | null;
Expand All @@ -21,6 +21,7 @@ export interface State {
}

interface Reducers {
resetState: Twine.Reducer0<State>;
setSession: Twine.Reducer<State, Types.Session>;
setNotes: Twine.Reducer<State, Types.Note[]>;
setNote: Twine.Reducer<State, Types.Note | null>;
Expand Down Expand Up @@ -52,12 +53,14 @@ interface Effects {
>;
signOut: Twine.Effect0<State, Actions, void>;
deleteAccount: Twine.Effect0<State, Actions, Promise<void>>;
handleApiError: Twine.Effect<State, Actions, AxiosError>;
}

export type Actions = Twine.Actions<Reducers, Effects>;

const model: Twine.Model<State, Reducers, Effects> = {
state: {
function defaultState(): State {
removeAuthenticationCookie();
return {
session: null,
notes: [],
note: null,
Expand All @@ -66,148 +69,164 @@ const model: Twine.Model<State, Reducers, Effects> = {
deleteNoteModalOpen: false,
signOutModalOpen: false,
deleteAccountModalOpen: false
},
reducers: {
setSession(state, session) {
if (session) {
setAuthenticationCookie(session.token);
} else {
removeAuthenticationCookie();
};
}

function makeModel(): Twine.Model<State, Reducers, Effects> {
const api = makeApi(process.env.API_BASE_URL);

return {
state: defaultState(),
reducers: {
resetState: defaultState,
setSession(state, session) {
if (session) {
setAuthenticationCookie(session.token);
} else {
removeAuthenticationCookie();
}
return {
...state,
session
};
},
setLoading(state, loading) {
return {
...state,
loading
};
},
setNotes(state, notes) {
return {
...state,
notes
};
},
setNote(state, note) {
return {
...state,
note
};
},
setSidebarOpen(state, sidebarOpen) {
return {
...state,
sidebarOpen
};
},
setDeleteNoteModalOpen(state, deleteNoteModalOpen) {
return {
...state,
deleteNoteModalOpen
};
},
setSignOutModalOpen(state, signOutModalOpen) {
return {
...state,
signOutModalOpen
};
},
setDeleteAccountModalOpen(state, deleteAccountModalOpen) {
return {
...state,
deleteAccountModalOpen
};
}
return {
...state,
session
};
},
setLoading(state, loading) {
return {
...state,
loading
};
},
setNotes(state, notes) {
return {
...state,
notes
};
},
setNote(state, note) {
return {
...state,
note
};
},
setSidebarOpen(state, sidebarOpen) {
return {
...state,
sidebarOpen
};
},
setDeleteNoteModalOpen(state, deleteNoteModalOpen) {
return {
...state,
deleteNoteModalOpen
};
},
setSignOutModalOpen(state, signOutModalOpen) {
return {
...state,
signOutModalOpen
};
},
setDeleteAccountModalOpen(state, deleteAccountModalOpen) {
return {
...state,
deleteAccountModalOpen
};
}
},
effects: {
async fetchNotes(state, actions) {
actions.setLoading(true);
const notes = await api.note.findAll(state.session.token);
actions.setNotes(notes);
actions.setLoading(false);
},
async fetchNote(state, actions, id) {
const existingNote = state.notes.find(note => note.id === id);
effects: {
async fetchNotes(state, actions) {
actions.setLoading(true);
const notes = await api.note.findAll(state.session.token);
actions.setNotes(notes);
actions.setLoading(false);
},
async fetchNote(state, actions, id) {
const existingNote = state.notes.find(note => note.id === id);

if (existingNote) {
actions.setNote(existingNote);
} else {
if (existingNote) {
actions.setNote(existingNote);
} else {
actions.setLoading(true);
const result = await api.note.findById(state.session.token, id);
result.map(actions.setNote);
actions.setLoading(false);
}
},
async newNote(state, actions) {
actions.setLoading(true);
const result = await api.note.findById(state.session.token, id);
result.map(note => {
actions.setNote(note);
const note = await api.note.create(state.session.token, {
content: "TODO dummy content"
});
Router.push(`/?id=${note.id}`);
actions.setLoading(false);
},
async saveNote(state, actions, { content }) {
const newNote = {
...state.note,
content
};
actions.setNote(newNote);
actions.setNotes(
state.notes.map(note => (note.id === newNote.id ? newNote : note))
);
actions.setLoading(true);
await api.note.updateById(state.session.token, state.note.id, {
content
});
actions.setLoading(false);
},
async deleteNote(state, actions) {
actions.setLoading(true);
await api.note.deleteById(state.session.token, state.note.id);
actions.setNotes(await api.note.findAll(state.session.token));
actions.setNote(null);
actions.setDeleteNoteModalOpen(false);
// TODO: Show a toast message here
Router.push("/");
},
async register(_state, actions, { email, password }) {
const session = await api.auth.register({ email, password });
actions.setSession(session);
// TODO: Show a toast message here
Router.push("/");
},
session(_state, actions, token) {
return api.auth
.session(token)
.then(session => {
actions.setSession(session);
})
.catch(actions.handleApiError);
},
async authenticate(_state, actions, { email, password }) {
const session = await api.auth.login({ email, password });
actions.setSession(session);
// TODO: Show a toast message here
Router.push("/");
},
async signOut(_state, actions) {
actions.resetState();
Router.push("/login");
},
async deleteAccount(state, actions) {
actions.resetState();
await api.user.deleteById(state.session.token, state.session.user.id);
Router.push("/register");
},
handleApiError(_state, actions, error) {
if (error.response.status === 401) {
// TODO: Show a toast message here
actions.signOut();
}
}
},
async newNote(state, actions) {
actions.setLoading(true);
const note = await api.note.create(state.session.token, {
content: "New note"
});
Router.push(`/?id=${note.id}`);
actions.setLoading(false);
},
async saveNote(state, actions, { content }) {
const newNote = {
...state.note,
content
};
actions.setNote(newNote);
actions.setNotes(
state.notes.map(note => (note.id === newNote.id ? newNote : note))
);
actions.setLoading(true);
await api.note.updateById(state.session.token, state.note.id, {
content
});
actions.setLoading(false);
},
async deleteNote(state, actions) {
actions.setLoading(true);
await api.note.deleteById(state.session.token, state.note.id);
actions.setNotes(await api.note.findAll(state.session.token));
actions.setNote(null);
actions.setDeleteNoteModalOpen(false);
Router.push("/");
},
async register(_state, actions, { email, password }) {
const session = await api.auth.register({ email, password });
actions.setSession(session);
Router.push("/");
},
async session(_state, actions, token) {
const session = await api.auth.session(token);
actions.setSession(session);
},
async authenticate(_state, actions, { email, password }) {
const session = await api.auth.login({ email, password });
actions.setSession(session);
Router.push("/");
},
async signOut(_state, actions) {
actions.setSession(null);
actions.setNotes([]);
actions.setNote(null);
actions.setSignOutModalOpen(false);
Router.push("/login");
},
async deleteAccount(state, actions) {
actions.setSession(null);
actions.setNotes([]);
actions.setNote(null);
actions.setDeleteAccountModalOpen(false);
await api.user.deleteById(state.session.token, state.session.user.id);
Router.push("/register");
}
}
};
};
}

export function makeStore() {
return twine<State, Actions>(model);
return twine<State, Actions>(makeModel());
}

export type Store = Twine.Return<State, Actions>;

export const Subscribe = makeSubscriber(makeStore());

0 comments on commit 81b43c8

Please sign in to comment.