Merge branch 'plausible:master' into master

pull/1160/head
Ru Singh 5 years ago committed by GitHub
commit 97c61cecec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -10,13 +10,18 @@ All notable changes to this project will be documented in this file.
- To authenticate against a local postgresql via socket authentication, the environment-variables
`DATABASE_SOCKET_DIR` & `DATABASE_NAME` were added.
- Time on Page metric available in detailed Top Pages report plausible/analytics#1007
- Added `CLICKHOUSE_FLUSH_INTERVAL_MS` and `CLICKHOUSE_MAX_BUFFER_SIZE` configuration parameters
- Wildcard based page, entry page and exit page filters plausible/analytics#1067
- Exclusion filters for page, entry page and exit page filters plausible/analytics#1067
- Menu (with auto-complete) to add new and edit existing filters directly plausible/analytics#1089
- Added `CLICKHOUSE_FLUSH_INTERVAL_MS` and `CLICKHOUSE_MAX_BUFFER_SIZE` configuration parameters plausible/analytics#1073
- Ability to invite users to sites with different roles plausible/analytics#1122
### Fixed
- Fix weekly report time range plausible/analytics#951
- Make sure embedded dashboards can run when user has blocked third-party cookies plausible/analytics#971
- Sites listing page will paginate if the user has a lot of sites plausible/analytics#994
- Crash when changing theme on a loaded dashboard plausible/analytics#1123
- UI fix for details button overlapping content on mobile plausible/analytics#1114
### Removed
- Removes AppSignal monitoring package

@ -38,7 +38,6 @@
.modal__container {
background-color: #fff;
padding: 1rem 2rem;
max-width: 860px;
border-radius: 4px;
margin: 50px auto;
box-sizing: border-box;

@ -0,0 +1,97 @@
.filter-list-text:hover ~ .filter-list-edit {
display: flex;
}
.filter-list-text:hover ~ .filter-list-remove {
display: none;
}
.filter-select__control:focus-within {
box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px, rgb(99, 102, 241) 0px 0px 0px 1px, rgba(0, 0, 0, 0) 0px 0px 0px 0px; /* indigo-500 */
}
.filter-select__value-container {
padding-left: 1rem !important;
}
.filter-select__control {
@apply dark:bg-gray-900 border-gray-300 dark:border-gray-700 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 pr-8;
border-radius: 0.375rem !important;
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");
background-position: right 0.5rem center;
background-repeat: no-repeat;
background-size: 1.35rem 1.35rem;
}
.filter-select__control:hover {
@apply cursor-pointer;
border-color: rgb(156, 163, 175) !important; /* gray-400 */
}
.filter-select__indicator-separator {
@apply hidden;
}
.filter-select__dropdown-indicator {
display: none !important;
}
.filter-select__input {
@apply w-full text-base sm:text-sm;
margin: 0 !important;
}
.filter-select__input input {
width: 100% !important;
box-shadow: none !important;
}
.dark .filter-select__input input {
color: rgb(209, 213, 219) !important; /* gray-300 */
}
.filter-select__value-container > :not(.filter-select__single-value) {
@apply w-full;
padding-top: 0 !important;
}
.filter-select__loading-indicator {
color: rgb(79, 70, 229) !important; /* indigo-600 */
}
.filter-select__loading-indicator > span {
height: 1.5em;
width: 1.5em;
}
.filter-select__single-value {
@apply dark:text-gray-400 text-base sm:text-sm;
}
.filter-select__menu-list {
@apply dark:bg-gray-900;
}
.filter-select__option {
@apply dark:text-gray-300;
font-size: 1rem !important;
line-height: 1.5rem !important;
cursor: pointer !important;
}
@media (min-width: 640px) {
.filter-select__option {
font-size: 0.875rem !important;
line-height: 1.25rem !important;
}
}
.filter-select__option--is-focused {
background-color: rgb(99, 102, 241) !important; /* indigo-500 */
color: white !important;
}
.dark .filter-select__option--is-focused {
background-color: rgb(79, 70, 229) !important; /* indigo-600 */
}

@ -1,4 +1,5 @@
import css from "../css/app.css"
import "../css/app.css"
import "../css/react-select.css"
import "flatpickr/dist/flatpickr.min.css"
import "./polyfills/closest"
import 'abortcontroller-polyfill/dist/polyfill-patch-fetch'

@ -161,10 +161,10 @@ class DatePicker extends React.Component {
const leftClasses = `flex items-center px-2 border-r border-gray-300 rounded-l
dark:border-gray-500 dark:text-gray-100 ${
disabledLeft ? "bg-gray-200 dark:bg-gray-900" : ""
disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900"
}`;
const rightClasses = `flex items-center px-2 rounded-r dark:text-gray-100 ${
disabledRight ? "bg-gray-200 dark:bg-gray-900" : ""
disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900"
}`;
return (
<div className="flex rounded shadow bg-white mr-4 cursor-pointer dark:bg-gray-800">
@ -242,7 +242,7 @@ class DatePicker extends React.Component {
onKeyPress={this.open}
className="flex items-center justify-between rounded bg-white dark:bg-gray-800 shadow px-4
pr-3 py-2 leading-tight cursor-pointer text-sm font-medium text-gray-800
dark:text-gray-200 h-full"
dark:text-gray-200 h-full hover:bg-gray-200 dark:hover:bg-gray-900"
tabIndex="0"
role="button"
aria-haspopup="true"
@ -312,7 +312,7 @@ class DatePicker extends React.Component {
to={{from: false, to: false, period, ...opts}}
onClick={this.close.bind(this)}
query={this.props.query}
className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-100
className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-200
dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 flex items-center justify-between`}
>
{text}

@ -1,6 +1,6 @@
import React from 'react';
import { withRouter } from 'react-router-dom'
import { countFilters, navigateToQuery, removeQueryParam } from './query'
import { withRouter, Link } from 'react-router-dom'
import { countFilters, formattedFilters, navigateToQuery, removeQueryParam } from './query'
import Datamap from 'datamaps'
import Transition from "../transition.js";
@ -60,7 +60,7 @@ class Filters extends React.Component {
}
handleKeyup(e) {
const {query, history} = this.props
const { query, history } = this.props
if (e.ctrlKey || e.metaKey || e.altKey) return
@ -70,7 +70,7 @@ class Filters extends React.Component {
}
handleResize() {
this.setState({ viewport: window.innerWidth || 639});
this.setState({ viewport: window.innerWidth || 639 });
}
handleClick(e) {
@ -102,6 +102,9 @@ class Filters extends React.Component {
};
filterText(key, value, query) {
const negated = value[0] == '!' && ['page', 'entry_page', 'exit_page'].includes(key)
value = negated ? value.slice(1) : value
if (key === "goal") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Completed goal <b>{value}</b></span>
}
@ -111,50 +114,50 @@ class Filters extends React.Component {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">{eventName}.{metaKey} is <b>{metaValue}</b></span>
}
if (key === "source") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Source: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Source is <b>{value}</b></span>
}
if (key === "utm_medium") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM medium: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM medium is <b>{value}</b></span>
}
if (key === "utm_source") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM source: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM source is <b>{value}</b></span>
}
if (key === "utm_campaign") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM campaign: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM campaign is <b>{value}</b></span>
}
if (key === "referrer") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Referrer: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Referrer is <b>{value}</b></span>
}
if (key === "screen") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Screen size: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Screen size is <b>{value}</b></span>
}
if (key === "browser") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Browser: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Browser is <b>{value}</b></span>
}
if (key === "browser_version") {
const browserName = query.filters["browser"] ? query.filters["browser"] : 'Browser'
return <span className="inline-block max-w-2xs md:max-w-xs truncate">{browserName}.Version: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">{browserName} Version is <b>{value}</b></span>
}
if (key === "os") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Operating System: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Operating System is <b>{value}</b></span>
}
if (key === "os_version") {
const osName = query.filters["os"] ? query.filters["os"] : 'OS'
return <span className="inline-block max-w-2xs md:max-w-xs truncate">{osName}.Version: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">{osName} Version is <b>{value}</b></span>
}
if (key === "country") {
const allCountries = Datamap.prototype.worldTopo.objects.world.geometries;
const selectedCountry = allCountries.find((c) => c.id === value) || {properties: {name: value}};
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Country: <b>{selectedCountry.properties.name}</b></span>
const selectedCountry = allCountries.find((c) => c.id === value) || { properties: { name: value } };
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Country is <b>{selectedCountry.properties.name}</b></span>
}
if (key === "page") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Page: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Page is{negated ? ' not' : ''} <b>{value}</b></span>
}
if (key === "entry_page") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Entry Page: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Entry Page is{negated ? ' not' : ''} <b>{value}</b></span>
}
if (key === "exit_page") {
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Exit Page: <b>{value}</b></span>
return <span className="inline-block max-w-2xs md:max-w-xs truncate">Exit Page is{negated ? ' not' : ''} <b>{value}</b></span>
}
}
@ -171,18 +174,50 @@ class Filters extends React.Component {
}
renderDropdownFilter(history, [key, value], query) {
if ('props' == key) {
return (
<div className="px-4 sm:py-2 py-3 md:text-sm leading-tight flex items-center justify-between" key={key + value}>
{this.filterText(key, value, query)}
<b title={`Remove filter: ${formattedFilters[key]}`} className="ml-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>
</div>
)
}
return (
<div className="px-4 sm:py-2 py-3 md:text-sm leading-tight flex items-center justify-between" key={key + value}>
{this.filterText(key, value, query)}
<b className="ml-1 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>
<div className="px-3 md:px-4 sm:py-2 py-3 md:text-sm leading-tight flex items-center justify-between" key={key + value}>
<Link
title={`Edit filter: ${formattedFilters[key]}`}
to={{ pathname: `/${encodeURIComponent(this.props.site.domain)}/filter/${key}`, search: window.location.search }}
className="group flex w-full justify-between items-center"
>
{this.filterText(key, value, query)}
<svg className="ml-1 cursor-pointer group-hover:text-indigo-700 dark:group-hover:text-indigo-500 w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="1" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>
</Link>
<b title={`Remove filter: ${formattedFilters[key]}`} className="ml-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>
</div>
)
}
renderListFilter(history, [key, value], query) {
return (
<span key={key} title={value} className="inline-flex bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300 shadow text-sm rounded py-2 px-3 mr-2">
{this.filterText(key, value, query)} <b className="ml-1 cursor-pointer hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>
<span key={key} title={value} className="flex bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300 shadow text-sm rounded mr-2 items-center">
{'props' == key ? (
<span className="flex w-full h-full items-center py-2 pl-3">
{this.filterText(key, value, query)}
</span>
) : (
<>
<Link title={`Edit filter: ${formattedFilters[key]}`} className="filter-list-text flex w-full h-full items-center py-2 pl-3" to={{ pathname: `/${encodeURIComponent(this.props.site.domain)}/filter/${key}`, search: window.location.search }}>
{this.filterText(key, value, query)}
</Link>
<span className="filter-list-edit hidden h-full w-full px-2 cursor-pointer text-indigo-700 dark:text-indigo-500 items-center">
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="1 1 23 23" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="1" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>
</span>
</>
)}
<span title={`Remove filter: ${formattedFilters[key]}`} className="filter-list-remove flex h-full w-full px-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500 items-center" onClick={() => this.removeFilter(key, history, query)}>
<svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12"></path></svg>
</span>
</span>
)
}
@ -198,11 +233,15 @@ class Filters extends React.Component {
renderDropDownContent() {
const { viewport } = this.state;
const { history, query } = this.props;
const { history, query, site } = this.props;
return (
<div className="absolute mt-2 rounded shadow-md z-10" style={{ width: viewport <= 768 ? '320px' : '350px', right: '-5px' }} ref={node => this.dropDownNode = node}>
<div className="rounded bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 font-medium text-gray-800 dark:text-gray-200 flex flex-col">
<Link to={`/${encodeURIComponent(site.domain)}/filter${window.location.search}`} className="group border-b flex border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 md:text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer">
<svg className="mr-2 h-4 w-4 text-gray-500 dark:text-gray-200 group-hover:text-indigo-700 dark:group-hover:text-indigo-500 hover:cursor-pointer" fill="none" stroke="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
Add Filter
</Link>
{this.appliedFilters.map((filter) => this.renderDropdownFilter(history, filter, query))}
<div className="border-t border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 md:text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer" onClick={() => this.clearAllFilters(history, query)}>
Clear All Filters
@ -239,11 +278,16 @@ class Filters extends React.Component {
}
renderFilterList() {
const { history, query } = this.props;
const { history, query, site } = this.props;
const { viewport } = this.state;
return (
<div id="filters">
<div id="filters" className="flex flex-grow pl-2 flex-wrap">
{(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))}
<Link to={`/${encodeURIComponent(site.domain)}/filter${window.location.search}`} className={`button ${viewport <= 768 ? "px-2 mr-1" : "px-3 mr-2"} py-2 cursor-pointer ml-auto text-gray-800 dark:text-gray-200 bg-white dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-900 shadow`}>
<svg className={`${viewport <= 768 ? "mr-1" : "mr-2"} h-4 w-4 text-indigo-500`} fill="none" stroke="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>
{viewport <= 768 ? "Filter" : "Add Filter"}
</Link>
</div>
);
}
@ -251,15 +295,11 @@ class Filters extends React.Component {
render() {
const { wrapped, viewport } = this.state;
if (this.appliedFilters.length > 0) {
if (wrapped === 2 || viewport <= 768) {
return this.renderDropDown();
}
return this.renderFilterList();
if (this.appliedFilters.length > 0 && (wrapped === 2 || viewport <= 768)) {
return this.renderDropDown();
}
return null;
return this.renderFilterList();
}
}

@ -32,9 +32,9 @@ class Historical extends React.Component {
<div className={`${navClass} top-0 sm:py-3 py-1 z-9 ${this.props.stuck && !this.props.site.embedded ? 'z-10 fullwidth-shadow bg-gray-50 dark:bg-gray-850' : ''}`}>
<div className="items-center w-full sm:flex">
<div className="flex items-center w-full mb-2 sm:mb-0">
<SiteSwitcher site={this.props.site} loggedIn={this.props.loggedIn} />
<SiteSwitcher site={this.props.site} loggedIn={this.props.loggedIn} currentUserRole={this.props.currentUserRole} />
<CurrentVisitors timer={this.props.timer} site={this.props.site} query={this.props.query} />
<Filters query={this.props.query} history={this.props.history} />
<Filters site={this.props.site} query={this.props.query} history={this.props.history} />
</div>
<Datepicker site={this.props.site} query={this.props.query} />
</div>

@ -44,9 +44,9 @@ class Dashboard extends React.Component {
render() {
if (this.state.query.period === 'realtime') {
return <Realtime timer={this.state.timer} site={this.props.site} loggedIn={this.props.loggedIn} query={this.state.query} />
return <Realtime timer={this.state.timer} site={this.props.site} loggedIn={this.props.loggedIn} currentUserRole={this.props.currentUserRole} query={this.state.query} />
} else {
return <Historical timer={this.state.timer} site={this.props.site} loggedIn={this.props.loggedIn} query={this.state.query} />
return <Historical timer={this.state.timer} site={this.props.site} loggedIn={this.props.loggedIn} currentUserRole={this.props.currentUserRole} query={this.state.query} />
}
}
}

@ -20,6 +20,7 @@ if (container) {
}
const loggedIn = container.dataset.loggedIn === 'true'
const currentUserRole = container.dataset.currentUserRole
const sharedLinkAuth = container.dataset.sharedLinkAuth
if (sharedLinkAuth) {
api.setSharedLinkAuth(sharedLinkAuth)
@ -27,7 +28,7 @@ if (container) {
const app = (
<ErrorBoundary>
<Router site={site} loggedIn={loggedIn} />
<Router site={site} loggedIn={loggedIn} currentUserRole={currentUserRole} />
</ErrorBoundary>
)

@ -159,3 +159,22 @@ export function eventName(query) {
}
return 'pageviews'
}
export const formattedFilters = {
'goal': 'Goal',
'props': 'Goal properties',
'source': 'Source',
'utm_medium': 'UTM Medium',
'utm_source': 'UTM Source',
'utm_campaign': 'UTM Campaign',
'referrer': 'Referrer URL',
'screen': 'Screen size',
'browser': 'Browser',
'browser_version': 'Browser Version',
'os': 'Operating System',
'os_version': 'Operating System Version',
'country': 'Country',
'page': 'Page',
'entry_page': 'Entry Page',
'exit_page': 'Exit Page'
}

@ -33,7 +33,7 @@ class Realtime extends React.Component {
<div className="items-center justify-between w-full sm:flex">
<div className="flex items-center w-full mb-2 sm:mb-0">
<SiteSwitcher site={this.props.site} loggedIn={this.props.loggedIn} />
<Filters query={this.props.query} history={this.props.history} />
<Filters site={this.props.site} query={this.props.query} history={this.props.history} />
</div>
<Datepicker site={this.props.site} query={this.props.query} />
</div>

@ -7,6 +7,7 @@ import PagesModal from './stats/modals/pages'
import EntryPagesModal from './stats/modals/entry-pages'
import ExitPagesModal from './stats/modals/exit-pages'
import CountriesModal from './stats/modals/countries'
import FilterModal from './stats/modals/filter'
import {BrowserRouter, Switch, Route, useLocation} from "react-router-dom";
@ -22,12 +23,12 @@ function ScrollToTop() {
return null;
}
export default function Router({site, loggedIn}) {
export default function Router({site, loggedIn, currentUserRole}) {
return (
<BrowserRouter>
<Route path="/:domain">
<ScrollToTop />
<Dash site={site} loggedIn={loggedIn} />
<Dash site={site} loggedIn={loggedIn} currentUserRole={currentUserRole} />
<Switch>
<Route exact path={["/:domain/sources", "/:domain/utm_mediums", "/:domain/utm_sources", "/:domain/utm_campaigns"]}>
<SourcesModal site={site} />
@ -50,6 +51,9 @@ export default function Router({site, loggedIn}) {
<Route path="/:domain/countries">
<CountriesModal site={site} />
</Route>
<Route path={["/:domain/filter/:field", "/:domain/filter"]}>
<FilterModal site={site} />
</Route>
</Switch>
</Route>
</BrowserRouter>

@ -76,13 +76,29 @@ export default class SiteSwitcher extends React.Component {
<a href={domain === this.props.site.domain ? null : `/${encodeURIComponent(domain)}`} key={domain} className={`flex items-center justify-between truncate px-4 py-2 md:text-sm leading-5 text-gray-700 dark:text-gray-300 ${extraClass}`}>
<span>
<img src={`https://icons.duckduckgo.com/ip3/${domain}.ico`} referrerPolicy="no-referrer" onError={(e)=>{e.target.onerror = null; e.target.src="https://icons.duckduckgo.com/ip3/placeholder.ico"}} className="inline w-4 mr-2 align-middle" />
<span class="truncate inline-block align-middle max-w-3xs pr-2">{domain}</span>
<span className="truncate inline-block align-middle max-w-3xs pr-2">{domain}</span>
</span>
{index < 9 && <span>{index+1}</span>}
</a>
)
}
renderSettingsLink() {
if (['owner', 'admin'].includes(this.props.currentUserRole)) {
return (
<React.Fragment>
<div className="py-1">
<a href={`/${encodeURIComponent(this.props.site.domain)}/settings`} className="group flex items-center px-4 py-2 md:text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-900 focus:text-gray-900 dark:focus:text-gray-100" role="menuitem">
<svg className="mr-2 h-4 w-4 text-gray-500 dark:text-gray-200 group-hover:text-gray-600 dark:group-hover:text-gray-400 group-focus:text-gray-500 dark:group-focus:text-gray-200" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z" clipRule="evenodd"></path></svg>
Site settings
</a>
</div>
<div className="border-t border-gray-200 dark:border-gray-500"></div>
</React.Fragment>
)
}
}
renderDropdown() {
if (this.state.loading) {
return <div className="px-4 py-6"><div className="loading sm mx-auto"><div></div></div></div>
@ -91,13 +107,7 @@ export default class SiteSwitcher extends React.Component {
} else {
return (
<React.Fragment>
<div className="py-1">
<a href={`/${encodeURIComponent(this.props.site.domain)}/settings`} className="group flex items-center px-4 py-2 md:text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-900 focus:text-gray-900 dark:focus:text-gray-100" role="menuitem">
<svg class="mr-2 h-4 w-4 text-gray-500 dark:text-gray-200 group-hover:text-gray-600 dark:group-hover:text-gray-400 group-focus:text-gray-500 dark:group-focus:text-gray-200" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z" clip-rule="evenodd"></path></svg>
Site settings
</a>
</div>
<div className="border-t border-gray-200 dark:border-gray-500"></div>
{ this.renderSettingsLink() }
<div className="py-1">
{ this.state.sites.map(this.renderSiteLink.bind(this)) }
</div>

@ -0,0 +1,234 @@
import React from "react";
import { withRouter, Redirect } from 'react-router-dom'
import Datamap from 'datamaps'
import AsyncSelect from 'react-select/async'
import debounce from 'lodash.debounce'
import Modal from './modal'
import { parseQuery, formattedFilters, navigateToQuery } from '../../query'
import Transition from "../../../transition";
import * as api from '../../api'
class FilterModal extends React.Component {
constructor(props) {
super(props)
this.state = {
query: parseQuery(props.location.search, props.site),
selectedFilter: "",
negated: false,
updatedValue: "",
inputValue: "",
forceReloadSuggestions: 0,
defaultOptions: []
}
this.editableGoals = Object.keys(this.state.query.filters).filter(filter => !['props'].includes(filter))
this.renderSelector = this.renderSelector.bind(this)
this.fetchSuggestions = this.fetchSuggestions.bind(this)
this.handleKeydown = this.handleKeydown.bind(this)
this.handleSubmit = this.handleSubmit.bind(this)
this.fieldSelectRef = React.createRef()
this.debouncedFetchSuggestions = debounce((q, callback) => this.fetchSuggestions(q, callback), 150)
}
componentDidMount() {
this.setState({ selectedFilter: this.props.match.params.field })
this.fieldSelectRef.current.focus()
document.addEventListener("keydown", this.handleKeydown)
}
componentDidUpdate(prevProps, prevState) {
const { query, selectedFilter, updatedValue, forceReloadSuggestions } = this.state
if (prevState.selectedFilter !== selectedFilter) {
const negated = !!query.filters[selectedFilter] && query.filters[selectedFilter][0] == '!' && this.negationSupported(selectedFilter)
let updatedValue = negated ? query.filters[selectedFilter].slice(1) : (query.filters[selectedFilter] || "")
if (selectedFilter == 'country') {
const allCountries = Datamap.prototype.worldTopo.objects.world.geometries;
const selectedCountry = allCountries.find((c) => c.id === updatedValue) || { properties: { name: updatedValue } };
updatedValue = selectedCountry.properties.name
}
if (selectedFilter) this.fetchSuggestions('', (defaultOptions) => this.setState({ defaultOptions }))
this.setState({ updatedValue, inputValue: updatedValue, negated, forceReloadSuggestions: forceReloadSuggestions + 1 })
}
}
componentWillUnmount() {
document.removeEventListener("keydown", this.handleKeydown);
}
handleKeydown(e) {
if (e.ctrlKey || e.metaKey || e.shiftKey || e.altKey || e.isComposing || e.keyCode === 229) return
if (e.target.tagName == 'BODY' && e.key == 'Enter') {
this.handleSubmit()
}
}
negationSupported(filter) {
return ['page', 'entry_page', 'exit_page'].includes(filter)
}
fetchSuggestions(searchQuery = "", callback) {
const { query, selectedFilter } = this.state
const updatedQuery = { ...query, filters: { ...query.filters, [selectedFilter]: null } }
if (selectedFilter == 'country') {
const matchedCountries = Datamap.prototype.worldTopo.objects.world.geometries.filter(c => c.properties.name.includes(searchQuery.trim()))
const matches = matchedCountries.map(c => c.id)
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/suggestions/country`, updatedQuery, { q: matches })
.then((res) => {
const result = res.map(code => matchedCountries.filter(c => c.id == code)[0].properties.name).map(r => ({ label: r, value: r }))
callback(result)
})
} else {
api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/suggestions/${selectedFilter}`, updatedQuery, { q: searchQuery.trim() })
.then((res) => {
const result = res.map(r => ({ label: r, value: r }))
callback(result)
})
}
}
renderSelector(filter) {
const { updatedValue, selectedFilter, inputValue, forceReloadSuggestions, defaultOptions } = this.state;
if (!filter) return null
return (
<AsyncSelect
key={`select-${selectedFilter}-${forceReloadSuggestions}`}
defaultOptions={inputValue == "" ? defaultOptions : true}
cacheOptions
loadOptions={(q, callback) => this.debouncedFetchSuggestions(q, callback)}
placeholder='Filter value'
maxMenuHeight={250}
tabSelectsValue={false}
classNamePrefix='filter-select'
blurInputOnSelect
noOptionsMessage={() => (
<span className="text-red-500 text-md flex mt-2 px-3">
<svg className="w-10 h-10 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
<span className="">No results found in current dashboard, try removing some filters, checking your input and ensuring this {formattedFilters[selectedFilter].toLowerCase()} exists</span>
</span>
)}
loadingMessage={() => (
<span>
Loading filter suggestions
</span>
)}
value={inputValue == '' ? { label: 'Enter a filter value', value: '' } : { label: updatedValue, value: `${updatedValue } ` }}
onChange={({ value }, a) => {
this.setState({ updatedValue: value, inputValue: value, forceReloadSuggestions: forceReloadSuggestions + 1 })
}}
onInputChange={(value, { action }) => {
if (action == 'input-change') this.setState({ inputValue: value })
if (action == 'menu-close' || action == 'input-blur') this.setState(({inputValue}) => ({ updatedValue: inputValue }))
}}
inputValue={inputValue}
onBlur={() => this.setState({ forceReloadSuggestions: forceReloadSuggestions + 1 })}
/>)
}
handleSubmit() {
const { selectedFilter, negated, updatedValue } = this.state;
const validFilter = this.editableGoals.includes(selectedFilter) && updatedValue.trim()
let finalFilterValue = (this.negationSupported(selectedFilter) && negated ? '!' : '') + updatedValue.trim()
if (selectedFilter == 'country') {
const allCountries = Datamap.prototype.worldTopo.objects.world.geometries;
const selectedCountry = allCountries.find((c) => c.properties.name === finalFilterValue) || { id: finalFilterValue };
finalFilterValue = selectedCountry.id
}
const finalizedQuery = new URLSearchParams(window.location.search)
finalizedQuery.set(selectedFilter, finalFilterValue)
if (validFilter) {
this.setState({ finalizedQuery })
}
}
renderBody() {
const { selectedFilter, negated, updatedValue, query } = this.state;
const validFilter = this.editableGoals.includes(selectedFilter) && updatedValue.trim()
return (
<>
<h1 className="text-xl font-bold dark:text-gray-100">{query.filters[selectedFilter] ? 'Edit' : 'Add'} Filter</h1>
<div className="my-4 border-b border-gray-300"></div>
<main className="modal__content">
<form className="flex flex-col" id="filter-form" onSubmit={this.handleSubmit}>
<select
value={selectedFilter || ""}
className="my-2 block w-full py-2 pl-3 pr-10 text-base border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:bg-gray-900 dark:text-gray-300 cursor-pointer"
placeholder="Select a Filter"
onChange={(e) => this.setState({ selectedFilter: e.target.value })}
ref={this.fieldSelectRef}
>
<option disabled value="" className="hidden">Select a Filter</option>
{this.editableGoals.map(filter => <option key={filter} value={filter}>{formattedFilters[filter]}</option>)}
</select>
{this.negationSupported(selectedFilter) && (
<div className="my-4 flex items-center">
<label className="text-gray-700 dark:text-gray-300 text-sm cursor-pointer">
<input
type="checkbox"
className="bg-gray-100 dark:bg-gray-900 text-indigo-600 border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 mr-2 relative inline-flex flex-shrink-0 h-6 w-8 border-1 rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none"
checked={negated}
name="exclude"
onChange={(e) => this.setState({ negated: e.target.checked })}
/>
Exclude pages matching this filter
</label>
</div>
)}
{this.renderSelector(selectedFilter)}
<button
type="submit"
disabled={!validFilter}
className="button mt-4 w-2/3 mx-auto"
>
{query.filters[selectedFilter] ? 'Update' : 'Add'} Filter
</button>
{query.filters[selectedFilter] && (
<button
className="button mt-8 px-4 mx-auto flex bg-red-500 dark:bg-red-500 hover:bg-red-600 dark:hover:bg-red-700 items-center"
onClick={() => {
const finalizedQuery = new URLSearchParams(window.location.search)
finalizedQuery.delete(selectedFilter)
this.setState({ finalizedQuery })
}}
>
<svg className="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg>
Remove Filter
</button>
)}
</form>
</main>
</>
)
}
render() {
const { finalizedQuery } = this.state;
if (finalizedQuery)
return <Redirect to={{ pathname: `/${encodeURIComponent(this.props.site.domain)}`, search: finalizedQuery.toString() }} />
return (
<Modal site={this.props.site} maxWidth="460px">
{ this.renderBody()}
</Modal>
)
}
}
export default withRouter(FilterModal)

@ -47,7 +47,7 @@ class Modal extends React.Component {
<div className="modal is-open" onClick={this.props.onClick}>
<div className="modal__overlay">
<button className="modal__close"></button>
<div ref={this.node} className="modal__container dark:bg-gray-800">
<div ref={this.node} className="modal__container dark:bg-gray-800" style={{maxWidth: this.props.maxWidth || '860px'}}>
{this.props.children}
</div>

@ -29,7 +29,7 @@ export default class SearchTerms extends React.Component {
loading: false,
searchTerms: res.search_terms || [],
notConfigured: res.not_configured,
isOwner: res.is_owner
isAdmin: res.is_admin
}))
}
@ -65,7 +65,7 @@ export default class SearchTerms extends React.Component {
<RocketIcon />
<div>The site is not connected to Google Search Keywords</div>
<div>Cannot show search terms</div>
{this.state.isOwner && <a href={`/${encodeURIComponent(this.props.site.domain)}/settings/search-console`} className="button mt-4">Connect with Google</a> }
{this.state.isAdmin && <a href={`/${encodeURIComponent(this.props.site.domain)}/settings/search-console`} className="button mt-4">Connect with Google</a> }
</div>
)
} else if (this.state.searchTerms.length > 0) {

@ -290,13 +290,15 @@ class LineGraph extends React.Component {
}
downloadLink() {
const endpoint = `/${encodeURIComponent(this.props.site.domain)}/visitors.csv${api.serializeQuery(this.props.query)}`
if (this.props.query.period !== 'realtime') {
const endpoint = `/${encodeURIComponent(this.props.site.domain)}/visitors.csv${api.serializeQuery(this.props.query)}`
return (
<a href={endpoint} download>
<svg className="absolute w-4 h-5 text-gray-700 feather dark:text-gray-300 -top-8 right-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg>
</a>
)
return (
<a href={endpoint} download>
<svg className="absolute w-4 h-5 text-gray-700 feather dark:text-gray-300 -top-8 right-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path><polyline points="7 10 12 15 17 10"></polyline><line x1="12" y1="15" x2="12" y2="3"></line></svg>
</a>
)
}
}
samplingNotice() {

File diff suppressed because it is too large Load Diff

@ -19,9 +19,10 @@
"chart.js": "^3.3.2",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",
"css-minimizer-webpack-plugin": "^3.0.0",
"css-minimizer-webpack-plugin": "^3.0.1",
"datamaps": "^0.5.9",
"iframe-resizer": "^4.3.2",
"lodash.debounce": "^4.0.8",
"mini-css-extract-plugin": "^1.6.0",
"phoenix": "file:../deps/phoenix",
"phoenix_html": "file:../deps/phoenix_html",
@ -32,6 +33,7 @@
"react-flatpickr": "3.10.5",
"react-flip-move": "^3.0.4",
"react-router-dom": "^5.2.0",
"react-select": "^4.3.1",
"react-transition-group": "^4.4.2",
"tailwindcss": "^2.1.2",
"terser-webpack-plugin": "^5.1.2",

@ -14,6 +14,7 @@ module.exports = {
extend: {
colors: {
orange: colors.orange,
'gray-950': 'rgb(13, 18, 30)',
'gray-850': 'rgb(26, 32, 44)',
'gray-825': 'rgb(37, 47, 63)'
},
@ -30,7 +31,7 @@ module.exports = {
'9': 9,
},
maxWidth: {
'2xs': '16rem',
'2xs': '15rem',
'3xs': '12rem',
}
},
@ -44,7 +45,8 @@ module.exports = {
backgroundOpacity: ['dark'],
display: ['dark'],
cursor: ['hover'],
justifyContent: ['responsive']
justifyContent: ['responsive'],
backgroundColor: ['odd', 'even'],
}
},
plugins: [

@ -7,3 +7,4 @@ MAILER_ADAPTER=Bamboo.LocalAdapter
LOG_LEVEL=debug
SELFHOST=false
DISABLE_CRON=true
ADMIN_USER_IDS=1

@ -49,9 +49,15 @@ db_socket_dir = get_var_from_path_or_env(config_dir, "DATABASE_SOCKET_DIR")
admin_user = get_var_from_path_or_env(config_dir, "ADMIN_USER_NAME")
admin_email = get_var_from_path_or_env(config_dir, "ADMIN_USER_EMAIL")
admin_emails =
get_var_from_path_or_env(config_dir, "ADMIN_EMAILS", "")
admin_user_ids =
get_var_from_path_or_env(config_dir, "ADMIN_USER_IDS", "")
|> String.split(",")
|> Enum.map(fn id -> Integer.parse(id) end)
|> Enum.map(fn
{int, ""} -> int
_ -> nil
end)
|> Enum.filter(& &1)
admin_pwd = get_var_from_path_or_env(config_dir, "ADMIN_USER_PWD")
env = get_var_from_path_or_env(config_dir, "ENVIRONMENT", "prod")
@ -162,7 +168,7 @@ config :plausible,
admin_pwd: admin_pwd,
environment: env,
mailer_email: mailer_email,
admin_emails: admin_emails,
admin_user_ids: admin_user_ids,
site_limit: site_limit,
site_limit_exempt: site_limit_exempt,
is_selfhost: is_selfhost
@ -272,7 +278,9 @@ if config_env() == :prod && !disable_cron do
# Every 15 minutes
{"*/15 * * * *", Plausible.Workers.SpikeNotifier},
# Every day at midnight
{"0 0 * * *", Plausible.Workers.CleanEmailVerificationCodes}
{"0 0 * * *", Plausible.Workers.CleanEmailVerificationCodes},
# Every day at 1am
{"0 1 * * *", Plausible.Workers.CleanInvitations}
]
extra_cron = [
@ -283,7 +291,9 @@ if config_env() == :prod && !disable_cron do
# Daily at 15
{"0 15 * * *", Plausible.Workers.NotifyAnnualRenewal},
# Every 10 minutes
{"*/10 * * * *", Plausible.Workers.ProvisionSslCertificates}
{"*/10 * * * *", Plausible.Workers.ProvisionSslCertificates},
# Every midnight
{"0 0 * * *", Plausible.Workers.LockSites}
]
base_queues = [
@ -292,16 +302,18 @@ if config_env() == :prod && !disable_cron do
send_email_reports: 1,
spike_notifications: 1,
fetch_tweets: 1,
clean_email_verification_codes: 1,
check_stats_emails: 1,
site_setup_emails: 1
site_setup_emails: 1,
clean_email_verification_codes: 1,
clean_invitations: 1
]
extra_queues = [
provision_ssl_certificates: 1,
trial_notification_emails: 1,
check_usage: 1,
notify_annual_renewal: 1
notify_annual_renewal: 1,
lock_sites: 1
]
# Keep 30 days history

@ -59,8 +59,7 @@ defmodule Plausible.Auth do
end
def create_user(name, email, pwd) do
%Auth.User{}
|> Auth.User.new(%{name: name, email: email, password: pwd, password_confirmation: pwd})
Auth.User.new(%{name: name, email: email, password: pwd, password_confirmation: pwd})
|> Repo.insert()
end
@ -68,13 +67,14 @@ defmodule Plausible.Auth do
Repo.get_by(Auth.User, opts)
end
def user_completed_setup?(user) do
def has_active_sites?(user, roles \\ [:owner, :admin, :viewer]) do
domains =
Repo.all(
from u in Plausible.Auth.User,
where: u.id == ^user.id,
join: sm in Plausible.Site.Membership,
on: sm.user_id == u.id,
where: sm.role in ^roles,
join: s in Plausible.Site,
on: s.id == sm.site_id,
select: s.domain
@ -82,4 +82,15 @@ defmodule Plausible.Auth do
Stats.has_pageviews?(domains)
end
def user_owns_sites?(user) do
Repo.exists?(
from(s in Plausible.Site,
join: sm in Plausible.Site.Membership,
on: sm.site_id == s.id,
where: sm.user_id == ^user.id,
where: sm.role == :owner
)
)
end
end

@ -0,0 +1,23 @@
defmodule Plausible.Auth.Invitation do
use Ecto.Schema
import Ecto.Changeset
@derive {Jason.Encoder, only: [:invitation_id, :role, :site]}
@required [:email, :role, :site_id, :inviter_id]
schema "invitations" do
field :invitation_id, :string
field :email, :string
field :role, Ecto.Enum, values: [:owner, :admin, :viewer]
belongs_to :inviter, Plausible.Auth.User
belongs_to :site, Plausible.Site
timestamps()
end
def new(attrs \\ %{}) do
%__MODULE__{invitation_id: Nanoid.generate()}
|> cast(attrs, @required)
|> validate_required(@required)
end
end

@ -29,8 +29,8 @@ defmodule Plausible.Auth.User do
timestamps()
end
def new(user, attrs \\ %{}) do
user
def new(attrs \\ %{}) do
%Plausible.Auth.User{}
|> cast(attrs, @required)
|> validate_required(@required)
|> validate_length(:password, min: 6, message: "has to be at least 6 characters")

@ -2,7 +2,8 @@ defmodule Plausible.Auth.UserAdmin do
use Plausible.Repo
def custom_index_query(_conn, _schema, query) do
from(r in query, preload: [:subscription])
subscripton_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at])
from(r in query, preload: [subscription: ^subscripton_q])
end
def form_fields(_) do

@ -18,7 +18,7 @@ defmodule Plausible.Billing do
changeset = Subscription.changeset(%Subscription{}, format_subscription(params))
Repo.insert(changeset)
Repo.insert(changeset) |> check_lock_status
end
def subscription_updated(params) do
@ -119,10 +119,10 @@ defmodule Plausible.Billing do
subscription.next_bill_date && !Timex.before?(subscription.next_bill_date, Timex.today())
end
defp subscription_is_active?(_), do: false
defp subscription_is_active?(%Subscription{}), do: false
defp subscription_is_active?(nil), do: false
def on_trial?(user) do
user = Repo.preload(user, :subscription)
!subscription_is_active?(user.subscription) && trial_days_left(user) >= 0
end
@ -135,8 +135,8 @@ defmodule Plausible.Billing do
pageviews + custom_events
end
defp get_usage_for_billing_cycle(user, cycle) do
domains = Enum.map(user.sites, & &1.domain)
defp get_usage_for_billing_cycle(sites, cycle) do
domains = Enum.map(sites, & &1.domain)
ClickhouseRepo.one(
from e in "events",
@ -149,11 +149,11 @@ defmodule Plausible.Billing do
def last_two_billing_months_usage(user, today \\ Timex.today()) do
{first, second} = last_two_billing_cycles(user, today)
user = Repo.preload(user, :sites)
sites = Plausible.Sites.owned_by(user)
{
get_usage_for_billing_cycle(user, first),
get_usage_for_billing_cycle(user, second)
get_usage_for_billing_cycle(sites, first),
get_usage_for_billing_cycle(sites, second)
}
end
@ -178,9 +178,9 @@ defmodule Plausible.Billing do
end
def usage_breakdown(user) do
user = Repo.preload(user, :sites)
sites = Plausible.Sites.owned_by(user)
Enum.reduce(user.sites, {0, 0}, fn site, {pageviews, custom_events} ->
Enum.reduce(sites, {0, 0}, fn site, {pageviews, custom_events} ->
usage = Plausible.Stats.Clickhouse.usage(site)
{pageviews + Map.get(usage, "pageviews", 0),
@ -221,5 +221,16 @@ defmodule Plausible.Billing do
defp present?(nil), do: false
defp present?(_), do: true
defp check_lock_status({:ok, subscription}) do
user =
Repo.get(Plausible.Auth.User, subscription.user_id)
|> Map.put(:subscription, subscription)
Plausible.Billing.SiteLocker.check_sites_for(user)
{:ok, subscription}
end
defp check_lock_status(err), do: err
defp paddle_api(), do: Application.fetch_env!(:plausible, :paddle_api)
end

@ -0,0 +1,29 @@
defmodule Plausible.Billing.SiteLocker do
use Plausible.Repo
def check_sites_for(user) do
if Plausible.Billing.needs_to_upgrade?(user) do
set_lock_status_for(user, true)
else
set_lock_status_for(user, false)
end
end
defp set_lock_status_for(user, status) do
site_ids =
Repo.all(
from s in Plausible.Site.Membership,
where: s.user_id == ^user.id,
where: s.role == :owner,
select: s.site_id
)
site_q =
from(
s in Plausible.Site,
where: s.id in ^site_ids
)
Repo.update_all(site_q, set: [locked: status])
end
end

@ -3,15 +3,16 @@ defmodule Plausible.Site.Membership do
import Ecto.Changeset
schema "site_memberships" do
field :role, Ecto.Enum, values: [:owner, :admin, :viewer]
belongs_to :site, Plausible.Site
belongs_to :user, Plausible.Auth.User
timestamps()
end
def changeset(user, attrs) do
user
|> cast(attrs, [:user_id, :site_id])
def changeset(schema, attrs) do
schema
|> cast(attrs, [:user_id, :site_id, :role])
|> validate_required([:user_id, :site_id])
end
end

@ -9,8 +9,11 @@ defmodule Plausible.Site do
field :domain, :string
field :timezone, :string, default: "Etc/UTC"
field :public, :boolean
field :locked, :boolean
many_to_many :members, User, join_through: Plausible.Site.Membership
has_many :memberships, Plausible.Site.Membership
has_many :invitations, Plausible.Auth.Invitation
has_one :google_auth, GoogleAuth
has_one :weekly_report, Plausible.Site.WeeklyReport
has_one :monthly_report, Plausible.Site.MonthlyReport

@ -3,7 +3,7 @@ defmodule Plausible.Sites do
alias Plausible.Site.{CustomDomain, SharedLink}
def create(user, params) do
count = count_for(user)
count = Enum.count(owned_by(user))
limit = Plausible.Billing.sites_limit(user)
if count >= limit do
@ -45,28 +45,23 @@ defmodule Plausible.Sites do
base <> domain <> "?auth=" <> link.slug
end
def get_for_user!(user_id, domain), do: Repo.one!(get_for_user_q(user_id, domain))
def get_for_user(user_id, domain), do: Repo.one(get_for_user_q(user_id, domain))
def get_for_user!(user_id, domain, roles \\ [:owner, :admin, :viewer]),
do: Repo.one!(get_for_user_q(user_id, domain, roles))
def get_for_user_q(user_id, domain) do
def get_for_user(user_id, domain, roles \\ [:owner, :admin, :viewer]),
do: Repo.one(get_for_user_q(user_id, domain, roles))
defp get_for_user_q(user_id, domain, roles) do
from(s in Plausible.Site,
join: sm in Plausible.Site.Membership,
on: sm.site_id == s.id,
where: sm.user_id == ^user_id,
where: sm.role in ^roles,
where: s.domain == ^domain,
select: s
)
end
def count_for(user) do
Repo.aggregate(
from(sm in Plausible.Site.Membership,
where: sm.user_id == ^user.id
),
:count
)
end
def has_goals?(site) do
Repo.exists?(
from g in Plausible.Goal,
@ -74,10 +69,39 @@ defmodule Plausible.Sites do
)
end
def is_owner?(user_id, site) do
Repo.exists?(
def is_member?(user_id, site) do
role(user_id, site) !== nil
end
def has_admin_access?(user_id, site) do
role(user_id, site) in [:admin, :owner]
end
def role(user_id, site) do
Repo.one(
from sm in Plausible.Site.Membership,
where: sm.user_id == ^user_id and sm.site_id == ^site.id
where: sm.user_id == ^user_id and sm.site_id == ^site.id,
select: sm.role
)
end
def owned_by(user) do
Repo.all(
from s in Plausible.Site,
join: sm in Plausible.Site.Membership,
on: sm.site_id == s.id,
where: sm.role == :owner,
where: sm.user_id == ^user.id
)
end
def owner_for(site) do
Repo.one(
from u in Plausible.Auth.User,
join: sm in Plausible.Site.Membership,
on: sm.user_id == u.id,
where: sm.site_id == ^site.id,
where: sm.role == :owner
)
end

@ -257,13 +257,7 @@ defmodule Plausible.Stats.Clickhouse do
from(s in referrers, where: s.referrer_source != "")
end
referrers =
if query.filters["page"] do
page = query.filters["page"]
from(s in referrers, where: s.entry_page == ^page)
else
referrers
end
referrers = apply_page_as_entry_page(referrers, site, query)
referrers =
if include_details do
@ -326,13 +320,7 @@ defmodule Plausible.Stats.Clickhouse do
end
defp apply_page_as_entry_page(db_query, _site, query) do
page = query.filters["page"]
if is_binary(page) do
from(s in db_query, where: s.entry_page == ^page)
else
db_query
end
include_path_filter_entry(db_query, query.filters["page"])
end
def utm_mediums(site, query, limit \\ 9, page \\ 1, show_noref \\ false) do
@ -691,6 +679,55 @@ defmodule Plausible.Stats.Clickhouse do
|> Enum.into(%{})
end
def page_times_by_page_url(site, query, page_list \\ nil)
def page_times_by_page_url(site, query, _page_list = nil) do
{negated, updated_page_selection} = query.filters["page"] |> check_negated_filter()
{_, page_regex} = updated_page_selection |> convert_path_regex()
q =
from(
e in base_query_w_sessions(site, %Query{
query
| filters: Map.delete(query.filters, "page")
}),
select: {
fragment("? as p", e.pathname),
fragment("? as t", e.timestamp),
fragment("? as s", e.session_id)
},
order_by: [e.session_id, e.timestamp]
)
{base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q)
time_query = "
SELECT
avg(ifNotFinite(avgTime, null))
FROM
(SELECT
p,
sum(td)/count(case when p2 != p then 1 end) as avgTime
FROM
(SELECT
p,
p2,
sum(t2-t) as td
FROM
(SELECT
*,
neighbor(t, 1) as t2,
neighbor(p, 1) as p2,
neighbor(s, 1) as s2
FROM (#{base_query_raw}))
WHERE s=s2 AND
#{if negated, do: "not(match(p, ?))", else: "match(p, ?)"}
GROUP BY p,p2,s)
GROUP BY p)"
time_query |> ClickhouseRepo.query(base_query_raw_params ++ [page_regex])
end
def page_times_by_page_url(site, query, page_list) do
q =
from(
@ -708,24 +745,27 @@ defmodule Plausible.Stats.Clickhouse do
{base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q)
"SELECT
p,
sum(td)/count(case when p2 != p then 1 end) as avgTime
FROM
(SELECT
time_query = "
SELECT
p,
p2,
sum(t2-t) as td
sum(td)/count(case when p2 != p then 1 end) as avgTime
FROM
(SELECT
*,
neighbor(t, 1) as t2,
neighbor(p, 1) as p2,
neighbor(s, 1) as s2
FROM (#{base_query_raw}))
WHERE s=s2 AND p IN tuple(?)
GROUP BY p,p2,s)
GROUP BY p"
p,
p2,
sum(t2-t) as td
FROM
(SELECT
*,
neighbor(t, 1) as t2,
neighbor(p, 1) as p2,
neighbor(s, 1) as s2
FROM (#{base_query_raw}))
WHERE s=s2 AND p IN tuple(?)
GROUP BY p,p2,s)
GROUP BY p"
time_query
|> ClickhouseRepo.query(
base_query_raw_params ++ [(Enum.count(page_list) > 0 && page_list) || ["/"]]
)
@ -1156,21 +1196,9 @@ defmodule Plausible.Stats.Clickhouse do
sessions_q
end
sessions_q =
if query.filters["entry_page"] do
entry_page = query.filters["entry_page"]
from(s in sessions_q, where: s.entry_page == ^entry_page)
else
sessions_q
end
sessions_q = include_path_filter_entry(sessions_q, query.filters["entry_page"])
sessions_q =
if query.filters["exit_page"] do
exit_page = query.filters["exit_page"]
from(s in sessions_q, where: s.exit_page == ^exit_page)
else
sessions_q
end
sessions_q = include_path_filter_exit(sessions_q, query.filters["exit_page"])
q =
from(e in "events",
@ -1194,13 +1222,7 @@ defmodule Plausible.Stats.Clickhouse do
q
end
q =
if query.filters["page"] do
page = query.filters["page"]
from(e in q, where: e.pathname == ^page)
else
q
end
q = include_path_filter(q, query.filters["page"])
if query.filters["props"] do
[{key, val}] = query.filters["props"] |> Enum.into([])
@ -1350,21 +1372,9 @@ defmodule Plausible.Stats.Clickhouse do
q
end
q =
if query.filters["entry_page"] do
entry_page = query.filters["entry_page"]
from(s in q, where: s.entry_page == ^entry_page)
else
q
end
q = include_path_filter_entry(q, query.filters["entry_page"])
q =
if query.filters["exit_page"] do
exit_page = query.filters["exit_page"]
from(s in q, where: s.exit_page == ^exit_page)
else
q
end
q = include_path_filter_exit(q, query.filters["exit_page"])
if query.filters["referrer"] do
ref = query.filters["referrer"]
@ -1464,13 +1474,7 @@ defmodule Plausible.Stats.Clickhouse do
q
end
q =
if query.filters["page"] do
page = query.filters["page"]
from(e in q, where: e.pathname == ^page)
else
q
end
q = include_path_filter(q, query.filters["page"])
if query.filters["props"] do
[{key, val}] = query.filters["props"] |> Enum.into([])
@ -1550,12 +1554,9 @@ defmodule Plausible.Stats.Clickhouse do
end
if path do
if String.match?(path, ~r/\*/) do
path_regex =
"^#{path}\/?$"
|> String.replace(~r/\*\*/, ".*")
|> String.replace(~r/(?<!\.)\*/, "[^/]*")
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
from(e in q, where: fragment("match(?, ?)", e.pathname, ^path_regex))
else
from(e in q, where: e.pathname == ^path)
@ -1564,4 +1565,234 @@ defmodule Plausible.Stats.Clickhouse do
q
end
end
defp check_negated_filter(filter) do
negated = String.at(filter, 0) == "!"
updated_filter = if negated, do: String.slice(filter, 1..-1), else: filter
{negated, updated_filter}
end
defp convert_path_regex(path) do
contains_regex = String.match?(path, ~r/\*/)
regex =
"^#{path}\/?$"
|> String.replace(~r/\*\*/, ".*")
|> String.replace(~r/(?<!\.)\*/, "[^/]*")
{contains_regex, regex}
end
defp include_path_filter(db_query, path) do
if path do
{negated, path} = check_negated_filter(path)
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
if negated do
from(e in db_query, where: fragment("not(match(?, ?))", e.pathname, ^path_regex))
else
from(e in db_query, where: fragment("match(?, ?)", e.pathname, ^path_regex))
end
else
if negated do
from(e in db_query, where: e.pathname != ^path)
else
from(e in db_query, where: e.pathname == ^path)
end
end
else
db_query
end
end
defp include_path_filter_entry(db_query, path) do
if path do
{negated, path} = check_negated_filter(path)
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
if negated do
from(e in db_query, where: fragment("not(match(?, ?))", e.entry_page, ^path_regex))
else
from(e in db_query, where: fragment("match(?, ?)", e.entry_page, ^path_regex))
end
else
if negated do
from(e in db_query, where: e.entry_page != ^path)
else
from(e in db_query, where: e.entry_page == ^path)
end
end
else
db_query
end
end
defp include_path_filter_exit(db_query, path) do
if path do
{negated, path} = check_negated_filter(path)
{contains_regex, path_regex} = convert_path_regex(path)
if contains_regex do
if negated do
from(e in db_query, where: fragment("not(match(?, ?))", e.exit_page, ^path_regex))
else
from(e in db_query, where: fragment("match(?, ?)", e.exit_page, ^path_regex))
end
else
if negated do
from(e in db_query, where: e.exit_page != ^path)
else
from(e in db_query, where: e.exit_page == ^path)
end
end
else
db_query
end
end
def make_suggestions(site, query, "country", filter_search) do
filter_search =
String.split(filter_search, ",")
|> Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha2(c) end)
q =
from(
e in base_session_query(site, query),
group_by: e.country_code,
order_by: [desc: fragment("count(*)")],
select: {e.country_code}
)
ClickhouseRepo.all(q)
|> Enum.map(fn {x} -> x end)
|> Enum.filter(fn c -> Enum.find(filter_search, false, fn x -> x == c end) end)
|> Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha3(c) end)
|> Enum.slice(0..24)
end
def make_suggestions(site, _query, "goal", filter_search) do
Repo.all(from g in Plausible.Goal, where: g.domain == ^site.domain)
|> Enum.map(fn x -> if x.event_name, do: x.event_name, else: "Visit #{x.page_path}" end)
|> Enum.filter(fn goal ->
String.contains?(
String.downcase(goal),
String.downcase(filter_search)
)
end)
end
def make_suggestions(site, query, filter_name, filter_search) do
filter_search = if filter_search == nil, do: "", else: filter_search
filter_query =
if Enum.member?(["entry_page", "page", "exit_page"], filter_name),
do: "%#{String.replace(filter_search, "*", "")}%",
else: "%#{filter_search}%"
filter_name =
case filter_name do
"page" -> "pathname"
"source" -> "referrer_source"
"os" -> "operating_system"
"os_version" -> "operating_system_version"
"screen" -> "screen_size"
_ -> filter_name
end
q =
if(filter_name == "pathname",
do: base_query(site, query),
else: base_session_query(site, query)
)
|> from(
group_by: ^String.to_atom(filter_name),
order_by: [desc: fragment("count(*)")],
limit: 25
)
q =
case filter_name do
"pathname" ->
from(e in q,
select: {e.pathname},
where: fragment("? ilike ?", e.pathname, ^filter_query)
)
"entry_page" ->
from(e in q,
select: {e.entry_page},
where: fragment("? ilike ?", e.entry_page, ^filter_query)
)
"exit_page" ->
from(e in q,
select: {e.exit_page},
where: fragment("? ilike ?", e.exit_page, ^filter_query)
)
"referrer_source" ->
from(e in q,
select: {e.referrer_source},
where: fragment("? ilike ?", e.referrer_source, ^filter_query)
)
"utm_medium" ->
from(e in q,
select: {e.utm_medium},
where: fragment("? ilike ?", e.utm_medium, ^filter_query)
)
"utm_source" ->
from(e in q,
select: {e.utm_source},
where: fragment("? ilike ?", e.utm_source, ^filter_query)
)
"utm_campaign" ->
from(e in q,
select: {e.utm_campaign},
where: fragment("? ilike ?", e.utm_campaign, ^filter_query)
)
"referrer" ->
from(e in q,
select: {e.referrer},
where: fragment("? ilike ?", e.referrer, ^filter_query)
)
"browser" ->
from(e in q, select: {e.browser}, where: fragment("? ilike ?", e.browser, ^filter_query))
"browser_version" ->
from(e in q,
select: {e.browser_version},
where: fragment("? ilike ?", e.browser_version, ^filter_query)
)
"operating_system" ->
from(e in q,
select: {e.operating_system},
where: fragment("? ilike ?", e.operating_system, ^filter_query)
)
"operating_system_version" ->
from(e in q,
select: {e.operating_system_version},
where: fragment("? ilike ?", e.operating_system_version, ^filter_query)
)
"screen_size" ->
from(e in q,
select: {e.screen_size},
where: fragment("? ilike ?", e.screen_size, ^filter_query)
)
end
ClickhouseRepo.all(q)
|> Enum.map(fn {suggestion} -> suggestion end)
|> Enum.filter(fn suggestion -> suggestion != "" end)
end
end

@ -37,7 +37,8 @@ defmodule PlausibleWeb.Api.ExternalSitesController do
def find_or_create_shared_link(conn, params) do
with {:ok, site_id} <- expect_param_key(params, "site_id"),
{:ok, link_name} <- expect_param_key(params, "name"),
site when not is_nil(site) <- Sites.get_for_user(conn.assigns[:current_user].id, site_id) do
site when not is_nil(site) <-
Sites.get_for_user(conn.assigns[:current_user].id, site_id, [:owner, :admin]) do
shared_link = Repo.get_by(Plausible.Site.SharedLink, site_id: site.id, name: link_name)
shared_link =

@ -110,14 +110,12 @@ defmodule PlausibleWeb.Api.StatsController do
Task.yield_many(
[
Task.async(fn ->
{:ok, page_times} =
Stats.page_times_by_page_url(site, query, [query.filters["page"]])
{:ok, page_times} = Stats.page_times_by_page_url(site, query)
page_times
end),
Task.async(fn ->
{:ok, page_times} =
Stats.page_times_by_page_url(site, prev_query, [query.filters["page"]])
{:ok, page_times} = Stats.page_times_by_page_url(site, prev_query)
page_times
end)
@ -132,8 +130,8 @@ defmodule PlausibleWeb.Api.StatsController do
{:ok, page_times} ->
result = Enum.at(page_times.rows, 0)
result = if result, do: Enum.at(result, 1), else: nil
if result, do: {:ok, round(result)}, else: {:ok, 0}
result = if result, do: Enum.at(result, 0), else: nil
if result, do: {:ok, round(result)}, else: {nil, nil}
_ ->
response
@ -233,8 +231,8 @@ defmodule PlausibleWeb.Api.StatsController do
nil ->
{_, total_visitors} = Stats.pageviews_and_visitors(site, query)
user_id = get_session(conn, :current_user_id)
is_owner = user_id && Plausible.Sites.is_owner?(user_id, site)
json(conn, %{not_configured: true, is_owner: is_owner, total_visitors: total_visitors})
is_admin = user_id && Plausible.Sites.has_admin_access?(user_id, site)
json(conn, %{not_configured: true, is_admin: is_admin, total_visitors: total_visitors})
{:ok, terms} ->
{_, total_visitors} = Stats.pageviews_and_visitors(site, query)
@ -386,4 +384,11 @@ defmodule PlausibleWeb.Api.StatsController do
def handle_errors(conn, %{kind: kind, reason: reason}) do
json(conn, %{error: Exception.format_banner(kind, reason)})
end
def filter_suggestions(conn, params) do
site = conn.assigns[:site]
query = Query.from(site.timezone, params)
json(conn, Stats.make_suggestions(site, query, params["filter_name"], params["q"]))
end
end

@ -36,7 +36,7 @@ defmodule PlausibleWeb.AuthController do
conn
|> redirect(to: "/login")
else
user = Plausible.Auth.User.new(%Plausible.Auth.User{}, params["user"])
user = Plausible.Auth.User.new(params["user"])
if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do
case Repo.insert(user) do
@ -70,9 +70,77 @@ defmodule PlausibleWeb.AuthController do
end
end
def register_from_invitation_form(conn, %{"invitation_id" => invitation_id}) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
conn
|> redirect(to: "/login")
else
invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)
changeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{})
if invitation do
render(conn, "register_from_invitation_form.html",
changeset: changeset,
invitation: invitation,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
else
render(conn, "invitation_expired.html", layout: {PlausibleWeb.LayoutView, "focus.html"})
end
end
end
def register_from_invitation(conn, %{"invitation_id" => invitation_id} = params) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
conn
|> redirect(to: "/login")
else
invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)
user = Plausible.Auth.User.new(params["user"])
if PlausibleWeb.Captcha.verify(params["h-captcha-response"]) do
case Repo.insert(user) do
{:ok, user} ->
code = Auth.issue_email_verification(user)
Logger.info("VERIFICATION CODE: #{code}")
email_template = PlausibleWeb.Email.activation_email(user, code)
Plausible.Mailer.send_email(email_template)
conn
|> put_session(:current_user_id, user.id)
|> put_resp_cookie("logged_in", "true",
http_only: false,
max_age: 60 * 60 * 24 * 365 * 5000
)
|> redirect(to: "/activate")
{:error, changeset} ->
render(conn, "register_from_invitation_form.html",
invitation: invitation,
changeset: changeset,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
else
render(conn, "register_from_invitation_form.html",
invitation: invitation,
changeset: user,
captcha_error: "Please complete the captcha to register",
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
end
end
def activate_form(conn, _params) do
user = conn.assigns[:current_user]
has_invitation =
Repo.exists?(
from i in Plausible.Auth.Invitation,
where: i.email == ^user.email
)
has_code =
Repo.exists?(
from c in "email_verification_codes",
@ -81,22 +149,35 @@ defmodule PlausibleWeb.AuthController do
render(conn, "activate.html",
has_pin: has_code,
has_invitation: has_invitation,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
def activate(conn, %{"code" => code}) do
user = conn.assigns[:current_user]
has_invitation =
Repo.exists?(
from i in Plausible.Auth.Invitation,
where: i.email == ^user.email
)
{code, ""} = Integer.parse(code)
case Auth.verify_email(user, code) do
:ok ->
redirect(conn, to: "/sites/new")
if has_invitation do
redirect(conn, to: "/sites")
else
redirect(conn, to: "/sites/new")
end
{:error, :incorrect} ->
render(conn, "activate.html",
error: "Incorrect activation code",
has_pin: true,
has_invitation: has_invitation,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
@ -104,6 +185,7 @@ defmodule PlausibleWeb.AuthController do
render(conn, "activate.html",
error: "Code is expired, please request another one",
has_pin: false,
has_invitation: has_invitation,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end

@ -0,0 +1,108 @@
defmodule PlausibleWeb.InvitationController do
use PlausibleWeb, :controller
use Plausible.Repo
alias Ecto.Multi
alias Plausible.Auth.Invitation
alias Plausible.Site.Membership
plug PlausibleWeb.RequireAccountPlug
def accept_invitation(conn, %{"invitation_id" => invitation_id}) do
invitation =
Repo.get_by!(Invitation, invitation_id: invitation_id)
|> Repo.preload([:site, :inviter])
user = conn.assigns[:current_user]
existing_membership = Repo.get_by(Membership, user_id: user.id, site_id: invitation.site.id)
multi =
if invitation.role == :owner do
downgrade_previous_owner(Multi.new(), invitation.site)
else
Multi.new()
end
membership_changeset =
Membership.changeset(existing_membership || %Membership{}, %{
user_id: user.id,
site_id: invitation.site.id,
role: invitation.role
})
multi =
multi
|> Multi.insert_or_update(:membership, membership_changeset)
|> Multi.delete(:invitation, invitation)
case Repo.transaction(multi) do
{:ok, _} ->
notify_invitation_accepted(invitation)
Plausible.Billing.SiteLocker.check_sites_for(user)
conn
|> put_flash(:success, "You now have access to #{invitation.site.domain}")
|> redirect(to: "/#{URI.encode_www_form(invitation.site.domain)}")
{:error, _} ->
conn
|> put_flash(:error, "Something went wrong, please try again")
|> redirect(to: "/sites")
end
end
defp downgrade_previous_owner(multi, site) do
prev_owner =
from(
sm in Plausible.Site.Membership,
where: sm.site_id == ^site.id,
where: sm.role == :owner
)
Multi.update_all(multi, :prev_owner, prev_owner, set: [role: :admin])
end
def reject_invitation(conn, %{"invitation_id" => invitation_id}) do
invitation =
Repo.get_by!(Invitation, invitation_id: invitation_id)
|> Repo.preload([:site, :inviter])
Repo.delete!(invitation)
notify_invitation_rejected(invitation)
conn
|> put_flash(:success, "You have rejected the invitation to #{invitation.site.domain}")
|> redirect(to: "/sites")
end
defp notify_invitation_accepted(%Invitation{role: :owner} = invitation) do
PlausibleWeb.Email.ownership_transfer_accepted(invitation)
|> Plausible.Mailer.send_email()
end
defp notify_invitation_accepted(invitation) do
PlausibleWeb.Email.invitation_accepted(invitation)
|> Plausible.Mailer.send_email()
end
defp notify_invitation_rejected(%Invitation{role: :owner} = invitation) do
PlausibleWeb.Email.ownership_transfer_rejected(invitation)
|> Plausible.Mailer.send_email()
end
defp notify_invitation_rejected(invitation) do
PlausibleWeb.Email.invitation_rejected(invitation)
|> Plausible.Mailer.send_email()
end
def remove_invitation(conn, %{"invitation_id" => invitation_id}) do
invitation =
Repo.get_by!(Invitation, invitation_id: invitation_id)
|> Repo.preload(:site)
Repo.delete!(invitation)
conn
|> put_flash(:success, "You have removed the invitation for #{invitation.email}")
|> redirect(to: Routes.site_path(conn, :settings_general, invitation.site.domain))
end
end

@ -0,0 +1,149 @@
defmodule PlausibleWeb.Site.MembershipController do
use PlausibleWeb, :controller
use Plausible.Repo
alias Plausible.Sites
alias Plausible.Site.Membership
alias Plausible.Auth.Invitation
@only_owner_is_allowed_to [:transfer_ownership_form, :transfer_ownership]
plug PlausibleWeb.RequireAccountPlug
plug PlausibleWeb.AuthorizeSiteAccess, [:owner] when action in @only_owner_is_allowed_to
plug PlausibleWeb.AuthorizeSiteAccess,
[:owner, :admin] when action not in @only_owner_is_allowed_to
def invite_member_form(conn, %{"website" => site_domain}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
render(
conn,
"invite_member_form.html",
site: site,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
def invite_member(conn, %{"website" => site_domain, "email" => email, "role" => role}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
user = Plausible.Auth.find_user_by(email: email)
if user && Sites.is_member?(user.id, site) do
msg = "Cannot send invite because #{user.email} is already a member of #{site.domain}"
render(conn, "invite_member_form.html",
error: msg,
site: site,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
else
invitation =
Invitation.new(%{
email: email,
role: role,
site_id: site.id,
inviter_id: conn.assigns[:current_user].id
})
|> Repo.insert!()
|> Repo.preload([:site, :inviter])
email_template =
if user do
PlausibleWeb.Email.existing_user_invitation(invitation)
else
PlausibleWeb.Email.new_user_invitation(invitation)
end
Plausible.Mailer.send_email(email_template)
conn
|> put_flash(
:success,
"#{email} has been invited to #{site_domain} as #{
PlausibleWeb.SiteView.with_indefinite_article(role)
}"
)
|> redirect(to: Routes.site_path(conn, :settings_people, site.domain))
end
end
def transfer_ownership_form(conn, %{"website" => site_domain}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
render(
conn,
"transfer_ownership_form.html",
site: site,
layout: {PlausibleWeb.LayoutView, "focus.html"}
)
end
def transfer_ownership(conn, %{"website" => site_domain, "email" => email}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)
user = Plausible.Auth.find_user_by(email: email)
invitation =
Invitation.new(%{
email: email,
role: :owner,
site_id: site.id,
inviter_id: conn.assigns[:current_user].id
})
|> Repo.insert!()
|> Repo.preload([:site, :inviter])
PlausibleWeb.Email.ownership_transfer_request(invitation, user)
|> Plausible.Mailer.send_email()
conn
|> put_flash(:success, "Site transfer request has been sent to #{email}")
|> redirect(to: Routes.site_path(conn, :settings_people, site.domain))
end
def update_role(conn, %{"id" => id, "new_role" => new_role}) do
membership =
Repo.get!(Membership, id)
|> Repo.preload([:site, :user])
|> Membership.changeset(%{role: new_role})
|> Repo.update!()
redirect_target =
if membership.user.id == conn.assigns[:current_user].id && new_role == "viewer" do
"/#{URI.encode_www_form(membership.site.domain)}"
else
Routes.site_path(conn, :settings_people, membership.site.domain)
end
conn
|> put_flash(
:success,
"#{membership.user.name} is now #{PlausibleWeb.SiteView.with_indefinite_article(new_role)}"
)
|> redirect(to: redirect_target)
end
def remove_member(conn, %{"id" => id}) do
membership =
Repo.get!(Membership, id)
|> Repo.preload([:user, :site])
Repo.delete!(membership)
PlausibleWeb.Email.site_member_removed(membership)
|> Plausible.Mailer.send_email()
redirect_target =
if membership.user.id == conn.assigns[:current_user].id do
"/#{URI.encode_www_form(membership.site.domain)}"
else
Routes.site_path(conn, :settings_people, membership.site.domain)
end
conn
|> put_flash(
:success,
"#{membership.user.name} has been removed from #{membership.site.domain}"
)
|> redirect(to: redirect_target)
end
end

@ -5,27 +5,53 @@ defmodule PlausibleWeb.SiteController do
plug PlausibleWeb.RequireAccountPlug
plug PlausibleWeb.AuthorizeSiteAccess,
[:owner, :admin] when action not in [:index, :new, :create_site]
def index(conn, params) do
user = conn.assigns[:current_user]
invitations =
Repo.all(
from i in Plausible.Auth.Invitation,
where: i.email == ^user.email
)
|> Repo.preload(:site)
invitation_site_ids = Enum.map(invitations, & &1.site.id)
{sites, pagination} =
Repo.paginate(
from(s in Plausible.Site,
join: sm in Plausible.Site.Membership,
on: sm.site_id == s.id,
where: sm.user_id == ^user.id,
order_by: s.domain
where: s.id not in ^invitation_site_ids,
order_by: s.domain,
preload: [memberships: sm]
),
params
)
visitors = Plausible.Stats.Clickhouse.last_24h_visitors(sites)
render(conn, "index.html", sites: sites, visitors: visitors, pagination: pagination)
user_owns_sites =
Enum.any?(sites, fn site -> List.first(site.memberships).role == :owner end) ||
Plausible.Auth.user_owns_sites?(user)
visitors =
Plausible.Stats.Clickhouse.last_24h_visitors(sites ++ Enum.map(invitations, & &1.site))
render(conn, "index.html",
invitations: invitations,
sites: sites,
visitors: visitors,
pagination: pagination,
needs_to_upgrade: user_owns_sites && Plausible.Billing.needs_to_upgrade?(user)
)
end
def new(conn, _params) do
current_user = conn.assigns[:current_user]
site_count = Plausible.Sites.count_for(current_user)
site_count = Enum.count(Plausible.Sites.owned_by(current_user))
site_limit = Plausible.Billing.sites_limit(current_user)
is_at_limit = site_limit && site_count >= site_limit
is_first_site = site_count == 0
@ -43,7 +69,7 @@ defmodule PlausibleWeb.SiteController do
def create_site(conn, %{"site" => site_params}) do
user = conn.assigns[:current_user]
site_count = Plausible.Sites.count_for(user)
site_count = Enum.count(Plausible.Sites.owned_by(user))
is_first_site = site_count == 0
case Sites.create(user, site_params) do
@ -72,12 +98,9 @@ defmodule PlausibleWeb.SiteController do
end
end
def add_snippet(conn, %{"website" => website}) do
def add_snippet(conn, _params) do
user = conn.assigns[:current_user]
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
|> Repo.preload(:custom_domain)
site = conn.assigns[:site] |> Repo.preload(:custom_domain)
is_first_site =
!Repo.exists?(
@ -96,8 +119,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def new_goal(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def new_goal(conn, _params) do
site = conn.assigns[:site]
changeset = Plausible.Goal.changeset(%Plausible.Goal{})
conn
@ -109,8 +132,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def create_goal(conn, %{"website" => website, "goal" => goal}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def create_goal(conn, %{"goal" => goal}) do
site = conn.assigns[:site]
case Plausible.Goals.create(site, goal) do
{:ok, _} ->
@ -141,9 +164,9 @@ defmodule PlausibleWeb.SiteController do
redirect(conn, to: "/#{URI.encode_www_form(website)}/settings/general")
end
def settings_general(conn, %{"website" => website}) do
def settings_general(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
conn.assigns[:site]
|> Repo.preload(:custom_domain)
conn
@ -155,8 +178,21 @@ defmodule PlausibleWeb.SiteController do
)
end
def settings_visibility(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def settings_people(conn, _params) do
site =
conn.assigns[:site]
|> Repo.preload(memberships: :user, invitations: [], custom_domain: [])
conn
|> assign(:skip_plausible_tracking, true)
|> render("settings_people.html",
site: site,
layout: {PlausibleWeb.LayoutView, "site_settings.html"}
)
end
def settings_visibility(conn, _params) do
site = conn.assigns[:site] |> Repo.preload(:custom_domain)
shared_links = Repo.all(from l in Plausible.Site.SharedLink, where: l.site_id == ^site.id)
conn
@ -168,8 +204,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def settings_goals(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def settings_goals(conn, _params) do
site = conn.assigns[:site] |> Repo.preload(:custom_domain)
goals = Goals.for_site(site.domain)
conn
@ -181,10 +217,10 @@ defmodule PlausibleWeb.SiteController do
)
end
def settings_search_console(conn, %{"website" => website}) do
def settings_search_console(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
|> Repo.preload(:google_auth)
conn.assigns[:site]
|> Repo.preload([:google_auth, :custom_domain])
search_console_domains =
if site.google_auth do
@ -200,8 +236,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def settings_email_reports(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def settings_email_reports(conn, _params) do
site = conn.assigns[:site] |> Repo.preload(:custom_domain)
conn
|> assign(:skip_plausible_tracking, true)
@ -214,9 +250,9 @@ defmodule PlausibleWeb.SiteController do
)
end
def settings_custom_domain(conn, %{"website" => website}) do
def settings_custom_domain(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
conn.assigns[:site]
|> Repo.preload(:custom_domain)
conn
@ -227,8 +263,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def settings_danger_zone(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def settings_danger_zone(conn, _params) do
site = conn.assigns[:site] |> Repo.preload(:custom_domain)
conn
|> assign(:skip_plausible_tracking, true)
@ -238,10 +274,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def update_google_auth(conn, %{"website" => website, "google_auth" => attrs}) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
|> Repo.preload(:google_auth)
def update_google_auth(conn, %{"google_auth" => attrs}) do
site = conn.assigns[:site] |> Repo.preload(:google_auth)
Plausible.Site.GoogleAuth.set_property(site.google_auth, attrs)
|> Repo.update!()
@ -251,9 +285,9 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console")
end
def delete_google_auth(conn, %{"website" => website}) do
def delete_google_auth(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
conn.assigns[:site]
|> Repo.preload(:google_auth)
Repo.delete!(site.google_auth)
@ -263,8 +297,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/search-console")
end
def update_settings(conn, %{"website" => website, "site" => site_params}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def update_settings(conn, %{"site" => site_params}) do
site = conn.assigns[:site]
changeset = site |> Plausible.Site.changeset(site_params)
res = changeset |> Repo.update()
@ -282,8 +316,8 @@ defmodule PlausibleWeb.SiteController do
end
end
def reset_stats(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def reset_stats(conn, _params) do
site = conn.assigns[:site]
Plausible.ClickhouseRepo.clear_stats_for(site.domain)
conn
@ -291,8 +325,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/danger-zone")
end
def delete_site(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def delete_site(conn, _params) do
site = conn.assigns[:site]
Repo.delete!(site)
Plausible.ClickhouseRepo.clear_stats_for(site.domain)
@ -302,9 +336,9 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/sites")
end
def make_public(conn, %{"website" => website}) do
def make_public(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
conn.assigns[:site]
|> Plausible.Site.make_public()
|> Repo.update!()
@ -313,9 +347,9 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")
end
def make_private(conn, %{"website" => website}) do
def make_private(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
conn.assigns[:site]
|> Plausible.Site.make_private()
|> Repo.update!()
@ -324,8 +358,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")
end
def enable_weekly_report(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def enable_weekly_report(conn, _params) do
site = conn.assigns[:site]
Plausible.Site.WeeklyReport.changeset(%Plausible.Site.WeeklyReport{}, %{
site_id: site.id,
@ -338,8 +372,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def disable_weekly_report(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def disable_weekly_report(conn, _params) do
site = conn.assigns[:site]
Repo.delete_all(from wr in Plausible.Site.WeeklyReport, where: wr.site_id == ^site.id)
conn
@ -347,8 +381,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def add_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def add_weekly_report_recipient(conn, %{"recipient" => recipient}) do
site = conn.assigns[:site]
Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|> Plausible.Site.WeeklyReport.add_recipient(recipient)
@ -359,8 +393,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def remove_weekly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def remove_weekly_report_recipient(conn, %{"recipient" => recipient}) do
site = conn.assigns[:site]
Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)
|> Plausible.Site.WeeklyReport.remove_recipient(recipient)
@ -374,8 +408,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def enable_monthly_report(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def enable_monthly_report(conn, _params) do
site = conn.assigns[:site]
Plausible.Site.MonthlyReport.changeset(%Plausible.Site.MonthlyReport{}, %{
site_id: site.id,
@ -388,8 +422,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def disable_monthly_report(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def disable_monthly_report(conn, _params) do
site = conn.assigns[:site]
Repo.delete_all(from mr in Plausible.Site.MonthlyReport, where: mr.site_id == ^site.id)
conn
@ -397,8 +431,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def add_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def add_monthly_report_recipient(conn, %{"recipient" => recipient}) do
site = conn.assigns[:site]
Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|> Plausible.Site.MonthlyReport.add_recipient(recipient)
@ -409,8 +443,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def remove_monthly_report_recipient(conn, %{"website" => website, "recipient" => recipient}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def remove_monthly_report_recipient(conn, %{"recipient" => recipient}) do
site = conn.assigns[:site]
Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)
|> Plausible.Site.MonthlyReport.remove_recipient(recipient)
@ -424,8 +458,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def enable_spike_notification(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def enable_spike_notification(conn, _params) do
site = conn.assigns[:site]
res =
Plausible.Site.SpikeNotification.changeset(%Plausible.Site.SpikeNotification{}, %{
@ -448,8 +482,8 @@ defmodule PlausibleWeb.SiteController do
end
end
def disable_spike_notification(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def disable_spike_notification(conn, _params) do
site = conn.assigns[:site]
Repo.delete_all(from mr in Plausible.Site.SpikeNotification, where: mr.site_id == ^site.id)
conn
@ -457,8 +491,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def update_spike_notification(conn, %{"website" => website, "spike_notification" => params}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def update_spike_notification(conn, %{"spike_notification" => params}) do
site = conn.assigns[:site]
notification = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
Plausible.Site.SpikeNotification.changeset(notification, params)
@ -469,8 +503,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def add_spike_notification_recipient(conn, %{"website" => website, "recipient" => recipient}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def add_spike_notification_recipient(conn, %{"recipient" => recipient}) do
site = conn.assigns[:site]
Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|> Plausible.Site.SpikeNotification.add_recipient(recipient)
@ -481,8 +515,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def remove_spike_notification_recipient(conn, %{"website" => website, "recipient" => recipient}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def remove_spike_notification_recipient(conn, %{"recipient" => recipient}) do
site = conn.assigns[:site]
Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)
|> Plausible.Site.SpikeNotification.remove_recipient(recipient)
@ -496,8 +530,8 @@ defmodule PlausibleWeb.SiteController do
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/email-reports")
end
def new_shared_link(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def new_shared_link(conn, _params) do
site = conn.assigns[:site]
changeset = Plausible.Site.SharedLink.changeset(%Plausible.Site.SharedLink{}, %{})
conn
@ -509,8 +543,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def create_shared_link(conn, %{"website" => website, "shared_link" => link}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def create_shared_link(conn, %{"shared_link" => link}) do
site = conn.assigns[:site]
case Sites.create_shared_link(site, link["name"], link["password"]) do
{:ok, _created} ->
@ -527,8 +561,8 @@ defmodule PlausibleWeb.SiteController do
end
end
def edit_shared_link(conn, %{"website" => website, "slug" => slug}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def edit_shared_link(conn, %{"slug" => slug}) do
site = conn.assigns[:site]
shared_link = Repo.get_by(Plausible.Site.SharedLink, slug: slug)
changeset = Plausible.Site.SharedLink.changeset(shared_link, %{})
@ -541,8 +575,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def update_shared_link(conn, %{"website" => website, "slug" => slug, "shared_link" => params}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def update_shared_link(conn, %{"slug" => slug, "shared_link" => params}) do
site = conn.assigns[:site]
shared_link = Repo.get_by(Plausible.Site.SharedLink, slug: slug)
changeset = Plausible.Site.SharedLink.changeset(shared_link, params)
@ -561,8 +595,8 @@ defmodule PlausibleWeb.SiteController do
end
end
def delete_shared_link(conn, %{"website" => website, "slug" => slug}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def delete_shared_link(conn, %{"slug" => slug}) do
site = conn.assigns[:site]
Repo.get_by(Plausible.Site.SharedLink, slug: slug)
|> Repo.delete!()
@ -570,8 +604,8 @@ defmodule PlausibleWeb.SiteController do
redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")
end
def new_custom_domain(conn, %{"website" => website}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def new_custom_domain(conn, _params) do
site = conn.assigns[:site]
changeset = Plausible.Site.CustomDomain.changeset(%Plausible.Site.CustomDomain{}, %{})
conn
@ -583,10 +617,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def custom_domain_dns_setup(conn, %{"website" => website}) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
|> Repo.preload(:custom_domain)
def custom_domain_dns_setup(conn, _params) do
site = conn.assigns[:site] |> Repo.preload(:custom_domain)
conn
|> assign(:skip_plausible_tracking, true)
@ -596,9 +628,9 @@ defmodule PlausibleWeb.SiteController do
)
end
def custom_domain_snippet(conn, %{"website" => website}) do
def custom_domain_snippet(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
conn.assigns[:site]
|> Repo.preload(:custom_domain)
conn
@ -609,8 +641,8 @@ defmodule PlausibleWeb.SiteController do
)
end
def add_custom_domain(conn, %{"website" => website, "custom_domain" => domain}) do
site = Sites.get_for_user!(conn.assigns[:current_user].id, website)
def add_custom_domain(conn, %{"custom_domain" => domain}) do
site = conn.assigns[:site]
case Sites.add_custom_domain(site, domain["domain"]) do
{:ok, _custom_domain} ->
@ -627,15 +659,15 @@ defmodule PlausibleWeb.SiteController do
end
end
def delete_custom_domain(conn, %{"website" => website}) do
def delete_custom_domain(conn, _params) do
site =
Sites.get_for_user!(conn.assigns[:current_user].id, website)
conn.assigns[:site]
|> Repo.preload(:custom_domain)
Repo.delete!(site.custom_domain)
conn
|> put_flash(:success, "Custom domain deleted successfully")
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/custom-domain")
|> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general")
end
end

@ -4,33 +4,37 @@ defmodule PlausibleWeb.StatsController do
alias Plausible.Stats.Clickhouse, as: Stats
alias Plausible.Stats.Query
plug PlausibleWeb.AuthorizeStatsPlug when action in [:stats, :csv_export]
plug PlausibleWeb.UpgradeBillingPlug when action in [:stats]
def base_domain() do
PlausibleWeb.Endpoint.host()
end
plug PlausibleWeb.AuthorizeSiteAccess when action in [:stats, :csv_export]
def stats(%{assigns: %{site: site}} = conn, _params) do
if Stats.has_pageviews?(site) do
demo = site.domain == base_domain()
offer_email_report = get_session(conn, site.domain <> "_offer_email_report")
has_pageviews = Stats.has_pageviews?(site)
conn
|> assign(:skip_plausible_tracking, !demo)
|> remove_email_report_banner(site)
|> put_resp_header("x-robots-tag", "noindex")
|> render("stats.html",
site: site,
has_goals: Plausible.Sites.has_goals?(site),
title: "Plausible · " <> site.domain,
offer_email_report: offer_email_report,
demo: demo
)
else
conn
|> assign(:skip_plausible_tracking, true)
|> render("waiting_first_pageview.html", site: site)
cond do
!site.locked && has_pageviews ->
demo = site.domain == PlausibleWeb.Endpoint.host()
offer_email_report = get_session(conn, site.domain <> "_offer_email_report")
conn
|> assign(:skip_plausible_tracking, !demo)
|> remove_email_report_banner(site)
|> put_resp_header("x-robots-tag", "noindex")
|> render("stats.html",
site: site,
has_goals: Plausible.Sites.has_goals?(site),
title: "Plausible · " <> site.domain,
offer_email_report: offer_email_report,
demo: demo
)
!site.locked && !has_pageviews ->
conn
|> assign(:skip_plausible_tracking, true)
|> render("waiting_first_pageview.html", site: site)
site.locked ->
conn
|> assign(:skip_plausible_tracking, true)
|> render("site_locked.html", site: site)
end
end

@ -164,6 +164,103 @@ defmodule PlausibleWeb.Email do
|> render("cancellation_email.html", name: user.name)
end
def new_user_invitation(invitation) do
base_email()
|> to(invitation.email)
|> tag("new-user-invitation")
|> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}")
|> render("new_user_invitation.html",
invitation: invitation
)
end
def existing_user_invitation(invitation) do
base_email()
|> to(invitation.email)
|> tag("existing-user-invitation")
|> subject("[Plausible Analytics] You've been invited to #{invitation.site.domain}")
|> render("existing_user_invitation.html",
invitation: invitation
)
end
def ownership_transfer_request(invitation, new_owner_account) do
base_email()
|> to(invitation.email)
|> tag("ownership-transfer-request")
|> subject("[Plausible Analytics] Request to transfer ownership of #{invitation.site.domain}")
|> render("ownership_transfer_request.html",
invitation: invitation,
new_owner_account: new_owner_account
)
end
def invitation_accepted(invitation) do
base_email()
|> to(invitation.inviter.email)
|> tag("invitation-accepted")
|> subject(
"[Plausible Analytics] #{invitation.email} accepted your invitation to #{
invitation.site.domain
}"
)
|> render("invitation_accepted.html",
invitation: invitation
)
end
def invitation_rejected(invitation) do
base_email()
|> to(invitation.inviter.email)
|> tag("invitation-rejected")
|> subject(
"[Plausible Analytics] #{invitation.email} rejected your invitation to #{
invitation.site.domain
}"
)
|> render("invitation_rejected.html",
invitation: invitation
)
end
def ownership_transfer_accepted(invitation) do
base_email()
|> to(invitation.inviter.email)
|> tag("ownership-transfer-accepted")
|> subject(
"[Plausible Analytics] #{invitation.email} accepted the ownership transfer of #{
invitation.site.domain
}"
)
|> render("ownership_transfer_accepted.html",
invitation: invitation
)
end
def ownership_transfer_rejected(invitation) do
base_email()
|> to(invitation.inviter.email)
|> tag("ownership-transfer-rejected")
|> subject(
"[Plausible Analytics] #{invitation.email} rejected the ownership transfer of #{
invitation.site.domain
}"
)
|> render("ownership_transfer_rejected.html",
invitation: invitation
)
end
def site_member_removed(membership) do
base_email()
|> to(membership.user.email)
|> tag("site-member-removed")
|> subject("[Plausible Analytics] Your access to #{membership.site.domain} has been revoked")
|> render("site_member_removed.html",
membership: membership
)
end
defp base_email() do
mailer_from = Application.get_env(:plausible, :mailer_email)

@ -0,0 +1,50 @@
defmodule PlausibleWeb.AuthorizeSiteAccess do
import Plug.Conn
use Plausible.Repo
def init([]), do: [:public, :viewer, :admin, :owner]
def init(allowed_roles), do: allowed_roles
def call(conn, allowed_roles) do
site = Repo.get_by(Plausible.Site, domain: conn.params["domain"] || conn.params["website"])
shared_link_auth = conn.params["auth"]
shared_link_record =
shared_link_auth && Repo.get_by(Plausible.Site.SharedLink, slug: shared_link_auth)
if !site do
PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
else
user_id = get_session(conn, :current_user_id)
membership_role = user_id && Plausible.Sites.role(user_id, site)
role =
cond do
user_id && membership_role ->
membership_role
site.public ->
:public
shared_link_record && shared_link_record.site_id == site.id ->
:public
user_id in admin_user_ids() ->
:admin
true ->
nil
end
if role in allowed_roles do
merge_assigns(conn, site: site, current_user_role: role)
else
PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
end
end
end
defp admin_user_ids() do
Application.get_env(:plausible, :admin_user_ids)
end
end

@ -45,10 +45,10 @@ defmodule PlausibleWeb.AuthorizeStatsApiPlug do
defp verify_access(api_key, site_id) do
site = Repo.get_by(Plausible.Site, domain: site_id)
is_owner = site && Plausible.Sites.is_owner?(api_key.user_id, site)
is_member = site && Plausible.Sites.is_member?(api_key.user_id, site)
cond do
site && is_owner -> {:ok, site}
site && is_member -> {:ok, site}
true -> {:error, :invalid_api_key}
end
end

@ -1,33 +0,0 @@
defmodule PlausibleWeb.AuthorizeStatsPlug do
import Plug.Conn
use Plausible.Repo
def init(options) do
options
end
def call(conn, _opts) do
site = Repo.get_by(Plausible.Site, domain: conn.params["domain"])
shared_link_auth = conn.params["auth"]
shared_link_record =
shared_link_auth && Repo.get_by(Plausible.Site.SharedLink, slug: shared_link_auth)
if !site do
PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
else
user_id = get_session(conn, :current_user_id)
can_access =
site.public ||
(user_id && Plausible.Sites.is_owner?(user_id, site)) ||
(shared_link_auth && shared_link_record && shared_link_record.site_id == site.id)
if !can_access do
PlausibleWeb.ControllerHelpers.render_error(conn, 404) |> halt
else
assign(conn, :site, site)
end
end
end
end

@ -14,7 +14,7 @@ defmodule PlausibleWeb.CRMAuthPlug do
id ->
user = Repo.get_by(Plausible.Auth.User, id: id)
if user && user.email in admin_emails() do
if user && user.id in admin_user_ids() do
assign(conn, :current_user, user)
else
conn |> send_resp(403, "Not allowed") |> halt
@ -22,5 +22,5 @@ defmodule PlausibleWeb.CRMAuthPlug do
end
end
defp admin_emails(), do: Application.get_env(:plausible, :admin_emails)
defp admin_user_ids(), do: Application.get_env(:plausible, :admin_user_ids)
end

@ -2,7 +2,7 @@ defmodule PlausibleWeb.Tracker do
import Plug.Conn
use Agent
base_variants = ["hash", "outbound-links", "exclusions"]
base_variants = ["hash", "outbound-links", "exclusions", "compat"]
# Generates Power Set of all variants
variants =

@ -1,21 +0,0 @@
defmodule PlausibleWeb.UpgradeBillingPlug do
import Phoenix.Controller
import Plug.Conn
use Plausible.Repo
def init(options) do
options
end
def call(conn, _opts) do
user = conn.assigns[:current_user]
if user && Plausible.Billing.needs_to_upgrade?(conn.assigns[:current_user]) do
conn
|> redirect(to: "/settings")
|> halt
else
conn
end
end
end

@ -33,7 +33,7 @@ defmodule PlausibleWeb.Router do
plug :accepts, ["json"]
plug PlausibleWeb.Firewall
plug :fetch_session
plug PlausibleWeb.AuthorizeStatsPlug
plug PlausibleWeb.AuthorizeSiteAccess
end
pipeline :public_api do
@ -69,6 +69,7 @@ defmodule PlausibleWeb.Router do
get "/:domain/screen-sizes", StatsController, :screen_sizes
get "/:domain/conversions", StatsController, :conversions
get "/:domain/property/:prop_name", StatsController, :prop_breakdown
get "/:domain/suggestions/:filter_name", StatsController, :filter_suggestions
end
scope "/api/v1/stats", PlausibleWeb.Api do
@ -105,6 +106,8 @@ defmodule PlausibleWeb.Router do
get "/register", AuthController, :register_form
post "/register", AuthController, :register
get "/register/invitation/:invitation_id", AuthController, :register_from_invitation_form
post "/register/invitation/:invitation_id", AuthController, :register_from_invitation
get "/activate", AuthController, :activate_form
post "/activate/request-code", AuthController, :request_activation_code
post "/activate", AuthController, :activate
@ -195,12 +198,26 @@ defmodule PlausibleWeb.Router do
post "/sites/:website/custom-domains", SiteController, :add_custom_domain
delete "/sites/:website/custom-domains/:id", SiteController, :delete_custom_domain
get "/sites/:website/memberships/invite", Site.MembershipController, :invite_member_form
post "/sites/:website/memberships/invite", Site.MembershipController, :invite_member
post "/sites//invitations/:invitation_id/accept", InvitationController, :accept_invitation
post "/sites//invitations/:invitation_id/reject", InvitationController, :reject_invitation
delete "/sites//invitations/:invitation_id", InvitationController, :remove_invitation
get "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership_form
post "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership
put "/sites/:website/memberships/:id/role/:new_role", Site.MembershipController, :update_role
delete "/sites/:website/memberships/:id", Site.MembershipController, :remove_member
get "/sites/:website/weekly-report/unsubscribe", UnsubscribeController, :weekly_report
get "/sites/:website/monthly-report/unsubscribe", UnsubscribeController, :monthly_report
get "/:website/snippet", SiteController, :add_snippet
get "/:website/settings", SiteController, :settings
get "/:website/settings/general", SiteController, :settings_general
get "/:website/settings/people", SiteController, :settings_people
get "/:website/settings/visibility", SiteController, :settings_visibility
get "/:website/settings/goals", SiteController, :settings_goals
get "/:website/settings/search-console", SiteController, :settings_search_console

@ -47,7 +47,9 @@
</div>
<% end %>
<div class="pt-12 pl-8 hidden md:block">
<%= render(PlausibleWeb.AuthView, "_onboarding_steps.html", current_step: 1) %>
</div>
<%= if !@has_invitation do %>
<div class="pt-12 pl-8 hidden md:block">
<%= render(PlausibleWeb.AuthView, "_onboarding_steps.html", current_step: 1) %>
</div>
<% end %>
</div>

@ -0,0 +1,12 @@
<div class="mx-auto mt-6 text-center dark:text-gray-300">
<h1 class="text-3xl font-black">Plausible Analytics</h1>
<div class="text-xl font-medium">Lightweight and privacy-friendly web analytics</div>
</div>
<div class="w-full max-w-md mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8">
<h2 class="text-xl font-black dark:text-gray-100">Invitation expired</h2>
<p class="mt-4 text-sm">
Your invitation has expired or been revoked. Please request fresh one or you can <%= link("sign up", class: "text-indigo-600 hover:text-indigo-900", to: Routes.auth_path(@conn, :register)) %> for a 30-day unlimited free trial without an invitation.
</p>
</div>

@ -0,0 +1,61 @@
<div class="mx-auto mt-6 text-center dark:text-gray-300">
<h1 class="text-3xl font-black">Register your Plausible Analytics account</h1>
<div class="text-xl font-medium">Set up privacy-friendly analytics with just a few clicks</div>
</div>
<%= form_for @changeset, Routes.auth_path(@conn, :register_from_invitation_form, @invitation.invitation_id), [class: "w-full max-w-md mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 mb-4 mt-8"], fn f -> %>
<h2 class="text-xl font-black dark:text-gray-100">Enter your details</h2>
<div class="my-4">
<div class="flex justify-between">
<%= label f, :email, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<p class="text-xs text-gray-500 mt-1">No spam, guaranteed.</p>
</div>
<div class="mt-1">
<%= email_input f, :email, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300", placeholder: "example@email.com", value: @invitation.email, readonly: "readonly" %>
</div>
<%= error_tag f, :email %>
</div>
<div class="my-4">
<%= label f, :name, "Full name", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<div class="mt-1">
<%= text_input f, :name, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300", placeholder: "Jane Doe" %>
</div>
<%= error_tag f, :name %>
</div>
<div class="my-4">
<div class="flex justify-between">
<%= label f, :password, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<p class="text-xs text-gray-500 mt-1">Min 6 characters</p>
</div>
<div class="mt-1">
<%= password_input f, :password, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300" %>
</div>
<%= error_tag f, :password %>
</div>
<div class="my-4">
<%= label f, :password_confirmation, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<div class="mt-1">
<%= password_input f, :password_confirmation, class: "dark:bg-gray-900 shadow-sm focus:ring-indigo-500 focus:border-indigo-500 block w-full sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-300" %>
</div>
<%= error_tag f, :password_confirmation %>
</div>
<%= if PlausibleWeb.Captcha.enabled?() do %>
<div class="mt-4">
<div class="h-captcha" data-sitekey="<%= PlausibleWeb.Captcha.sitekey() %>"></div>
<%= if assigns[:captcha_error] do %>
<div class="text-red-500 text-xs italic mt-3"><%= @captcha_error %></div>
<% end %>
<script src="https://hcaptcha.com/1/api.js" async defer></script>
</div>
<% end %>
<%= submit "Create my account →", class: "button mt-4 w-full" %>
<p class="text-center text-gray-600 dark:text-gray-500 text-xs mt-4">
Already have an account? <%= link("Log in", to: "/login", class: "underline text-gray-800 dark:text-gray-50") %> instead.
</p>
<% end %>

@ -0,0 +1,10 @@
Hey,
<br /><br />
<%= @invitation.inviter.email %> has invited you to the <%= @invitation.site.domain %> site on Plausible Analytics.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view and respond to the invitation. The invitation
will expire 48 hours after this email is sent.
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -0,0 +1,9 @@
Hey <%= user_salutation(@invitation.inviter) %>,
<br /><br />
<%= @invitation.email %> has accepted your invitation to <%= @invitation.site.domain %>.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -0,0 +1,9 @@
Hey <%= user_salutation(@invitation.inviter) %>,
<br /><br />
<%= @invitation.email %> has rejected your invitation to <%= @invitation.site.domain %>.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -0,0 +1,11 @@
Hey,
<br /><br />
<%= @invitation.inviter.email %> has invited you to join the <%= @invitation.site.domain %> site on Plausible Analytics.
<%= link("Click here", to: Routes.auth_url(PlausibleWeb.Endpoint, :register_form), invitation: @invitation.invitation_id) %> to create your account. The link is valid for 48 hours after this email is sent.
<br /><br />
Plausible is a lightweight and open-source website analytics tool. We hope you like our simple and ethical approach to tracking website visitors.
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -0,0 +1,10 @@
Hey <%= user_salutation(@invitation.inviter) %>,
<br /><br />
<%= @invitation.email %> has accepted the ownership transfer of <%= @invitation.site.domain %>. They will be responsible for billing of it going
forward and your role has been changed to <b>admin</b>.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -0,0 +1,9 @@
Hey <%= user_salutation(@invitation.inviter) %>,
<br /><br />
<%= @invitation.email %> has rejected the ownership transfer of <%= @invitation.site.domain %>.
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :settings_general, @invitation.site.domain)) %> to view site settings.
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -0,0 +1,15 @@
Hey,
<br /><br />
<%= @invitation.inviter.email %> has request to transfer the ownership of <%= @invitation.site.domain %> site on Plausible Analytics to you.
<%= if @new_owner_account do %>
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view and respond to the invitation.
<% else %>
<%= link("Click here", to: Routes.auth_url(PlausibleWeb.Endpoint, :register_form), invitation: @invitation.invitation_id) %> to create your account.
<br /><br />
Plausible is a lightweight and open-source website analytics tool. We hope you like our simple and ethical approach to tracking website visitors.
<% end %>
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -0,0 +1,10 @@
Hey <%= user_salutation(@membership.user) %>,
<br /><br />
An administrator of <%= @membership.site.domain %> has removed you as a member. You won't be able to see the stats anymore.
<br /><br />
<%= link("Click here", to: Routes.site_url(PlausibleWeb.Endpoint, :index)) %> to view your sites.
<br /><br />
Thanks,<br />
Uku and Marko<br />
--<br />
<%= plausible_url() %><br />

@ -21,11 +21,12 @@
<% end %>
</li>
<% end %>
<%= if !Application.get_env(:plausible, :is_selfhost) && @conn.assigns[:current_user].subscription == nil do %>
<%= if Plausible.Billing.on_trial?(@conn.assigns[:current_user]) do %>
<li class="hidden mr-6 sm:block">
<%= link(trial_notificaton(@conn.assigns[:current_user]), to: "/settings", class: "font-bold text-orange-900 dark:text-yellow-900 rounded p-2 bg-orange-200 dark:bg-yellow-100", style: "line-height: 40px;") %>
<%= link(trial_notificaton(@conn.assigns[:current_user]), to: "/settings", class: "font-bold text-sm text-yellow-900 dark:text-yellow-900 rounded p-2 bg-yellow-100 dark:bg-yellow-100", style: "line-height: 40px;") %>
</li>
<% else %>
<% end %>
<%= if !Application.get_env(:plausible, :is_selfhost) do %>
<li class="hidden mr-6 sm:block">
<%= link("Docs", to: "https://docs.plausible.io", class: "font-bold rounded m-1 p-1 hover:bg-gray-200 dark:hover:bg-gray-900 dark:text-gray-100", style: "line-height: 40px;", target: "_blank") %>
</li>

@ -1,5 +1,5 @@
<%= if !Application.get_env(:plausible, :is_selfhost) && !@conn.assigns[:skip_plausible_tracking] do %>
<script defer src="https://testing-plausible-io-proxy.uku-taht.workers.dev/js/script.js"></script>
<script defer src="<%="#{plausible_url()}/js/script.js"%>"></script>
<script defer src="<%="#{plausible_url()}/js/plausible.js"%>"></script>
<script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
<% end %>

@ -9,10 +9,10 @@
<div class="lg:grid lg:grid-cols-12 lg:gap-x-5 lg:mt-4">
<div class="py-4 g:py-0 lg:col-span-3">
<%= form_for @conn, "/sites/#{URI.encode_www_form(@site.domain)}/monthly-report/recipients", [class: "lg:hidden"], fn f -> %>
<%= select f, :tab, settings_tabs(), class: "dark:bg-gray-800 mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-500 outline-none focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:text-gray-100", onchange: "location.href = location.href.replace(/[^\/\/]*$/, event.target.value)", selected: List.last(@conn.path_info) %>
<%= select f, :tab, settings_tabs(@conn), class: "dark:bg-gray-800 mt-1 block w-full pl-3 pr-10 py-2 text-base border-gray-300 dark:border-gray-500 outline-none focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:text-gray-100", onchange: "location.href = location.href.replace(/[^\/\/]*$/, event.target.value)", selected: List.last(@conn.path_info) %>
<% end %>
<div class="hidden lg:block">
<%= for [key: key, value: val] <- settings_tabs() do %>
<%= for [key: key, value: val] <- settings_tabs(@conn) do %>
<%= render("_settings_tab.html", this_tab: val, text: key, site: @site, conn: @conn) %>
<% end %>
</div>

@ -1,5 +1,29 @@
<div class="container pt-6">
<div class="pb-5 border-b border-gray-200 dark:border-gray-500 flex items-center justify-between">
<div x-data="{selectedInvitation: null, invitationOpen: false, invitations: <%= Enum.map(@invitations, &({&1.invitation_id, &1})) |> Enum.into(%{}) |> Jason.encode! %>}" @keydown.escape.window="invitationOpen = false" class="container pt-6">
<%= if @needs_to_upgrade do %>
<div class="rounded-md bg-yellow-50 p-4">
<div class="flex">
<div class="flex-shrink-0">
<svg class="h-5 w-5 text-yellow-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd" />
</svg>
</div>
<div class="ml-3">
<h3 class="text-sm font-medium text-yellow-800">
Payment required
</h3>
<div class="mt-2 text-sm text-yellow-700">
<p>
To access the sites you own, you need to subscribe to a monthly or yearly payment plan.
<%= link("Upgrade now →", to: "/settings", class: "text-sm font-medium text-yellow-800") %>
</p>
</div>
</div>
</div>
</div>
<% end %>
<div class="mt-6 pb-5 border-b border-gray-200 dark:border-gray-500 flex items-center justify-between">
<h2 class="text-2xl font-bold leading-7 text-gray-900 dark:text-gray-100 sm:text-3xl sm:leading-9 sm:truncate flex-shrink-0">
My sites
</h2>
@ -7,10 +31,34 @@
</div>
<ul class="my-6 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
<%= if Enum.empty?(@sites) do %>
<%= if Enum.empty?(@sites ++ @invitations) do %>
<p class="dark:text-gray-100">You don't have any sites yet</p>
<% end %>
<%= for invitation <- @invitations do %>
<div class="group cursor-pointer" @click="invitationOpen = true; selectedInvitation = invitations['<%= invitation.invitation_id %>']">
<li class="col-span-1 bg-white dark:bg-gray-800 rounded-lg shadow p-4 group-hover:shadow-lg cursor-pointer">
<div class="w-full flex items-center justify-between space-x-4">
<img src="https://icons.duckduckgo.com/ip3/<%= invitation.site.domain %>.ico" referrerpolicy="no-referrer" onerror="this.onerror=null; this.src='https://icons.duckduckgo.com/ip3/placeholder.ico';" class="w-4 h-4 flex-shrink-0 mt-px">
<div class="flex-1 truncate -mt-px">
<h3 class="text-gray-900 font-medium text-lg truncate dark:text-gray-100"><%= invitation.site.domain %></h3>
</div>
<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800">
Pending invitation
</span>
</div>
<div class="pl-8 mt-2 flex items-center justify-between">
<span class="text-gray-600 dark:text-gray-400 text-sm truncate">
<span class="text-gray-800 dark:text-gray-200">
<b><%= PlausibleWeb.StatsView.large_number_format(Map.get(@visitors, invitation.site.domain, 0)) %></b> visitor<%= if Map.get(@visitors, invitation.site.domain, 0) != 1 do %>s<% end %> in last 24h
</span>
</span>
</div>
</li>
</div>
<% end %>
<%= for site <- @sites do %>
<div class="relative group">
<%= link(to: "/" <> URI.encode_www_form(site.domain)) do %>
@ -30,9 +78,10 @@
</div>
</li>
<% end %>
<%= link(to: "/" <> URI.encode_www_form(site.domain) <> "/settings", class: "absolute top-0 right-0 p-4 mt-1") do %>
<svg class="w-5 h-5 text-gray-600 dark:text-gray-400 opacity-100 md:opacity-0 group-hover:opacity-100 transition hover:text-gray-900 dark:hover:text-gray-100" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z" clip-rule="evenodd"></path></svg>
<%= if List.first(site.memberships).role != :viewer do %>
<%= link(to: "/" <> URI.encode_www_form(site.domain) <> "/settings", class: "absolute top-0 right-0 p-4 mt-1") do %>
<svg class="w-5 h-5 text-gray-600 dark:text-gray-400 opacity-100 md:opacity-0 group-hover:opacity-100 transition hover:text-gray-900 dark:hover:text-gray-100" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z" clip-rule="evenodd"></path></svg>
<% end %>
<% end %>
</div>
<% end %>
@ -58,4 +107,74 @@
<% end %>
<% end %>
<%= if Enum.any?(@invitations) do %>
<div x-cloak x-show="invitationOpen" class="fixed z-10 inset-0 overflow-y-auto" aria-labelledby="modal-title" role="dialog" aria-modal="true">
<div class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
<div
x-show="invitationOpen"
x-transition:enter="transition ease-out duration-300"
x-transition:enter-start="opacity-0"
x-transition:enter-end="opacity-100"
x-transition:leave="transition ease-in duration-200"
x-transition:leave-start="opacity-100"
x-transition:leave-end="opacity-0"
class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
aria-hidden="true"
@click="invitationOpen = false"
></div>
<!-- This element is to trick the browser into centering the modal contents. -->
<span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">&#8203;</span>
<div
x-show="invitationOpen"
x-transition:enter="transition ease-out duration-300"
x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
x-transition:leave="transition ease-in duration-200"
x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
>
<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
<div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">
<button @click="invitationOpen = false" class="bg-white rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
<span class="sr-only">Close</span>
<!-- Heroicon name: outline/x -->
<svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
</svg>
</button>
</div>
<div class="sm:flex sm:items-start">
<div class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-green-100 sm:mx-0 sm:h-10 sm:w-10">
<svg class="w-6 h-6 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"></path></svg>
</div>
<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
<h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">
Invitation for <span x-text="selectedInvitation && selectedInvitation.site.domain"></span>
</h3>
<div class="mt-2">
<p class="text-sm text-gray-500">
You've been invited to the <span x-text="selectedInvitation && selectedInvitation.site.domain"></span> analytics dashboard as <b class="capitalize" x-text="selectedInvitation && selectedInvitation.role">Admin</b>.
</p>
<p x-show="selectedInvitation && selectedInvitation.role === 'owner'" class="mt-2 text-sm text-gray-500">
If you accept the ownership transfer, you will be responsible for billing.
</p>
</div>
</div>
</div>
</div>
<div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
<button class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-indigo-600 text-base font-medium text-white hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-700 sm:ml-3 sm:w-auto sm:text-sm" data-method="post" data-csrf="<%= Plug.CSRFProtection.get_csrf_token() %>" x-bind:data-to="selectedInvitation && ('/sites/invitations/' + selectedInvitation.invitation_id + '/accept')">
Accept &amp; Continue
</button>
<button type="button" class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm" data-method="post" data-csrf="<%= Plug.CSRFProtection.get_csrf_token() %>" x-bind:data-to="selectedInvitation && ('/sites/invitations/' + selectedInvitation.invitation_id + '/reject')">
Reject
</button>
</div>
</div>
</div>
</div>
<% end %>
</div>

@ -0,0 +1,63 @@
<%= form_for @conn, Routes.membership_path(@conn, :invite_member, @site.domain), [class: "max-w-lg w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %>
<h2 class="text-xl font-black dark:text-gray-100">Invite member to <%= @site.domain %></h2>
<p class="mt-4 max-w-2xl text-sm text-gray-500">
Enter the email address and role of the person you want to invite. We will contact them over email to offer them access to
<%= @site.domain %> analytics.
</p>
<p class="mt-4 max-w-2xl text-sm text-gray-500">
The invitation will expire in 48 hours
</p>
<%= if @conn.assigns[:error] do %>
<div class="text-red-500 text-xs italic mt-4"><%= @conn.assigns[:error] %></div>
<% end %>
<div class="my-6">
<%= label f, :email, "Email address", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<div class="mt-1 relative rounded-md shadow-sm">
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
<svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path d="M2.003 5.884L10 9.882l7.997-3.998A2 2 0 0016 4H4a2 2 0 00-1.997 1.884z" /><path d="M18 8.118l-8 4-8-4V14a2 2 0 002 2h12a2 2 0 002-2V8.118z" /></svg>
</div>
<%= email_input(f, :email, class: "focus:ring-indigo-500 focus:border-indigo-500 block w-full rounded-md pl-10 sm:text-sm border-gray-300", placeholder: "john.doe@example.com", required: "true") %>
</div>
<%= error_tag f, :email %>
</div>
<fieldset x-data="{selectedOption: null}">
<%= label f, :role, class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<div class="mt-1 bg-white rounded-md -space-y-px">
<label class="border-gray-200 rounded-tl-md rounded-tr-md relative border p-4 flex cursor-pointer" :class="{'bg-indigo-50 border-indigo-200 z-10': selectedOption === 'admin', 'border-gray-200': selectedOption !== 'admin'}">
<%= radio_button(f, :role, "admin", class: "h-4 w-4 mt-0.5 cursor-pointer text-indigo-600 border-gray-300 focus:ring-indigo-500", "x-model": "selectedOption", required: "true") %>
<div class="ml-3 flex flex-col">
<span class="text-gray-900 block text-sm font-medium" :class="{'text-indigo-900': selectedOption === 'admin', 'text-gray-900': selectedOption !== 'admin'}">
Admin
</span>
<span class="text-gray-500 block text-sm" :class="{'text-indigo-700': selectedOption === 'admin', 'text-gray-500': selectedOption !== 'admin'}">
Can view stats, change site settings and invite other members
</span>
</div>
</label>
<label class="border-gray-200 relative border p-4 flex cursor-pointer" :class="{'bg-indigo-50 border-indigo-200 z-10': selectedOption === 'viewer', 'border-gray-200': selectedOption !== 'viewer'}">
<%= radio_button(f, :role, "viewer", class: "h-4 w-4 mt-0.5 cursor-pointer text-indigo-600 border-gray-300 focus:ring-indigo-500", "x-model": "selectedOption", required: "true") %>
<div class="ml-3 flex flex-col">
<span class="text-gray-900 block text-sm font-medium" :class="{'text-indigo-900': selectedOption === 'viewer', 'text-gray-900': selectedOption !== 'viewer'}">
Viewer
</span>
<span class="text-gray-500 block text-sm" :class="{'text-indigo-700': selectedOption === 'viewer', 'text-gray-500': selectedOption !== 'viewer'}">
Can view stats but cannot access settings or invite members
</span>
</div>
</label>
</div>
</fieldset>
<div class="mt-6">
<%= submit(class: "button w-full") do %>
<svg class="w-5 h-5 mr-1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M8 9a3 3 0 100-6 3 3 0 000 6zM8 11a6 6 0 016 6H2a6 6 0 016-6zM16 7a1 1 0 10-2 0v1h-1a1 1 0 100 2h1v1a1 1 0 102 0v-1h1a1 1 0 100-2h-1V7z"></path></svg>
<span>Invite</span>
<% end %>
</div>
<% end %>

@ -0,0 +1,30 @@
<%= form_for @conn, Routes.membership_path(@conn, :transfer_ownership, @site.domain), [class: "max-w-lg w-full mx-auto bg-white dark:bg-gray-800 shadow-md rounded px-8 pt-6 pb-8 mb-4 mt-8"], fn f -> %>
<h2 class="text-xl font-black dark:text-gray-100">Transfer ownership of <%= @site.domain %></h2>
<p class="mt-4 max-w-2xl text-sm text-gray-500">
Enter the email address of the new owner. We will contact them over email to offer them the ownership of <%= @site.domain %>.
</p>
<p class="mt-4 max-w-2xl text-sm text-gray-500">
If they accept the transfer request, the new owner will be responsible for billing. Your access will be downgraded to <b>admin</b> and
any other member roles will stay the same. If they don't respond in 48 hours, the request will expire automatically.
</p>
<%= if @conn.assigns[:error] do %>
<div class="text-red-500 text-xs italic mt-4"><%= @conn.assigns[:error] %></div>
<% end %>
<div class="my-6">
<%= label f, :email, "Email address", class: "block text-sm font-medium text-gray-700 dark:text-gray-300" %>
<div class="mt-1 relative rounded-md shadow-sm">
<div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
<svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path d="M2.003 5.884L10 9.882l7.997-3.998A2 2 0 0016 4H4a2 2 0 00-1.997 1.884z" /><path d="M18 8.118l-8 4-8-4V14a2 2 0 002 2h12a2 2 0 002-2V8.118z" /></svg>
</div>
<%= email_input(f, :email, class: "focus:ring-indigo-500 focus:border-indigo-500 block w-full rounded-md pl-10 sm:text-sm border-gray-300", placeholder: "john.doe@example.com", required: "true") %>
</div>
<%= error_tag f, :email %>
</div>
<div class="mt-6">
<%= submit("Request transfer", class: "button w-full") %>
</div>
<% end %>

@ -4,14 +4,13 @@
<header class="relative">
<h2 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100">General information</h2>
<p class="mt-1 text-sm leading-5 text-gray-500 dark:text-gray-200">Update your reporting timezone.</p>
<%= link(to: "https://docs.plausible.io/general/", target: "_blank") do %>
<%= link(to: "https://plausible.io/docs/general/", target: "_blank") do %>
<svg class="w-6 h-6 absolute top-0 right-0 text-gray-400" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"></path></svg>
<% end %>
</header>
<div class="grid grid-cols-4 gap-6">
<div class="col-span-4 sm:col-span-2"> <%= label f, :domain, class: "block text-sm font-medium leading-5 text-gray-700 dark:text-gray-300" %>
<%= text_input f, :domain, class: "dark:bg-gray-900 mt-1 block w-full shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:max-w-xs sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-100", disabled: "disabled" %>
<div class="col-span-4 sm:col-span-2"> <%= label f, :domain, class: "block text-sm font-medium leading-5 text-gray-700 dark:text-gray-300" %> <%= text_input f, :domain, class: "dark:bg-gray-900 mt-1 block w-full shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:max-w-xs sm:text-sm border-gray-300 dark:border-gray-500 rounded-md dark:text-gray-100", disabled: "disabled" %>
</div>
<div class="col-span-4 sm:col-span-2">
@ -33,7 +32,7 @@
<h2 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100">Javascript snippet</h2>
<p class="mt-1 text-sm leading-5 text-gray-500 dark:text-gray-200">Include this snippet in the <code>&lt;head&gt;</code> of your website.</p>
<%= link(to: "https://docs.plausible.io/plausible-script", target: "_blank") do %>
<%= link(to: "https://plausible.io/docs/plausible-script", target: "_blank") do %>
<svg class="w-6 h-6 absolute top-0 right-0 text-gray-400" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"></path></svg>
<% end %>
</header>

@ -0,0 +1,149 @@
<div class="shadow bg-white dark:bg-gray-800 sm:rounded-md py-6 px-4 sm:p-6">
<header class="relative">
<h2 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100">People</h2>
<p class="mt-1 text-sm leading-5 text-gray-500 dark:text-gray-200">Invite your friend or coworkers</p>
<%= link(to: "https://plausible.io/docs/users-roles", target: "_blank") do %>
<svg class="w-6 h-6 absolute top-0 right-0 text-gray-400" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd"></path></svg>
<% end %>
</header>
<div class="flow-root mt-6">
<ul class="-my-5 divide-y divide-gray-200 dark:divide-gray-50">
<%= for membership <- @site.memberships do %>
<li class="py-4">
<div class="flex items-center space-x-4">
<div class="flex-shrink-0">
<%= gravatar(membership.user.email, class: "h-8 w-8 rounded-full") %>
</div>
<div class="flex-1 min-w-0">
<p class="text-sm font-medium text-gray-900 dark:text-gray-50 truncate">
<%= membership.user.name %>
</p>
<p class="text-sm text-gray-500 truncate">
<%= membership.user.email %>
</p>
</div>
<div x-data="{open: false}" @click.away="open = false" x-cloak class="relative">
<button @click="open = !open" class="inline-flex items-center shadow-sm px-2.5 py-0.5 border border-gray-300 text-sm leading-5 font-medium rounded-full text-gray-700 bg-white hover:bg-gray-50">
<%= membership.role |> Atom.to_string() |> String.capitalize() %>
<svg class="w-4 h-4 pt-px ml-1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
</button>
<ul
x-show="open"
x-transition:leave="transition ease-in duration-100"
x-transition:leave-start="opacity-100"
x-transition:leave-end="opacity-0"
class="origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg overflow-hidden bg-white divide-y divide-gray-200 ring-1 ring-black ring-opacity-5 focus:outline-none" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-0"
>
<%= if membership.role == :owner do %>
<li class="p-4 text-sm cursor-default group flex justify-between" role="option">
<div>
<p class="text-base font-medium text-gray-900">Owner</p>
<p class="mt-1 text-sm text-gray-500">Site owner cannot be assigned to any other role</p>
</div>
<span class="text-indigo-500">
<svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
</svg>
</span>
</li>
<%= if @conn.assigns[:current_user_role] == :owner do %>
<li class="select-none hover:bg-gray-100 text-red-600" role="option">
<%= link("Transfer ownership →", to: Routes.membership_path(@conn, :transfer_ownership_form, @site.domain), class: "inline-block w-full p-4 text-sm text-red-600 font-medium") %>
</li>
<% end %>
<% else %>
<%= link(to: Routes.membership_path(@conn, :update_role, @site.domain, membership.id, "admin"), method: :put, class: "p-4 flex justify-between text-sm group hover:bg-indigo-500") do %>
<div>
<p class="text-base font-medium text-gray-900 group-hover:text-white">Admin</p>
<p class="mt-1 text-sm text-gray-500 group-hover:text-gray-100">View stats and edit site settings</p>
</div>
<%= if membership.role == :admin do %>
<span class="text-indigo-500 group-hover:text-white">
<svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
</svg>
</span>
<% end %>
<% end %>
<%= link(to: Routes.membership_path(@conn, :update_role, @site.domain, membership.id, "viewer"), method: :put, class: "p-4 flex justify-between text-sm group hover:bg-indigo-500") do %>
<div>
<p class="text-base font-medium text-gray-900 group-hover:text-white">Viewer</p>
<p class="mt-1 text-sm text-gray-500 group-hover:text-white">View stats only</p>
</div>
<%= if membership.role == :viewer do %>
<span class="text-indigo-500 group-hover:text-white">
<svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
</svg>
</span>
<% end %>
<% end %>
<%= link(to: Routes.membership_path(@conn, :remove_member, @site.domain, membership.id), method: :delete, class: "p-4 flex hover:bg-gray-100 text-red-600") do %>
<p class="text-sm text-red-600 font-medium">Remove member</p>
<% end %>
<% end %>
</ul>
</div>
</div>
</li>
<% end %>
</ul>
<%= if Enum.count(@site.invitations) > 0 do %>
<header class="mt-12">
<h2 class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100">Pending invitations</h2>
</header>
<div class="flex flex-col mt-4">
<div class="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
<div class="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
<div class="shadow overflow-hidden border-b border-gray-200 sm:rounded-lg">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
Email
</th>
<th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
Role
</th>
<th scope="col" class="relative px-6 py-3">
<span class="sr-only">Edit</span>
</th>
</tr>
</thead>
<tbody>
<%= for invitation <- @site.invitations do %>
<tr class="odd:bg-white even:bg-gray-50">
<td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-900">
<%= invitation.email %>
</td>
<td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
<%= invitation.role |> Atom.to_string |> String.capitalize %>
</td>
<td class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
<%= link("Remove", to: "/sites/invitations/#{invitation.invitation_id}", method: :delete, class: "text-red-600 hover:text-red-900") %>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
</div>
</div>
<% end %>
</div>
<div class="mt-8">
<%= link(to: Routes.membership_path(@conn, :invite_member_form, @site.domain), class: "button") do %>
<svg class="w-5 h-5 mr-1" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M8 9a3 3 0 100-6 3 3 0 000 6zM8 11a6 6 0 016 6H2a6 6 0 016-6zM16 7a1 1 0 10-2 0v1h-1a1 1 0 100 2h1v1a1 1 0 102 0v-1h1a1 1 0 100-2h-1V7z"></path></svg>
Invite
<% end %>
</div>
</div>

@ -0,0 +1,32 @@
<div class="w-full max-w-lg mx-auto mt-8">
<div class="bg-white shadow sm:rounded-lg">
<div class="px-4 py-5 sm:px-8 sm:py-6">
<div class="mx-auto flex items-center justify-center rounded-full bg-green-100 h-12 w-12">
<svg class="w-6 h-6 text-green-600" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clip-rule="evenodd"></path></svg>
</div>
<h3 class="mt-6 text-center text-2xl leading-6 font-medium text-gray-900">
Site locked
</h3>
<%= if @conn.assigns[:current_user_role] == :owner do %>
<div class="mt-3 text-gray-500 text-center">
<p>
This site is locked because you don't have an active subscription. We are still counting stats in the background but your access to the dashboard is restricted. Subscribe with the link below to access your stats again.
</p>
</div>
<div class="mt-6 w-full text-center">
<%= link("Manage my subscription", to: "/settings", class: "inline-flex items-center px-4 py-2 border border-transparent shadow-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:text-sm") %>
</div>
<% else %>
<div class="mt-3 text-gray-500 text-center">
<p>
This site is currently locked and cannot be accessed. You can check back later or contact the site owner to unlock it.
</p>
</div>
<div class="mt-6 w-full text-center">
<%= link("Back to my sites", to: "/sites", class: "inline-flex items-center px-4 py-2 border border-transparent shadow-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:text-sm") %>
</div>
<% end %>
</div>
</div>
</div>

@ -5,7 +5,7 @@
</div>
<% end %>
<div class="pt-6"></div>
<div id="stats-react-container" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= !!@conn.assigns[:current_user] %>" data-inserted-at="<%= @site.inserted_at %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>"></div>
<div id="stats-react-container" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= !!@conn.assigns[:current_user] %>" data-inserted-at="<%= @site.inserted_at %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>"></div>
<div id="modal_root"></div>
<%= if !@conn.assigns[:current_user] && @conn.assigns[:demo] do %>
<div class="bg-gray-50 dark:bg-gray-850">

@ -20,8 +20,11 @@
<div class="my-44">
<div class="block pulsating-circle"></div>
<p class="text-gray-600 dark:text-gray-400 text-xs absolute left-0 bottom-0 mb-6 w-full text-center leading-normal">
Need to see the snippet again? <%= link("Click here", to: "/#{URI.encode_www_form(@site.domain)}/snippet")%><br />
Not working? Contact <a href="mailto:support@plausible.io" class="text-indigo-500 underline">support@plausible.io</a> to get set up
Need to see the snippet again? <%= link("Click here", to: "/#{URI.encode_www_form(@site.domain)}/snippet", class: "text-indigo-600 text-underline")%><br />
Not working? <%= link("Troubleshoot the integration", to: "https://plausible.io/docs/troubleshoot-integration#keep-seeing-a-blinking-green-dot", class: "text-indigo-600 text-underline") %> with our guide
<%= if !Application.get_env(:plausible, :is_selfhost) do %>
first<br /> Still not working? <%= link("Contact us", to: "https://plausible.io/contact", class: "text-indigo-600 text-underline" ) %> and we will help you with your setup
<% end %>
</p>
</div>
</div>

@ -21,19 +21,24 @@ defmodule PlausibleWeb.LayoutView do
end
end
def settings_tabs() do
def settings_tabs(conn) do
[
[key: "General", value: "general"],
[key: "People", value: "people"],
[key: "Visibility", value: "visibility"],
[key: "Goals", value: "goals"],
[key: "Search Console", value: "search-console"],
[key: "Email reports", value: "email-reports"],
if !is_selfhost() do
if !is_selfhost() && conn.assigns[:site].custom_domain do
[key: "Custom domain", value: "custom-domain"]
else
nil
end,
[key: "Danger zone", value: "danger-zone"]
if conn.assigns[:current_user_role] == :owner do
[key: "Danger zone", value: "danger-zone"]
else
nil
end
]
end
@ -47,9 +52,6 @@ defmodule PlausibleWeb.LayoutView do
days when days == 0 ->
"Trial ends today"
days when days < 0 ->
"Trial over, upgrade now"
end
end

@ -0,0 +1,3 @@
defmodule PlausibleWeb.Site.MembershipView do
use PlausibleWeb, :view
end

@ -26,6 +26,18 @@ defmodule PlausibleWeb.SiteView do
Plausible.Sites.shared_link_url(site, link)
end
def gravatar(email, opts) do
hash =
email
|> String.trim()
|> String.downcase()
|> :erlang.md5()
|> Base.encode16(case: :lower)
img = "https://www.gravatar.com/avatar/#{hash}?s=150&d=identicon"
img_tag(img, opts)
end
def snippet(site) do
tracker =
if site.custom_domain do
@ -38,4 +50,12 @@ defmodule PlausibleWeb.SiteView do
<script defer data-domain="#{site.domain}" src="#{tracker}"></script>
"""
end
def with_indefinite_article(word) do
if String.starts_with?(word, ["a", "e", "i", "o", "u"]) do
"an " <> word
else
"a " <> word
end
end
end

@ -0,0 +1,14 @@
defmodule Plausible.Workers.CleanInvitations do
use Plausible.Repo
use Oban.Worker, queue: :clean_invitations
@impl Oban.Worker
def perform(_job) do
Repo.delete_all(
from i in Plausible.Auth.Invitation,
where: i.inserted_at < fragment("now() - INTERVAL '48 hours'")
)
:ok
end
end

@ -0,0 +1,16 @@
defmodule Plausible.Workers.LockSites do
use Plausible.Repo
use Oban.Worker, queue: :lock_sites
@impl Oban.Worker
def perform(_job) do
subscription_q = from(s in Plausible.Billing.Subscription, order_by: [desc: s.inserted_at])
users = Repo.all(from u in Plausible.Auth.User, preload: [subscription: ^subscription_q])
for user <- users do
Plausible.Billing.SiteLocker.check_sites_for(user)
end
:ok
end
end

@ -34,6 +34,7 @@ defmodule Plausible.Workers.ScheduleEmailReports do
fragment("(? -> 'site_id')::int", job.args) == s.id and
job.state not in ["completed", "discarded"],
where: is_nil(job),
where: not s.locked,
preload: [weekly_report: wr]
)
@ -73,6 +74,7 @@ defmodule Plausible.Workers.ScheduleEmailReports do
fragment("(? -> 'site_id')::int", job.args) == s.id and
job.state not in ["completed", "discarded"],
where: is_nil(job),
where: not s.locked,
preload: [monthly_report: mr]
)

@ -19,7 +19,7 @@ defmodule Plausible.Workers.SendCheckStatsEmails do
for user <- Repo.all(q) do
enabled_report = Enum.any?(user.sites, fn site -> site.weekly_report end)
if Plausible.Auth.user_completed_setup?(user) && !enabled_report do
if Plausible.Auth.has_active_sites?(user) && !enabled_report do
send_check_stats_email(user)
end
end

@ -60,7 +60,7 @@ defmodule Plausible.Workers.SendEmailReport do
referrers = Stats.top_sources(site, query, 5, 1, [])
pages = Stats.top_pages(site, query, 5, 1, [])
user = Plausible.Auth.find_user_by(email: email)
login_link = user && Plausible.Sites.is_owner?(user.id, site)
login_link = user && Plausible.Sites.is_member?(user.id, site)
template =
PlausibleWeb.Email.weekly_report(email, site,

@ -38,12 +38,13 @@ defmodule Plausible.Workers.SendSiteSetupEmails do
left_join: se in "setup_help_emails",
on: se.site_id == s.id,
where: is_nil(se.id),
where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"),
preload: :members
where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval")
)
for site <- Repo.all(q) do
owner = List.first(site.members)
owner =
Plausible.Sites.owner_for(site)
|> Repo.preload(:subscription)
setup_completed = Stats.has_pageviews?(site)
hours_passed = Timex.diff(Timex.now(), site.inserted_at, :hours)
@ -60,12 +61,13 @@ defmodule Plausible.Workers.SendSiteSetupEmails do
left_join: se in "setup_success_emails",
on: se.site_id == s.id,
where: is_nil(se.id),
where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"),
preload: :members
where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval")
)
for site <- Repo.all(q) do
owner = List.first(site.members)
owner =
Plausible.Sites.owner_for(site)
|> Repo.preload(:subscription)
if Stats.has_pageviews?(site) do
send_setup_success_email(owner, site)

@ -21,22 +21,22 @@ defmodule Plausible.Workers.SendTrialNotifications do
for user <- users do
case Timex.diff(user.trial_expiry_date, Timex.today(), :days) do
7 ->
if Plausible.Auth.user_completed_setup?(user) do
if Plausible.Auth.has_active_sites?(user, [:owner]) do
send_one_week_reminder(user)
end
1 ->
if Plausible.Auth.user_completed_setup?(user) do
if Plausible.Auth.has_active_sites?(user, [:owner]) do
send_tomorrow_reminder(user)
end
0 ->
if Plausible.Auth.user_completed_setup?(user) do
if Plausible.Auth.has_active_sites?(user, [:owner]) do
send_today_reminder(user)
end
-1 ->
if Plausible.Auth.user_completed_setup?(user) do
if Plausible.Auth.has_active_sites?(user, [:owner]) do
send_over_reminder(user)
end

@ -12,7 +12,10 @@ defmodule Plausible.Workers.SpikeNotifier do
from sn in SpikeNotification,
where: is_nil(sn.last_sent),
or_where: sn.last_sent < fragment("now() - INTERVAL ?", @at_most_every),
preload: :site
join: s in Plausible.Site,
on: sn.site_id == s.id,
where: not s.locked,
preload: [site: s]
)
for notification <- notifications do

@ -0,0 +1,13 @@
defmodule Plausible.Repo.Migrations.AddRoleToSiteMemberships do
use Ecto.Migration
def change do
create_query = "CREATE TYPE site_membership_role AS ENUM ('owner', 'admin', 'viewer')"
drop_query = "DROP TYPE site_membership_role"
execute(create_query, drop_query)
alter table(:site_memberships) do
add :role, :site_membership_role, null: false, default: "owner"
end
end
end

@ -0,0 +1,18 @@
defmodule Plausible.Repo.Migrations.AddInvitations do
use Ecto.Migration
def change do
create table(:invitations) do
add :email, :string, null: false
add :site_id, references(:sites), null: false
add :inviter_id, references(:users), null: false
add :role, :site_membership_role, null: false
add :invitation_id, :string
timestamps()
end
create unique_index(:invitations, [:site_id, :email])
create unique_index(:invitations, :invitation_id)
end
end

@ -0,0 +1,9 @@
defmodule Plausible.Repo.Migrations.AddLockedToSites do
use Ecto.Migration
def change do
alter table(:sites) do
add :locked, :boolean, null: false, default: false
end
end
end

@ -0,0 +1 @@
!function(){"use strict";var e,t,i,n,r=window.location,o=window.document,l=o.getElementById("plausible"),s=l.getAttribute("data-api")||(e=l.src.split("/"),t=e[0],i=e[2],t+"//"+i+"/api/event"),w=window.localStorage.plausible_ignore,d=l&&l.getAttribute("data-exclude").split(",");function p(e){console.warn("Ignoring Event: "+e)}function a(e,t){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(r.hostname)||"file:"===r.protocol)return p("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==w)return p("localStorage flag");if(d)for(var i=0;i<d.length;i++)if("pageview"==e&&r.pathname.match(new RegExp("^"+d[i].trim().replace(/\*\*/g,".*").replace(/([^\.])\*/g,"$1[^\\s/]*")+"/?$")))return p("exclusion rule");var n={};n.n=e,n.u=r.href,n.d=l.getAttribute("data-domain"),n.r=o.referrer||null,n.w=window.innerWidth,t&&t.meta&&(n.m=JSON.stringify(t.meta)),t&&t.props&&(n.p=JSON.stringify(t.props)),n.h=1;var a=new XMLHttpRequest;a.open("POST",s,!0),a.setRequestHeader("Content-Type","text/plain"),a.send(JSON.stringify(n)),a.onreadystatechange=function(){4==a.readyState&&t&&t.callback&&t.callback()}}}function c(){n=r.pathname,a("pageview")}window.addEventListener("hashchange",c);var u=window.plausible&&window.plausible.q||[];window.plausible=a;for(var g=0;g<u.length;g++)a.apply(this,u[g]);"prerender"===o.visibilityState?o.addEventListener("visibilitychange",function(){n||"visible"!==o.visibilityState||c()}):c()}();

@ -0,0 +1 @@
!function(){"use strict";var e,t,i,a,r=window.location,o=window.document,l=o.getElementById("plausible"),s=l.getAttribute("data-api")||(e=l.src.split("/"),t=e[0],i=e[2],t+"//"+i+"/api/event"),c=window.localStorage.plausible_ignore,p=l&&l.getAttribute("data-exclude").split(",");function d(e){console.warn("Ignoring Event: "+e)}function n(e,t){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(r.hostname)||"file:"===r.protocol)return d("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==c)return d("localStorage flag");if(p)for(var i=0;i<p.length;i++)if("pageview"==e&&r.pathname.match(new RegExp("^"+p[i].trim().replace(/\*\*/g,".*").replace(/([^\.])\*/g,"$1[^\\s/]*")+"/?$")))return d("exclusion rule");var a={};a.n=e,a.u=r.href,a.d=l.getAttribute("data-domain"),a.r=o.referrer||null,a.w=window.innerWidth,t&&t.meta&&(a.m=JSON.stringify(t.meta)),t&&t.props&&(a.p=JSON.stringify(t.props)),a.h=1;var n=new XMLHttpRequest;n.open("POST",s,!0),n.setRequestHeader("Content-Type","text/plain"),n.send(JSON.stringify(a)),n.onreadystatechange=function(){4==n.readyState&&t&&t.callback&&t.callback()}}}function u(){a=r.pathname,n("pageview")}function w(e){for(var t=e.target,i="auxclick"==e.type&&2==e.which,a="click"==e.type;t&&(void 0===t.tagName||"a"!=t.tagName.toLowerCase()||!t.href);)t=t.parentNode;t&&t.href&&t.host&&t.host!==r.host&&((i||a)&&plausible("Outbound Link: Click",{props:{url:t.href}}),t.target&&!t.target.match(/^_(self|parent|top)$/i)||e.ctrlKey||e.metaKey||e.shiftKey||!a||(setTimeout(function(){r.href=t.href},150),e.preventDefault()))}window.addEventListener("hashchange",u),o.addEventListener("click",w),o.addEventListener("auxclick",w);var h=window.plausible&&window.plausible.q||[];window.plausible=n;for(var f=0;f<h.length;f++)n.apply(this,h[f]);"prerender"===o.visibilityState?o.addEventListener("visibilitychange",function(){a||"visible"!==o.visibilityState||u()}):u()}();

@ -0,0 +1 @@
!function(){"use strict";var t,e,i,n,r=window.location,o=window.document,l=o.getElementById("plausible"),s=l.getAttribute("data-api")||(t=l.src.split("/"),e=t[0],i=t[2],e+"//"+i+"/api/event"),p=window.localStorage.plausible_ignore,w=l&&l.getAttribute("data-exclude").split(",");function d(t){console.warn("Ignoring Event: "+t)}function a(t,e){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(r.hostname)||"file:"===r.protocol)return d("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==p)return d("localStorage flag");if(w)for(var i=0;i<w.length;i++)if("pageview"==t&&r.pathname.match(new RegExp("^"+w[i].trim().replace(/\*\*/g,".*").replace(/([^\.])\*/g,"$1[^\\s/]*")+"/?$")))return d("exclusion rule");var n={};n.n=t,n.u=r.href,n.d=l.getAttribute("data-domain"),n.r=o.referrer||null,n.w=window.innerWidth,e&&e.meta&&(n.m=JSON.stringify(e.meta)),e&&e.props&&(n.p=JSON.stringify(e.props));var a=new XMLHttpRequest;a.open("POST",s,!0),a.setRequestHeader("Content-Type","text/plain"),a.send(JSON.stringify(n)),a.onreadystatechange=function(){4==a.readyState&&e&&e.callback&&e.callback()}}}function u(){n!==r.pathname&&(n=r.pathname,a("pageview"))}var c,g=window.history;g.pushState&&(c=g.pushState,g.pushState=function(){c.apply(this,arguments),u()},window.addEventListener("popstate",u));var h=window.plausible&&window.plausible.q||[];window.plausible=a;for(var f=0;f<h.length;f++)a.apply(this,h[f]);"prerender"===o.visibilityState?o.addEventListener("visibilitychange",function(){n||"visible"!==o.visibilityState||u()}):u()}();

@ -0,0 +1 @@
!function(){"use strict";var e,t,i,a,r=window.location,o=window.document,l=o.getElementById("plausible"),s=l.getAttribute("data-api")||(e=l.src.split("/"),t=e[0],i=e[2],t+"//"+i+"/api/event"),p=window.localStorage.plausible_ignore,c=l&&l.getAttribute("data-exclude").split(",");function u(e){console.warn("Ignoring Event: "+e)}function n(e,t){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(r.hostname)||"file:"===r.protocol)return u("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==p)return u("localStorage flag");if(c)for(var i=0;i<c.length;i++)if("pageview"==e&&r.pathname.match(new RegExp("^"+c[i].trim().replace(/\*\*/g,".*").replace(/([^\.])\*/g,"$1[^\\s/]*")+"/?$")))return u("exclusion rule");var a={};a.n=e,a.u=r.href,a.d=l.getAttribute("data-domain"),a.r=o.referrer||null,a.w=window.innerWidth,t&&t.meta&&(a.m=JSON.stringify(t.meta)),t&&t.props&&(a.p=JSON.stringify(t.props));var n=new XMLHttpRequest;n.open("POST",s,!0),n.setRequestHeader("Content-Type","text/plain"),n.send(JSON.stringify(a)),n.onreadystatechange=function(){4==n.readyState&&t&&t.callback&&t.callback()}}}function d(){a!==r.pathname&&(a=r.pathname,n("pageview"))}function w(e){for(var t=e.target,i="auxclick"==e.type&&2==e.which,a="click"==e.type;t&&(void 0===t.tagName||"a"!=t.tagName.toLowerCase()||!t.href);)t=t.parentNode;t&&t.href&&t.host&&t.host!==r.host&&((i||a)&&plausible("Outbound Link: Click",{props:{url:t.href}}),t.target&&!t.target.match(/^_(self|parent|top)$/i)||e.ctrlKey||e.metaKey||e.shiftKey||!a||(setTimeout(function(){r.href=t.href},150),e.preventDefault()))}var h,f=window.history;f.pushState&&(h=f.pushState,f.pushState=function(){h.apply(this,arguments),d()},window.addEventListener("popstate",d)),o.addEventListener("click",w),o.addEventListener("auxclick",w);var g=window.plausible&&window.plausible.q||[];window.plausible=n;for(var v=0;v<g.length;v++)n.apply(this,g[v]);"prerender"===o.visibilityState?o.addEventListener("visibilitychange",function(){a||"visible"!==o.visibilityState||d()}):d()}();

@ -0,0 +1 @@
!function(){"use strict";var e,t,i,n,a=window.location,o=window.document,r=o.getElementById("plausible"),l=r.getAttribute("data-api")||(e=r.src.split("/"),t=e[0],i=e[2],t+"//"+i+"/api/event"),s=window.localStorage.plausible_ignore;function w(e){console.warn("Ignoring Event: "+e)}function d(e,t){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(a.hostname)||"file:"===a.protocol)return w("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==s)return w("localStorage flag");var i={};i.n=e,i.u=a.href,i.d=r.getAttribute("data-domain"),i.r=o.referrer||null,i.w=window.innerWidth,t&&t.meta&&(i.m=JSON.stringify(t.meta)),t&&t.props&&(i.p=JSON.stringify(t.props)),i.h=1;var n=new XMLHttpRequest;n.open("POST",l,!0),n.setRequestHeader("Content-Type","text/plain"),n.send(JSON.stringify(i)),n.onreadystatechange=function(){4==n.readyState&&t&&t.callback&&t.callback()}}}function p(){n=a.pathname,d("pageview")}window.addEventListener("hashchange",p);var c=window.plausible&&window.plausible.q||[];window.plausible=d;for(var u=0;u<c.length;u++)d.apply(this,c[u]);"prerender"===o.visibilityState?o.addEventListener("visibilitychange",function(){n||"visible"!==o.visibilityState||p()}):p()}();

@ -0,0 +1 @@
!function(){"use strict";var e,t,i,n,a=window.location,r=window.document,o=r.getElementById("plausible"),l=o.getAttribute("data-api")||(e=o.src.split("/"),t=e[0],i=e[2],t+"//"+i+"/api/event"),s=window.localStorage.plausible_ignore;function c(e){console.warn("Ignoring Event: "+e)}function d(e,t){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(a.hostname)||"file:"===a.protocol)return c("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==s)return c("localStorage flag");var i={};i.n=e,i.u=a.href,i.d=o.getAttribute("data-domain"),i.r=r.referrer||null,i.w=window.innerWidth,t&&t.meta&&(i.m=JSON.stringify(t.meta)),t&&t.props&&(i.p=JSON.stringify(t.props)),i.h=1;var n=new XMLHttpRequest;n.open("POST",l,!0),n.setRequestHeader("Content-Type","text/plain"),n.send(JSON.stringify(i)),n.onreadystatechange=function(){4==n.readyState&&t&&t.callback&&t.callback()}}}function p(){n=a.pathname,d("pageview")}function w(e){for(var t=e.target,i="auxclick"==e.type&&2==e.which,n="click"==e.type;t&&(void 0===t.tagName||"a"!=t.tagName.toLowerCase()||!t.href);)t=t.parentNode;t&&t.href&&t.host&&t.host!==a.host&&((i||n)&&plausible("Outbound Link: Click",{props:{url:t.href}}),t.target&&!t.target.match(/^_(self|parent|top)$/i)||e.ctrlKey||e.metaKey||e.shiftKey||!n||(setTimeout(function(){a.href=t.href},150),e.preventDefault()))}window.addEventListener("hashchange",p),r.addEventListener("click",w),r.addEventListener("auxclick",w);var u=window.plausible&&window.plausible.q||[];window.plausible=d;for(var h=0;h<u.length;h++)d.apply(this,u[h]);"prerender"===r.visibilityState?r.addEventListener("visibilitychange",function(){n||"visible"!==r.visibilityState||p()}):p()}();

@ -0,0 +1 @@
!function(){"use strict";var t,e,i,n,a=window.location,o=window.document,r=o.getElementById("plausible"),l=r.getAttribute("data-api")||(t=r.src.split("/"),e=t[0],i=t[2],e+"//"+i+"/api/event"),s=window.localStorage.plausible_ignore;function p(t){console.warn("Ignoring Event: "+t)}function w(t,e){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(a.hostname)||"file:"===a.protocol)return p("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==s)return p("localStorage flag");var i={};i.n=t,i.u=a.href,i.d=r.getAttribute("data-domain"),i.r=o.referrer||null,i.w=window.innerWidth,e&&e.meta&&(i.m=JSON.stringify(e.meta)),e&&e.props&&(i.p=JSON.stringify(e.props));var n=new XMLHttpRequest;n.open("POST",l,!0),n.setRequestHeader("Content-Type","text/plain"),n.send(JSON.stringify(i)),n.onreadystatechange=function(){4==n.readyState&&e&&e.callback&&e.callback()}}}function d(){n!==a.pathname&&(n=a.pathname,w("pageview"))}var u,c=window.history;c.pushState&&(u=c.pushState,c.pushState=function(){u.apply(this,arguments),d()},window.addEventListener("popstate",d));var h=window.plausible&&window.plausible.q||[];window.plausible=w;for(var f=0;f<h.length;f++)w.apply(this,h[f]);"prerender"===o.visibilityState?o.addEventListener("visibilitychange",function(){n||"visible"!==o.visibilityState||d()}):d()}();

@ -0,0 +1 @@
!function(){"use strict";var t,e,i,n,a=window.location,r=window.document,o=r.getElementById("plausible"),l=o.getAttribute("data-api")||(t=o.src.split("/"),e=t[0],i=t[2],e+"//"+i+"/api/event"),s=window.localStorage.plausible_ignore;function p(t){console.warn("Ignoring Event: "+t)}function d(t,e){if(/^localhost$|^127(?:\.[0-9]+){0,2}\.[0-9]+$|^(?:0*\:)*?:?0*1$/.test(a.hostname)||"file:"===a.protocol)return p("localhost");if(!(window.phantom||window._phantom||window.__nightmare||window.navigator.webdriver||window.Cypress)){if("true"==s)return p("localStorage flag");var i={};i.n=t,i.u=a.href,i.d=o.getAttribute("data-domain"),i.r=r.referrer||null,i.w=window.innerWidth,e&&e.meta&&(i.m=JSON.stringify(e.meta)),e&&e.props&&(i.p=JSON.stringify(e.props));var n=new XMLHttpRequest;n.open("POST",l,!0),n.setRequestHeader("Content-Type","text/plain"),n.send(JSON.stringify(i)),n.onreadystatechange=function(){4==n.readyState&&e&&e.callback&&e.callback()}}}function c(){n!==a.pathname&&(n=a.pathname,d("pageview"))}function u(t){for(var e=t.target,i="auxclick"==t.type&&2==t.which,n="click"==t.type;e&&(void 0===e.tagName||"a"!=e.tagName.toLowerCase()||!e.href);)e=e.parentNode;e&&e.href&&e.host&&e.host!==a.host&&((i||n)&&plausible("Outbound Link: Click",{props:{url:e.href}}),e.target&&!e.target.match(/^_(self|parent|top)$/i)||t.ctrlKey||t.metaKey||t.shiftKey||!n||(setTimeout(function(){a.href=e.href},150),t.preventDefault()))}var w,h=window.history;h.pushState&&(w=h.pushState,h.pushState=function(){w.apply(this,arguments),c()},window.addEventListener("popstate",c)),r.addEventListener("click",u),r.addEventListener("auxclick",u);var f=window.plausible&&window.plausible.q||[];window.plausible=d;for(var g=0;g<f.length;g++)d.apply(this,f[g]);"prerender"===r.visibilityState?r.addEventListener("visibilitychange",function(){n||"visible"!==r.visibilityState||c()}):c()}();

@ -6,21 +6,34 @@ defmodule Plausible.AuthTest do
test "is false if user does not have any sites" do
user = insert(:user)
refute Auth.user_completed_setup?(user)
refute Auth.has_active_sites?(user)
end
test "is false if user does not have any events" do
user = insert(:user)
insert(:site, members: [user])
refute Auth.user_completed_setup?(user)
refute Auth.has_active_sites?(user)
end
test "is true if user does have events" do
user = insert(:user)
insert(:site, members: [user], domain: "test-site.com")
assert Auth.user_completed_setup?(user)
assert Auth.has_active_sites?(user)
end
test "can specify which roles we're looking for" do
user = insert(:user)
insert(:site,
domain: "test-site.com",
memberships: [
build(:site_membership, user: user, role: :admin)
]
)
refute Auth.has_active_sites?(user, [:owner])
end
end
end

@ -17,6 +17,26 @@ defmodule Plausible.BillingTest do
assert Billing.usage(user) == 3
end
test "only counts usage from sites where the user is the owner" do
user = insert(:user)
insert(:site,
domain: "site-with-no-views.com",
memberships: [
build(:site_membership, user: user, role: :owner)
]
)
insert(:site,
domain: "test-site.com",
memberships: [
build(:site_membership, user: user, role: :admin)
]
)
assert Billing.usage(user) == 0
end
end
describe "last_two_billing_cycles" do
@ -66,6 +86,36 @@ defmodule Plausible.BillingTest do
assert Billing.last_two_billing_months_usage(user, today) == {1, 1}
end
test "only considers sites that the user owns" do
last_bill_date = ~D[2021-01-01]
today = ~D[2021-01-02]
user = insert(:user, subscription: build(:subscription, last_bill_date: last_bill_date))
owner_site =
insert(:site,
memberships: [
build(:site_membership, user: user, role: :owner)
]
)
admin_site =
insert(:site,
memberships: [
build(:site_membership, user: user, role: :admin)
]
)
create_pageviews([
%{domain: owner_site.domain, timestamp: ~N[2020-12-31 00:00:00]},
%{domain: admin_site.domain, timestamp: ~N[2020-12-31 00:00:00]},
%{domain: owner_site.domain, timestamp: ~N[2020-11-01 00:00:00]},
%{domain: admin_site.domain, timestamp: ~N[2020-11-01 00:00:00]}
])
assert Billing.last_two_billing_months_usage(user, today) == {1, 1}
end
test "gets event count from last month and this one" do
user =
insert(:user,
@ -93,13 +143,15 @@ defmodule Plausible.BillingTest do
describe "on_trial?" do
test "is true with >= 0 trial days left" do
user = insert(:user)
user = insert(:user) |> Repo.preload(:subscription)
assert Billing.on_trial?(user)
end
test "is false with < 0 trial days left" do
user = insert(:user, trial_expiry_date: Timex.shift(Timex.now(), days: -1))
user =
insert(:user, trial_expiry_date: Timex.shift(Timex.now(), days: -1))
|> Repo.preload(:subscription)
refute Billing.on_trial?(user)
end
@ -214,6 +266,26 @@ defmodule Plausible.BillingTest do
assert subscription.next_bill_date == ~D[2019-06-01]
assert subscription.next_bill_amount == "6.00"
end
test "unlocks sites if user has any locked sites" do
user = insert(:user)
site = insert(:site, locked: true, members: [user])
Billing.subscription_created(%{
"alert_name" => "subscription_created",
"subscription_id" => @subscription_id,
"subscription_plan_id" => @plan_id,
"update_url" => "update_url.com",
"cancel_url" => "cancel_url.com",
"passthrough" => user.id,
"status" => "active",
"next_bill_date" => "2019-06-01",
"unit_price" => "6.00",
"currency" => "EUR"
})
refute Repo.reload!(site).locked
end
end
describe "subscription_updated" do

@ -0,0 +1,110 @@
defmodule Plausible.Billing.SiteLockerTest do
use Plausible.DataCase
use Bamboo.Test, shared: true
alias Plausible.Billing.SiteLocker
describe "check_sites_for/1" do
test "does not lock sites if user is on trial" do
user =
insert(:user, trial_expiry_date: Timex.today())
|> Repo.preload(:subscription)
site = insert(:site, locked: true, members: [user])
SiteLocker.check_sites_for(user)
refute Repo.reload!(site).locked
end
test "does not lock if user has an active subscription" do
user = insert(:user)
insert(:subscription, status: "active", user: user)
user = Repo.preload(user, :subscription)
site = insert(:site, locked: true, members: [user])
SiteLocker.check_sites_for(user)
refute Repo.reload!(site).locked
end
test "does not lock user who is past due" do
user = insert(:user)
insert(:subscription, status: "past_due", user: user)
user = Repo.preload(user, :subscription)
site = insert(:site, members: [user])
SiteLocker.check_sites_for(user)
refute Repo.reload!(site).locked
end
test "does not lock user who cancelled subscription but it hasn't expired yet" do
user = insert(:user)
insert(:subscription, status: "deleted", user: user)
user = Repo.preload(user, :subscription)
site = insert(:site, members: [user])
SiteLocker.check_sites_for(user)
refute Repo.reload!(site).locked
end
test "locks user who cancelled subscription and the cancelled subscription has expired" do
user = insert(:user)
insert(:subscription,
status: "deleted",
next_bill_date: Timex.today() |> Timex.shift(days: -1),
user: user
)
site = insert(:site, members: [user])
user = Repo.preload(user, :subscription)
SiteLocker.check_sites_for(user)
refute Repo.reload!(site).locked
end
test "locks all sites if user has no trial or active subscription" do
user =
insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1))
|> Repo.preload(:subscription)
site = insert(:site, locked: true, members: [user])
SiteLocker.check_sites_for(user)
assert Repo.reload!(site).locked
end
test "only locks sites that the user owns" do
user =
insert(:user, trial_expiry_date: Timex.today() |> Timex.shift(days: -1))
|> Repo.preload(:subscription)
owner_site =
insert(:site,
memberships: [
build(:site_membership, user: user, role: :owner)
]
)
viewer_site =
insert(:site,
memberships: [
build(:site_membership, user: user, role: :viewer)
]
)
SiteLocker.check_sites_for(user)
owner_site = Repo.reload!(owner_site)
viewer_site = Repo.reload!(viewer_site)
assert owner_site.locked
refute viewer_site.locked
end
end
end

@ -2,19 +2,19 @@ defmodule Plausible.SitesTest do
use Plausible.DataCase
alias Plausible.Sites
describe "is_owner?" do
test "is true if user is the owner of the site" do
describe "is_member?" do
test "is true if user is a member of the site" do
user = insert(:user)
site = insert(:site, members: [user])
assert Sites.is_owner?(user.id, site)
assert Sites.is_member?(user.id, site)
end
test "is false if user is not the owner" do
test "is false if user is not a member" do
user = insert(:user)
site = insert(:site)
refute Sites.is_owner?(user.id, site)
refute Sites.is_member?(user.id, site)
end
end
end

@ -1,5 +1,6 @@
defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
use PlausibleWeb.ConnCase
use Plausible.Repo
import Plausible.TestUtils
setup %{conn: conn} do
@ -129,5 +130,27 @@ defmodule PlausibleWeb.Api.ExternalSitesControllerTest do
res = json_response(conn, 404)
assert res["error"] == "Site could not be found"
end
test "returns 404 when api key owner does not have permissions to create a shared link", %{
conn: conn,
site: site,
user: user
} do
Repo.update_all(
from(sm in Plausible.Site.Membership,
where: sm.site_id == ^site.id and sm.user_id == ^user.id
),
set: [role: :viewer]
)
conn =
put(conn, "/api/v1/sites/shared-links", %{
site_id: site.domain,
name: "Wordpress"
})
res = json_response(conn, 404)
assert res["error"] == "Site could not be found"
end
end
end

@ -0,0 +1,133 @@
defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do
use PlausibleWeb.ConnCase
import Plausible.TestUtils
describe "GET /api/stats/:domain/suggestions/:filter_name" do
setup [:create_user, :log_in, :create_site]
test "returns suggestions for pages without a query", %{conn: conn, site: site} do
conn = get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01")
assert json_response(conn, 200) == ["/", "/register", "/contact", "/irrelevant"]
end
test "returns suggestions for pages with a query", %{conn: conn, site: site} do
conn =
get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01&q=re")
assert json_response(conn, 200) == ["/register", "/irrelevant"]
end
test "returns suggestions for pages without any suggestions", %{conn: conn, site: site} do
conn =
get(
conn,
"/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01&q=/123"
)
assert json_response(conn, 200) == []
end
test "returns suggestions for goals", %{conn: conn, site: site} do
conn = get(conn, "/api/stats/#{site.domain}/suggestions/goal?period=month&date=2019-01-01")
assert json_response(conn, 200) == []
end
test "returns suggestions for sources", %{conn: conn, site: site} do
conn =
get(conn, "/api/stats/#{site.domain}/suggestions/source?period=month&date=2019-01-01")
assert json_response(conn, 200) == ["10words", "Bing"]
end
test "returns suggestions for countries", %{conn: conn, site: site} do
conn =
get(
conn,
"/api/stats/#{site.domain}/suggestions/country?period=month&date=2019-01-01&q=GBR,UKR,URY,USA"
)
assert json_response(conn, 200) == ["USA"]
end
test "returns suggestions for countries without country in search", %{conn: conn, site: site} do
conn =
get(
conn,
"/api/stats/#{site.domain}/suggestions/country?period=month&date=2019-01-01&q=GBR,UKR,URY"
)
assert json_response(conn, 200) == []
end
test "returns suggestions for screen sizes", %{conn: conn, site: site} do
conn =
get(conn, "/api/stats/#{site.domain}/suggestions/screen?period=month&date=2019-01-01")
assert json_response(conn, 200) == ["Desktop"]
end
test "returns suggestions for browsers", %{conn: conn, site: site} do
conn =
get(conn, "/api/stats/#{site.domain}/suggestions/browser?period=month&date=2019-01-01")
assert json_response(conn, 200) == ["Chrome"]
end
test "returns suggestions for browser versions", %{conn: conn, site: site} do
filters = Jason.encode!(%{browser: "Chrome"})
conn =
get(
conn,
"/api/stats/#{site.domain}/suggestions/browser_version?period=month&date=2019-01-01&filters=#{
filters
}"
)
assert json_response(conn, 200) == ["78.0"]
end
test "returns suggestions for OS", %{conn: conn, site: site} do
conn = get(conn, "/api/stats/#{site.domain}/suggestions/os?period=month&date=2019-01-01")
assert json_response(conn, 200) == ["Mac"]
end
test "returns suggestions for OS versions", %{conn: conn, site: site} do
filters = Jason.encode!(%{os: "Mac"})
conn =
get(
conn,
"/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{
filters
}"
)
assert json_response(conn, 200) == ["10.15"]
end
test "returns suggestions for OS versions with search", %{conn: conn, site: site} do
filters = Jason.encode!(%{os: "Mac"})
conn =
get(
conn,
"/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{
filters
}&q=11"
)
assert json_response(conn, 200) == []
end
test "returns suggestions for referrers", %{conn: conn, site: site} do
conn =
get(conn, "/api/stats/#{site.domain}/suggestions/referrer?period=month&date=2019-01-01")
assert json_response(conn, 200) == ["10words.com/page1"]
end
end
end

@ -0,0 +1,158 @@
defmodule PlausibleWeb.Site.InvitationControllerTest do
use PlausibleWeb.ConnCase
use Plausible.Repo
use Bamboo.Test
import Plausible.TestUtils
setup [:create_user, :log_in]
describe "POST /sites/invitations/:invitation_id/accept" do
test "converts the invitation into a membership", %{conn: conn, user: user} do
site = insert(:site)
invitation =
insert(:invitation,
site_id: site.id,
inviter: build(:user),
email: user.email,
role: :admin
)
post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")
refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email))
membership = Repo.get_by(Plausible.Site.Membership, user_id: user.id, site_id: site.id)
assert membership.role == :admin
end
test "notifies the original inviter", %{conn: conn, user: user} do
inviter = insert(:user)
site = insert(:site)
invitation =
insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :admin)
post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")
assert_email_delivered_with(
to: [nil: inviter.email],
subject: "[Plausible Analytics] #{user.email} accepted your invitation to #{site.domain}"
)
end
test "ownership transfer - notifies the original inviter with a different email", %{
conn: conn,
user: user
} do
inviter = insert(:user)
site = insert(:site)
invitation =
insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :owner)
post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")
assert_email_delivered_with(
to: [nil: inviter.email],
subject:
"[Plausible Analytics] #{user.email} accepted the ownership transfer of #{site.domain}"
)
end
test "ownership transfer - downgrades previous owner to admin", %{conn: conn, user: user} do
old_owner = insert(:user)
site = insert(:site, members: [old_owner])
invitation =
insert(:invitation, site_id: site.id, inviter: old_owner, email: user.email, role: :owner)
post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")
refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email))
old_owner_membership =
Repo.get_by(Plausible.Site.Membership, user_id: old_owner.id, site_id: site.id)
assert old_owner_membership.role == :admin
new_owner_membership =
Repo.get_by(Plausible.Site.Membership, user_id: user.id, site_id: site.id)
assert new_owner_membership.role == :owner
end
test "ownership transfer - will lock the site if new owner does not have an active subscription or trial",
%{
conn: conn,
user: user
} do
Repo.update_all(from(u in Plausible.Auth.User, where: u.id == ^user.id),
set: [trial_expiry_date: Timex.today() |> Timex.shift(days: -1)]
)
inviter = insert(:user)
site = insert(:site, locked: false)
invitation =
insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :owner)
post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")
assert Repo.reload!(site).locked
end
end
describe "POST /sites/invitations/:invitation_id/reject" do
test "deletes the invitation", %{conn: conn, user: user} do
site = insert(:site)
invitation =
insert(:invitation,
site_id: site.id,
inviter: build(:user),
email: user.email,
role: :admin
)
post(conn, "/sites/invitations/#{invitation.invitation_id}/reject")
refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email))
end
test "notifies the original inviter", %{conn: conn, user: user} do
inviter = insert(:user)
site = insert(:site)
invitation =
insert(:invitation, site_id: site.id, inviter: inviter, email: user.email, role: :admin)
post(conn, "/sites/invitations/#{invitation.invitation_id}/reject")
assert_email_delivered_with(
to: [nil: inviter.email],
subject: "[Plausible Analytics] #{user.email} rejected your invitation to #{site.domain}"
)
end
end
describe "DELETE /sites/invitations/:invitation_id" do
test "removes the invitation", %{conn: conn} do
site = insert(:site)
invitation =
insert(:invitation,
site_id: site.id,
inviter: build(:user),
email: "jane@example.com",
role: :admin
)
delete(conn, "/sites/invitations/#{invitation.invitation_id}")
refute Repo.exists?(
from i in Plausible.Auth.Invitation, where: i.email == "jane@example.com"
)
end
end
end

@ -0,0 +1,204 @@
defmodule PlausibleWeb.Site.MembershipControllerTest do
use PlausibleWeb.ConnCase
use Plausible.Repo
use Bamboo.Test
import Plausible.TestUtils
setup [:create_user, :log_in]
describe "GET /sites/:website/memberships/invite" do
test "shows invite form", %{conn: conn, user: user} do
site = insert(:site, members: [user])
conn = get(conn, "/sites/#{site.domain}/memberships/invite")
assert html_response(conn, 200) =~ "Invite member to"
end
end
describe "POST /sites/:website/memberships/invite" do
test "creates invitation", %{conn: conn, user: user} do
site = insert(:site, members: [user])
conn =
post(conn, "/sites/#{site.domain}/memberships/invite", %{
email: "john.doe@example.com",
role: "admin"
})
invitation = Repo.get_by(Plausible.Auth.Invitation, email: "john.doe@example.com")
assert invitation.role == :admin
assert redirected_to(conn) == "/#{site.domain}/settings/people"
end
test "sends invitation email for new user", %{conn: conn, user: user} do
site = insert(:site, members: [user])
post(conn, "/sites/#{site.domain}/memberships/invite", %{
email: "john.doe@example.com",
role: "admin"
})
assert_email_delivered_with(
to: [nil: "john.doe@example.com"],
subject: "[Plausible Analytics] You've been invited to #{site.domain}"
)
end
test "sends invitation email for existing user", %{conn: conn, user: user} do
existing_user = insert(:user)
site = insert(:site, members: [user])
post(conn, "/sites/#{site.domain}/memberships/invite", %{
email: existing_user.email,
role: "admin"
})
assert_email_delivered_with(
to: [nil: existing_user.email],
subject: "[Plausible Analytics] You've been invited to #{site.domain}"
)
end
test "renders form with error if the invitee is already a member", %{conn: conn, user: user} do
second_member = insert(:user)
site = insert(:site, members: [user, second_member])
conn =
post(conn, "/sites/#{site.domain}/memberships/invite", %{
email: second_member.email,
role: "admin"
})
assert html_response(conn, 200) =~
"#{second_member.email} is already a member of #{site.domain}"
end
end
describe "GET /sites/:website/transfer-ownership" do
test "shows ownership transfer form", %{conn: conn, user: user} do
site = insert(:site, members: [user])
conn = get(conn, "/sites/#{site.domain}/transfer-ownership")
assert html_response(conn, 200) =~ "Transfer ownership of"
end
end
describe "POST /sites/:website/transfer-ownership" do
test "creates invitation with :owner role", %{conn: conn, user: user} do
site = insert(:site, members: [user])
conn =
post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: "john.doe@example.com"})
invitation = Repo.get_by(Plausible.Auth.Invitation, email: "john.doe@example.com")
assert invitation.role == :owner
assert redirected_to(conn) == "/#{site.domain}/settings/people"
end
test "sends ownership transfer email for new user", %{conn: conn, user: user} do
site = insert(:site, members: [user])
post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: "john.doe@example.com"})
assert_email_delivered_with(
to: [nil: "john.doe@example.com"],
subject: "[Plausible Analytics] Request to transfer ownership of #{site.domain}"
)
end
test "sends invitation email for existing user", %{conn: conn, user: user} do
existing_user = insert(:user)
site = insert(:site, members: [user])
post(conn, "/sites/#{site.domain}/transfer-ownership", %{email: existing_user.email})
assert_email_delivered_with(
to: [nil: existing_user.email],
subject: "[Plausible Analytics] Request to transfer ownership of #{site.domain}"
)
end
end
describe "PUT /sites/memberships/:id/role/:new_role" do
test "updates a site member's role", %{conn: conn, user: user} do
admin = insert(:user)
site =
insert(:site,
memberships: [
build(:site_membership, user: user, role: :owner),
build(:site_membership, user: admin, role: :admin)
]
)
membership = Repo.get_by(Plausible.Site.Membership, user_id: admin.id)
put(conn, "/sites/#{site.domain}/memberships/#{membership.id}/role/viewer")
membership = Repo.reload!(membership)
assert membership.role == :viewer
end
test "can downgrade yourself from admin to viewer, redirects to stats instead", %{
conn: conn,
user: user
} do
site = insert(:site, memberships: [build(:site_membership, user: user, role: :admin)])
membership = Repo.get_by(Plausible.Site.Membership, user_id: user.id)
conn = put(conn, "/sites/#{site.domain}/memberships/#{membership.id}/role/viewer")
membership = Repo.reload!(membership)
assert membership.role == :viewer
assert redirected_to(conn) == "/#{site.domain}"
end
end
describe "DELETE /sites/memberships/:id" do
test "removes a member from a site", %{conn: conn, user: user} do
admin = insert(:user)
site =
insert(:site,
memberships: [
build(:site_membership, user: user, role: :owner),
build(:site_membership, user: admin, role: :admin)
]
)
membership = Enum.find(site.memberships, &(&1.role == :admin))
delete(conn, "/sites/#{site.domain}/memberships/#{membership.id}")
refute Repo.exists?(from sm in Plausible.Site.Membership, where: sm.user_id == ^admin.id)
end
test "notifies the user who has been removed via email", %{conn: conn, user: user} do
admin = insert(:user)
site =
insert(:site,
memberships: [
build(:site_membership, user: user, role: :owner),
build(:site_membership, user: admin, role: :admin)
]
)
membership = Enum.find(site.memberships, &(&1.role == :admin))
delete(conn, "/sites/#{site.domain}/memberships/#{membership.id}")
assert_email_delivered_with(
to: [nil: admin.email],
subject: "[Plausible Analytics] Your access to #{site.domain} has been revoked"
)
end
end
end

@ -30,6 +30,10 @@ defmodule Plausible.Factory do
}
end
def site_membership_factory do
%Plausible.Site.Membership{}
end
def ch_session_factory do
hostname = sequence(:domain, &"example-#{&1}.com")
@ -153,6 +157,14 @@ defmodule Plausible.Factory do
}
end
def invitation_factory do
%Plausible.Auth.Invitation{
invitation_id: Nanoid.generate(),
email: sequence(:email, &"email-#{&1}@example.com"),
role: :admin
}
end
def api_key_factory do
key = :crypto.strong_rand_bytes(64) |> Base.url_encode64() |> binary_part(0, 64)

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save