Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ services:
- REDIS_SAFE_BROWSING_URI=redis://redis:6379/4
- SESSION_SECRET=thiscouldbeanything
- GA_TRACKING_ID=UA-139330318-1
- SGID_API_HOSTNAME=https://api.id.gov.sg

- OG_URL=https://go.gov.sg
- VALID_EMAIL_GLOB_EXPRESSION=*.gov.sg
Expand Down Expand Up @@ -110,7 +109,7 @@ services:
dockerfile: Dockerfile.maildev-logging
command: bin/maildev --web 80 --smtp 25 --verbose
ports:
- "1080:80"
- '1080:80'

volumes:
pgdata:
196 changes: 23 additions & 173 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"@hapi/joi": "^17.1.1",
"@material-ui/core": "^4.11.4",
"@material-ui/lab": "^4.0.0-alpha.61",
"@opengovsg/sgid-client": "^2.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing update for package-lock.json?

"@sentry/react": "^6.11.0",
"@sentry/tracing": "^6.8.0",
"@sentry/webpack-plugin": "^1.15.1",
Expand Down
3 changes: 0 additions & 3 deletions src/client/app/components/pages/RootPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { History } from 'history'
import PrivateRoute from '../../PrivateRoute'
import HomePage from '../../../../home'
import LoginPage from '../../../../login'
import SgidLoginPage from '../../../../sgidLogin'
import UserPage from '../../../../user'
import NotFoundPage from '../NotFoundPage'
import DirectoryPage from '../../../../directory'
Expand All @@ -31,7 +30,6 @@ import {
HOME_PAGE,
LOGIN_PAGE,
NOT_FOUND_PAGE,
SGID_LOGIN_PAGE,
USER_PAGE,
} from '../../../util/types'
import theme from '../../../theme'
Expand All @@ -49,7 +47,6 @@ const Root: FunctionComponent<RootProps> = ({ store, history }: RootProps) => (
<Switch>
<Route exact path={HOME_PAGE} component={HomePage} />
<Route path={LOGIN_PAGE} component={LoginPage} />
<Route path={SGID_LOGIN_PAGE} component={SgidLoginPage} />
<PrivateRoute path={USER_PAGE} component={UserPage} />
<Route path={NOT_FOUND_PAGE} component={NotFoundPage} />
<PrivateRoute path={DIRECTORY_PAGE} component={DirectoryPage} />
Expand Down
1 change: 0 additions & 1 deletion src/client/app/util/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export const HOME_PAGE = '/'
export const LOGIN_PAGE = '/login'
export const SGID_LOGIN_PAGE = '/ogp-login'
export const USER_PAGE = '/user'
export const SEARCH_PAGE = '/search'
export const NOT_FOUND_PAGE = '/404/:shortUrl'
Expand Down
208 changes: 0 additions & 208 deletions src/client/sgidLogin/index.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/server/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const router = Express.Router()
/* Public routes that do not need to be protected */
router.use('/logout', require('./logout'))
router.use('/login', require('./login'))
router.use('/sgidLogin', require('./sgidLogin'))
router.use('/stats', require('./statistics'))
router.use('/sentry', require('./sentry'))
router.use('/links', require('./links'))
Expand Down
16 changes: 0 additions & 16 deletions src/server/api/sgidLogin/index.ts

This file was deleted.

4 changes: 0 additions & 4 deletions src/server/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,6 @@ export const ffExternalApi: boolean = process.env.FF_EXTERNAL_API === 'true'
export const apiAdmins: string[] = process.env.ADMIN_API_EMAILS
? process.env.ADMIN_API_EMAILS.split(',')
: []
export const sgidClientId = process.env.SGID_CLIENT_ID || ''
export const sgidPrivateKey = process.env.SGID_PRIVATE_KEY || ''
export const sgidClientSecret = process.env.SGID_CLIENT_SECRET || ''
export const sgidApiHostname = process.env.SGID_API_HOSTNAME || ''

export const userCount = Number(process.env.USER_COUNT) || 77288
export const clickCount = Number(process.env.CLICK_COUNT) || 666820545
Expand Down
1 change: 0 additions & 1 deletion src/server/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export const DependencyIds = {
linksController: Symbol.for('linksController'),
authService: Symbol.for('authService'),
loginController: Symbol.for('loginController'),
sgidLoginController: Symbol.for('sgidLoginController'),
logoutController: Symbol.for('logoutController'),
urlManagementService: Symbol.for('urlManagementService'),
userController: Symbol.for('userController'),
Expand Down
7 changes: 1 addition & 6 deletions src/server/inversify.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ import { RotatingLinksController } from './modules/display/RotatingLinksControll
import { SentryController } from './modules/sentry/SentryController'

import { AuthService, CryptographyBcrypt } from './modules/auth/services'
import {
LoginController,
LogoutController,
SgidLoginController,
} from './modules/auth'
import { LoginController, LogoutController } from './modules/auth'
import { UrlManagementService } from './modules/user/services'
import { UserController } from './modules/user'
import { DirectoryController } from './modules/directory'
Expand Down Expand Up @@ -135,7 +131,6 @@ export default () => {
bindIfUnbound(DependencyIds.linksController, RotatingLinksController)
bindIfUnbound(DependencyIds.sentryController, SentryController)
bindIfUnbound(DependencyIds.loginController, LoginController)
bindIfUnbound(DependencyIds.sgidLoginController, SgidLoginController)
bindIfUnbound(DependencyIds.authService, AuthService)
bindIfUnbound(DependencyIds.logoutController, LogoutController)
bindIfUnbound(DependencyIds.urlManagementService, UrlManagementService)
Expand Down
Loading
Loading