Add CritiqueBrainz as Oauth Service

config/config.json.example

@@ -9,6 +9,11 @@
 		"clientSecret": null,
 		"callbackURL": "http://localhost:9099/cb"
 	},
+    "critiquebrainz": {
+        "clientID": null,
+        "clientSecret": null,
+        "redirectURL": "http://localhost:9099/external-service/critiquebrainz/callback"
+    },
 	"session": {
 		"maxAge": 2592000000,
 		"secret": "Something here!",

package.json

@@ -30,13 +30,14 @@
   "browserslist": "> 0.25%, not dead",
   "dependencies": {
     "@babel/runtime": "^7.17.7",
+    "@cospired/i18n-iso-languages": "^4.0.0",
     "@elastic/elasticsearch": "^5.6.22",
     "@fortawesome/fontawesome-svg-core": "^1.2.30",
     "@fortawesome/free-brands-svg-icons": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^6.1.1",
     "@fortawesome/react-fontawesome": "^0.1.11",
     "array-move": "^3.0.1",
-    "bookbrainz-data": "2.14.1",
+    "bookbrainz-data": "2.15.1",
     "chart.js": "^2.9.4",
     "chartjs-adapter-date-fns": "^1.0.0",
     "classnames": "^2.3.1",
@@ -75,6 +76,7 @@
     "react-simple-star-rating": "^4.0.5",
     "react-sortable-hoc": "^2.0.0",
     "react-sticky": "^6.0.1",
+    "react-tooltip": "^4.2.21",
     "redis": "^3.1.2",
     "redux": "^3.7.2",
     "redux-debounce": "^1.0.1",

sql/migrations/2022-07-19/up.sql

@@ -0,0 +1,17 @@
+CREATE TYPE bookbrainz.external_service_oauth_type AS ENUM (
+    'critiquebrainz'
+);
+
+CREATE TABLE bookbrainz.external_service_oauth (
+    id SERIAL,
+    editor_id INTEGER NOT NULL,
+    service bookbrainz.external_service_oauth_type NOT NULL,
+    access_token TEXT NOT NULL,
+    refresh_token TEXT,
+    token_expires TIMESTAMP,
+    scopes TEXT[]
+);
+
+ALTER TABLE bookbrainz.external_service_oauth ADD CONSTRAINT external_service_oauth_editor_id_service UNIQUE (editor_id, service);
+
+ALTER TABLE bookbrainz.external_service_oauth ADD FOREIGN KEY (editor_id) REFERENCES bookbrainz.editor (id);

sql/schemas/bookbrainz.sql

@@ -16,6 +16,10 @@ CREATE TYPE bookbrainz.entity_type AS ENUM (
 	'Series'
 );
 
+CREATE TYPE bookbrainz.external_service_oauth_type AS ENUM (
+    'critiquebrainz'
+);
+
 CREATE TABLE bookbrainz.editor_type (
 	id SERIAL PRIMARY KEY,
 	label VARCHAR(255) NOT NULL CHECK (label <> '')
@@ -806,6 +810,20 @@ CREATE TABLE bookbrainz.user_collection_collaborator (
 ALTER TABLE bookbrainz.user_collection_collaborator ADD FOREIGN KEY (collection_id) REFERENCES bookbrainz.user_collection (id) ON DELETE CASCADE;
 ALTER TABLE bookbrainz.user_collection_collaborator ADD FOREIGN KEY (collaborator_id) REFERENCES bookbrainz.editor (id);
 
+CREATE TABLE bookbrainz.external_service_oauth (
+    id SERIAL,
+    editor_id INTEGER NOT NULL,
+    service bookbrainz.external_service_oauth_type NOT NULL,
+    access_token TEXT NOT NULL,
+    refresh_token TEXT,
+    token_expires TIMESTAMP,
+    scopes TEXT[]
+);
+
+ALTER TABLE bookbrainz.external_service_oauth ADD CONSTRAINT external_service_oauth_editor_id_service UNIQUE (editor_id, service);
+
+ALTER TABLE bookbrainz.external_service_oauth ADD FOREIGN KEY (editor_id) REFERENCES bookbrainz.editor (id);
+
 -- Views --
 
 CREATE VIEW bookbrainz.author AS

src/client/components/pages/entities/author.js

@@ -18,16 +18,19 @@
 
 import * as bootstrap from 'react-bootstrap';
 import * as entityHelper from '../../../helpers/entity';
+import React, {useCallback} from 'react';
 
+import CBReviewModal from './cbReviewModal';
 import EntityAnnotation from './annotation';
 import EntityFooter from './footer';
 import EntityImage from './image';
 import EntityLinks from './links';
 import EntityRelatedCollections from './related-collections';
+import EntityReviews from './cb-review';
 import EntityTitle from './title';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import PropTypes from 'prop-types';
-import React from 'react';
+import {Rating} from 'react-simple-star-rating';
 import {kebabCase as _kebabCase} from 'lodash';
 import {faPlus} from '@fortawesome/free-solid-svg-icons';
 import {labelsForAuthor} from '../../../helpers/utils';
@@ -37,7 +40,7 @@ const {deletedEntityMessage, extractAttribute, getTypeAttribute, getEntityUrl,
 	ENTITY_TYPE_ICONS, getSortNameOfDefaultAlias, transformISODateForDisplay} = entityHelper;
 const {Button, Col, Row} = bootstrap;
 
-function AuthorAttributes({author}) {
+function AuthorAttributes({author, averageRating}) {
 	if (author.deleted) {
 		return deletedEntityMessage;
 	}
@@ -64,6 +67,20 @@ function AuthorAttributes({author}) {
 					<dl>
 						<dt>Sort Name</dt>
 						<dd>{sortNameOfDefaultAlias}</dd>
+						<dt>Ratings</dt>
+						<dd>
+							<Rating
+								allowHalfIcon
+								readonly
+								allowHover={false}
+								className="rating-stars"
+								fillColor="#46433A"
+								initialValue={averageRating}
+								ratingValue={0}
+								size={20}
+								stars={5}
+							/>
+						</dd>
 					</dl>
 				</Col>
 				<Col lg={3}>
@@ -103,14 +120,28 @@ function AuthorAttributes({author}) {
 }
 AuthorAttributes.displayName = 'AuthorAttributes';
 AuthorAttributes.propTypes = {
-	author: PropTypes.object.isRequired
+	author: PropTypes.object.isRequired,
+	averageRating: PropTypes.number.isRequired
 };
 
 
 function AuthorDisplayPage({entity, identifierTypes, user}) {
+	const [showCBReviewModal, setShowCBReviewModal] = React.useState(false);
+	const handleModalToggle = useCallback(() => {
+		setShowCBReviewModal(!showCBReviewModal);
+	}, [showCBReviewModal]);
+
 	const urlPrefix = getEntityUrl(entity);
 	return (
 		<div>
+			<CBReviewModal
+				entityBBID={entity.bbid}
+				entityName={entity.defaultAlias.name}
+				entityType={entity.type}
+				handleModalToggle={handleModalToggle}
+				showModal={showCBReviewModal}
+				userId={user?.id}
+			/>
 			<Row className="entity-display-background">
 				<Col className="entity-display-image-box text-center" lg={2}>
 					<EntityImage
@@ -120,27 +151,45 @@ function AuthorDisplayPage({entity, identifierTypes, user}) {
 					/>
 				</Col>
 				<Col lg={10}>
-					<EntityTitle entity={entity}/>
-					<AuthorAttributes author={entity}/>
+					<EntityTitle
+						entity={entity}
+						handleModalToggle={handleModalToggle}
+					/>
+					<AuthorAttributes
+						author={entity}
+						averageRating={entity.reviews?.reviews?.average_rating || 0}
+					/>
 				</Col>
 			</Row>
 			<EntityAnnotation entity={entity}/>
 			{!entity.deleted &&
-			<React.Fragment>
-				<EntityLinks
-					entity={entity}
-					identifierTypes={identifierTypes}
-					urlPrefix={urlPrefix}
-				/>
-				<EntityRelatedCollections collections={entity.collections}/>
-				<Button
-					className="margin-top-d15"
-					href={`/work/create?${_kebabCase(entity.type)}=${entity.bbid}`}
-					variant="success"
-				>
-					<FontAwesomeIcon className="margin-right-0-5" icon={faPlus}/>Add Work
-				</Button>
-			</React.Fragment>}
+				<React.Fragment>
+					<Row>
+						<Col lg={8}>
+							<EntityLinks
+								entity={entity}
+								identifierTypes={identifierTypes}
+								urlPrefix={urlPrefix}
+							/>
+							<EntityRelatedCollections collections={entity.collections}/>
+							<Button
+								className="margin-top-d15"
+								href={`/work/create?${_kebabCase(entity.type)}=${entity.bbid}`}
+								variant="success"
+							>
+								<FontAwesomeIcon className="margin-right-0-5" icon={faPlus}/>Add Work
+							</Button>
+						</Col>
+						<Col lg={4}>
+							<EntityReviews
+								entityBBID={entity.bbid}
+								entityReviews={entity.reviews}
+								entityType={entity.type}
+								handleModalToggle={handleModalToggle}
+							/>
+						</Col>
+					</Row>
+				</React.Fragment>}
 			<hr className="margin-top-d40"/>
 			<EntityFooter
 				bbid={entity.bbid}

src/client/components/pages/entities/cb-review.js

@@ -78,6 +78,7 @@ class EntityReviews extends React.Component {
 		};
 		this.entityType = props.entityType;
 		this.entityBBID = props.entityBBID;
+		this.handleModalToggle = props.handleModalToggle;
 	}
 
 	async handleClick() {
@@ -118,8 +119,8 @@ class EntityReviews extends React.Component {
 					<h4>No reviews yet.</h4>
 					<Button
 						className="margin-top-d15"
-						href={entityLink}
 						variant="success"
+						onClick={this.handleModalToggle}
 					>
 						<FontAwesomeIcon icon={faPlus}/>
 						{'  Add a review'}
@@ -171,7 +172,8 @@ EntityReviews.displayName = 'EntityReviews';
 EntityReviews.propTypes = {
 	entityBBID: PropTypes.string.isRequired,
 	entityReviews: PropTypes.object.isRequired,
-	entityType: PropTypes.string.isRequired
+	entityType: PropTypes.string.isRequired,
+	handleModalToggle: PropTypes.func.isRequired
 };